From 93504d96e67fa18c370d8bc630aca7b2f01faced Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Wed, 13 Jul 2022 13:02:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E9=80=9A=E7=9F=A5=E3=82=92=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AgileWorks/AgileWorks/Login/View/LoginViewController.swift | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift index 326bd00..090114d 100644 --- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift +++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift @@ -58,6 +58,13 @@ class LoginViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + + UserDefaultsDataStore().removeFirebaseRemoval() + FirebaseSupport.removeInstanceID { error in + if let error = error { + log.e(error) + } + } //認証情報削除 KeychainDataStore().removeOAuthState() -- GitLab From 058ee1639f18cfac9415b7e9f656a1b9e157eb4a Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Wed, 13 Jul 2022 13:10:07 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AgileWorks/AgileWorks/Login/View/LoginViewController.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift index 090114d..721c90d 100644 --- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift +++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift @@ -59,6 +59,7 @@ class LoginViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() + //ログイン画面が表示されると通知を取得しない UserDefaultsDataStore().removeFirebaseRemoval() FirebaseSupport.removeInstanceID { error in if let error = error { -- GitLab From cf0cdd388c5ef236985274603151fccc19742d58 Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Wed, 13 Jul 2022 15:04:18 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=87=E3=83=90=E3=82=A4=E3=82=B9?= =?UTF-8?q?=E5=89=8A=E9=99=A4API=E3=81=8B=E3=82=89firebase=E3=81=AE?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Login/View/LoginViewController.swift | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift index 721c90d..d12e5f1 100644 --- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift +++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift @@ -60,9 +60,12 @@ class LoginViewController: UIViewController { super.viewDidLoad() //ログイン画面が表示されると通知を取得しない - UserDefaultsDataStore().removeFirebaseRemoval() - FirebaseSupport.removeInstanceID { error in - if let error = error { + + self.devcie { result in + switch result { + case .success: + break + case .failure(let error): log.e(error) } } @@ -317,6 +320,17 @@ class LoginViewController: UIViewController { alertController.addAction(cancelAction) present(alertController, animated: true, completion: nil) } + + private func devcie(completion: @escaping (APIResult) -> Void) { + DeviceService().deleteDevice { result in + switch result { + case .success: + completion(.success(true)) + case .failure(let error): + completion(.failure(error)) + } + } + } } extension LoginViewController: UITextFieldDelegate { -- GitLab