add call to oauth.disconnect

SAP · Apr 21, 2024 · ea7f1d6 · ea7f1d6
1 parent 637210d
commit ea7f1d6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git a/GigyaSwift/Global/Providers/SocialLogin/SocialLoginProvider.swift b/GigyaSwift/Global/Providers/SocialLogin/SocialLoginProvider.swift
@@ -55,7 +55,11 @@ class SocialLoginProvider: Provider {
     func getProviderSessions(token: String, expiration: String?, code: String?, firstName: String?, lastName: String?) -> String {
         switch providerType {
         case .facebook:
-            return "{\"\(providerType.rawValue)\": {\"authToken\": \"\(token)\", tokenExpiration: \"\(expiration ?? "")\"}}"
+            if let code = code {
+                return "{\"\(providerType.rawValue)\": {\"authToken\": \"\(token)\", tokenExpiration: \"\(expiration ?? "")\", idToken: \"\(code)\"}}"
+            } else {
+                return "{\"\(providerType.rawValue)\": {\"authToken\": \"\(token)\", tokenExpiration: \"\(expiration ?? "")\"}}"
+            }
         case .line:
             return "{\"\(providerType.rawValue)\":{\"authToken\": \"\(token)\"}}"
         case .google:

diff --git a/GigyaSwift/Global/WebAuthn/OauthService.swift b/GigyaSwift/Global/WebAuthn/OauthService.swift
@@ -24,6 +24,15 @@ class OauthService {
         }
     }
 
+    func disconnect(regToken: String, idToken: String, ignoreApiQueue: Bool = true, completion: @escaping (GigyaApiResult<GigyaDictionary>) -> Void) {
+        var model = ApiRequestModel(method: GigyaDefinitions.Oauth.disconnect, params: ["ignoreApiQueue": ignoreApiQueue, "regToken": regToken])
+        model.headers = ["Authorization": "Bearer \(idToken)"]
+        businessApiService.apiService.send(model: model, responseType: GigyaDictionary.self) { result in
+            completion(result)
+        }
+
+    }
+
     @available(iOS 13.0.0, *)
     func authorize<T: Codable>(token: String) async -> GigyaLoginResult<T> {
         return await withCheckedContinuation { [weak self] continuation in

diff --git a/GigyaSwift/Global/WebAuthn/WebAuthnService.swift b/GigyaSwift/Global/WebAuthn/WebAuthnService.swift
@@ -229,8 +229,21 @@ public class WebAuthnService<T: GigyaAccountProtocol> {
     private func revoke(key: String) async -> GigyaApiResult<GigyaDictionary> {
         return await withCheckedContinuation({
             continuation in
-            businessApiService.send(dataType: GigyaDictionary.self, api: GigyaDefinitions.WenAuthn.removeCredential, params: ["credentialId": key]) { result in
-                continuation.resume(returning: result)
+            businessApiService.send(dataType: GigyaDictionary.self, api: GigyaDefinitions.WenAuthn.removeCredential, params: ["credentialId": key]) { [weak self] result in
+                switch result {
+                case .success(let data):
+                    guard let idToken = data["idToken"]?.value as? String else {
+                        continuation.resume(returning: result)
+                        return
+                    }
+
+                    self?.oauthService.disconnect(regToken: key, idToken: idToken) { _ in
+                        continuation.resume(returning: result)
+                    }
+                case .failure(_):
+                    continuation.resume(returning: result)
+                }
+
             }
         })
     }

diff --git a/GigyaSwift/Models/Config/GigyaDefinitions.swift b/GigyaSwift/Models/Config/GigyaDefinitions.swift
@@ -83,6 +83,7 @@ public struct GigyaDefinitions {
 
     public struct Oauth {
         static let connect = "oauth.connect"
+        static let disconnect = "oauth.disconnect"
         static let authorize = "oauth.authorize"
         static let token = "oauth.token"
     }