From ec511fb8f40219e2559b08c62bd915d773d2a36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jovan=20Kruni=C4=87?= <jovan.krunic@gmail.com>
Date: Sat, 8 Oct 2022 09:18:44 +0000
Subject: [PATCH] fix: remove item before adding it to secure storage

---
 .../modules/auth/factories/storage.factory.ts |  4 +--
 .../storage/capacitor-secure-storage.ts       | 30 +++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 src/app/modules/storage/capacitor-secure-storage.ts

diff --git a/src/app/modules/auth/factories/storage.factory.ts b/src/app/modules/auth/factories/storage.factory.ts
index 4cf2edf6..5e2efbba 100644
--- a/src/app/modules/auth/factories/storage.factory.ts
+++ b/src/app/modules/auth/factories/storage.factory.ts
@@ -1,9 +1,9 @@
 import {Platform} from '@ionic/angular';
-import {CapacitorSecureStorage} from 'ionic-appauth/lib/capacitor';
 import {IonicStorage} from 'ionic-appauth/lib';
+import {SafeCapacitorSecureStorage} from '../../storage/capacitor-secure-storage';
 
 export const storageFactory = (platform: Platform) => {
   return platform.is('capacitor')
-    ? new CapacitorSecureStorage()
+    ? new SafeCapacitorSecureStorage()
     : new IonicStorage();
 };
diff --git a/src/app/modules/storage/capacitor-secure-storage.ts b/src/app/modules/storage/capacitor-secure-storage.ts
new file mode 100644
index 00000000..8db8a3dd
--- /dev/null
+++ b/src/app/modules/storage/capacitor-secure-storage.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 StApps
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+import {CapacitorSecureStorage} from 'ionic-appauth/lib/capacitor';
+
+/*
+ * Removes an item from storage before entering the new one to avoid issues
+ * after iOS upgrade (iOS 16)
+ */
+export class SafeCapacitorSecureStorage extends CapacitorSecureStorage {
+  async setItem(name: string, value: string): Promise<void> {
+    if (!Storage) throw new Error('Capacitor Storage Is Undefined!');
+
+    try {
+      await super.removeItem(name);
+    } catch {}
+    return super.setItem(name, value);
+  }
+}