Update native sdks (#163)

Author: itaihanski

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.9.10
+- Update Descope native SDKs
+
 # 0.9.9
 
 - Introducing the `DescopeFlowView` widget for seamless integration of Descope Flows in Flutter applications. Available for both Android and iOS platforms.

android/build.gradle

@@ -51,7 +51,7 @@ android {
         implementation "androidx.browser:browser:1.8.0"
         implementation "androidx.security:security-crypto:1.1.0"
         implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2"
-        implementation "com.descope:descope-kotlin:0.17.1"
+        implementation "com.descope:descope-kotlin:0.17.3"
     }
 
     testOptions {

ios/Classes/descope-swift-sdk/flows/FlowBridge.swift

@@ -548,6 +548,26 @@ window.descopeBridge = {
             } else {
                 window.webkit.messageHandlers.\(FlowBridgeMessage.ready.rawValue).postMessage(tag)
             }
+            this.disableTouchInteractions()
+        },
+
+        disableTouchInteractions() {
+            this.component.injectStyle?.(`
+                #content-root * {
+                    -webkit-touch-callout: none;
+                    -webkit-user-select: none;
+                }
+            `)
+
+            this.component.shadowRoot?.querySelectorAll('descope-enriched-text').forEach(t => {
+                t.shadowRoot?.querySelectorAll('a').forEach(a => {
+                    a.draggable = false
+                })
+            })
+
+            this.component.shadowRoot?.querySelectorAll('img').forEach(a => {
+                a.draggable = false
+            })
         },
 
         updateRefreshJwt(refreshJwt) {

ios/Classes/descope-swift-sdk/flows/FlowCoordinator.swift

@@ -323,8 +323,8 @@ public class DescopeFlowCoordinator {
     private func parseAuthentication(_ data: Data) async -> AuthenticationResponse? {
         do {
             guard let webView else { return nil }
-            let cookies = await webView.configuration.websiteDataStore.httpCookieStore.cookies(for: webView.url)
             var jwtResponse = try JSONDecoder().decode(DescopeClient.JWTResponse.self, from: data)
+            let cookies = await webView.configuration.websiteDataStore.httpCookieStore.cookies(for: jwtResponse.cookieDomain, at: webView.url)
             try jwtResponse.setValues(from: data, cookies: cookies, refreshCookieName: bridge.attributes.refreshCookieName)
             return try jwtResponse.convert()
         } catch {
@@ -417,13 +417,18 @@ extension DescopeFlowCoordinator: FlowBridgeDelegate {
 }
 
 private extension WKHTTPCookieStore {
-    func cookies(for url: URL?) async -> [HTTPCookie] {
+    func cookies(for domain: String?, at url: URL?) async -> [HTTPCookie] {
         return await allCookies().filter { cookie in
-            guard let domain = url?.host else { return true }
-            if cookie.domain.hasPrefix(".") {
-                return domain.hasSuffix(cookie.domain) || domain == cookie.domain.dropFirst()
+            // prefer finding value cookies compared to the cookie domain if it's specified,
+            // but allow falling back to comparing against the page URL
+            for value in [domain, url?.host] {
+                guard let value, !value.isEmpty else { continue }
+                if cookie.domain.hasPrefix(".") {
+                    return value.hasSuffix(cookie.domain) || value == cookie.domain.dropFirst()
+                }
+                return value == cookie.domain
             }
-            return domain == cookie.domain
+            return true
         }
     }
 }

ios/Classes/descope-swift-sdk/internal/http/DescopeClient.swift

@@ -14,25 +14,25 @@ class HTTPClient {
 
     // Convenience response functions
 
-    final func get<T: JSONResponse>(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:]) async throws -> T {
+    final func get<T: JSONResponse>(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:]) async throws(DescopeError) -> T {
         let (data, response) = try await get(route, headers: headers, params: params)
         return try decodeJSON(data: data, response: response)
     }
 
-    final func post<T: JSONResponse>(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:], body: [String: Any?] = [:]) async throws -> T {
+    final func post<T: JSONResponse>(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:], body: [String: Any?] = [:]) async throws(DescopeError) -> T {
         let (data, response) = try await post(route, headers: headers, params: params, body: body)
         return try decodeJSON(data: data, response: response)
     }
 
     // Convenience data functions
 
     @discardableResult
-    final func get(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:]) async throws -> (Data, HTTPURLResponse) {
+    final func get(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:]) async throws(DescopeError) -> (Data, HTTPURLResponse) {
         return try await call(route, method: "GET", headers: headers, params: params, body: nil)
     }
 
     @discardableResult
-    final func post(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:], body: [String: Any?] = [:]) async throws -> (Data, HTTPURLResponse) {
+    final func post(_ route: String, headers: [String: String] = [:], params: [String: String?] = [:], body: [String: Any?] = [:]) async throws(DescopeError) -> (Data, HTTPURLResponse) {
         return try await call(route, method: "POST", headers: headers, params: params, body: encodeJSON(body))
     }
 
@@ -56,7 +56,7 @@ class HTTPClient {
 
     // Private
 
-    private func call(_ route: String, method: String, headers: [String: String], params: [String: String?], body: Data?) async throws -> (Data, HTTPURLResponse) {
+    private func call(_ route: String, method: String, headers: [String: String], params: [String: String?], body: Data?) async throws(DescopeError) -> (Data, HTTPURLResponse) {
         let request = try makeRequest(route: route, method: method, headers: headers, params: params, body: body)
         if logger.isUnsafeEnabled {
             logger.info("Starting network call", request.url)
@@ -110,7 +110,7 @@ class HTTPClient {
         return (data, response)
     }
 
-    private func makeRequest(route: String, method: String, headers: [String: String], params: [String: String?], body: Data?) throws -> URLRequest {
+    private func makeRequest(route: String, method: String, headers: [String: String], params: [String: String?], body: Data?) throws(DescopeError) -> URLRequest {
         let url = try makeURL(route: route, params: params)
         var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalAndRemoteCacheData, timeoutInterval: defaultTimeout)
         request.httpMethod = method
@@ -121,7 +121,7 @@ class HTTPClient {
         return request
     }
 
-    private func makeURL(route: String, params: [String: String?]) throws -> URL {
+    private func makeURL(route: String, params: [String: String?]) throws(DescopeError) -> URL {
         guard var url = URL(string: baseURL) else { throw DescopeError(httpError: .invalidRoute) }
         url.appendPathComponent(basePath, isDirectory: false)
         url.appendPathComponent(route, isDirectory: false)
@@ -146,7 +146,7 @@ extension JSONResponse {
     }
 }
 
-private func decodeJSON<T: JSONResponse>(data: Data, response: HTTPURLResponse) throws -> T {
+private func decodeJSON<T: JSONResponse>(data: Data, response: HTTPURLResponse) throws(DescopeError) -> T {
     do {
         var val = try JSONDecoder().decode(T.self, from: data)
         try val.setValues(from: data, response: response)
@@ -158,7 +158,7 @@ private func decodeJSON<T: JSONResponse>(data: Data, response: HTTPURLResponse)
 
 // JSON Request
 
-private func encodeJSON(_ body: [String: Any?]) throws -> Data {
+private func encodeJSON(_ body: [String: Any?]) throws(DescopeError) -> Data {
     do {
         let compact = body.compacted()
         let data = try JSONSerialization.data(withJSONObject: compact, options: [])

ios/Classes/descope-swift-sdk/internal/http/HTTPClient.swift

@@ -67,7 +67,7 @@ public extension DescopeFlow {
 
 public extension SessionStorage.KeychainStore {
     @available(*, deprecated, message: "Use the init() initializer instead and set the accessibility property manually")
-    public convenience init(accessibility: String) {
+    convenience init(accessibility: String) {
         self.init()
         self.accessibility = accessibility
     }

ios/Classes/descope-swift-sdk/internal/others/Deprecated.swift

@@ -105,6 +105,25 @@ extension String {
     }
 }
 
+extension Task where Success == Never, Failure == Never {
+    static func checkCancellation(throwing err: DescopeError) throws(DescopeError) {
+        do {
+            try checkCancellation()
+        } catch {
+            throw err
+        }
+    }
+    
+    static func sleep(seconds: TimeInterval, throwing err: DescopeError) async throws(DescopeError) {
+        do {
+            let nanoseconds = UInt64(seconds * TimeInterval(NSEC_PER_SEC))
+            try await Task.sleep(nanoseconds: nanoseconds)
+        } catch {
+            throw err
+        }
+    }
+}
+
 class DefaultPresentationContextProvider: NSObject, ASWebAuthenticationPresentationContextProviding, ASAuthorizationControllerPresentationContextProviding {
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return presentationAnchor
@@ -186,3 +205,79 @@ extension AuthenticationResponse: Codable {
         try values.encode(isFirstAuthentication, forKey: .isFirstAuthentication)
     }
 }
+
+extension DescopeUser {
+    struct SerializedUser: Codable, Equatable {
+        var userId: String
+        var loginIds: [String]
+        var status: String?
+        var createdAt: Date
+        var email: String?
+        var isVerifiedEmail: Bool
+        var phone: String?
+        var isVerifiedPhone: Bool
+        var name: String?
+        var givenName: String?
+        var middleName: String?
+        var familyName: String?
+        var picture: URL?
+        var authentication: Authentication?
+        var authorization: Authorization?
+        var customAttributes: String?
+        var isUpdateRequired: Bool?
+    }
+    
+    static func serialize(_ user: DescopeUser) -> SerializedUser {
+        var customAttributes = "{}"
+        if JSONSerialization.isValidJSONObject(user.customAttributes), let data = try? JSONSerialization.data(withJSONObject: user.customAttributes), let value = String(bytes: data, encoding: .utf8) {
+            customAttributes = value
+        }
+        
+        return SerializedUser(
+            userId: user.userId,
+            loginIds: user.loginIds,
+            status: user.status.rawValue,
+            createdAt: user.createdAt,
+            email: user.email,
+            isVerifiedEmail: user.isVerifiedEmail,
+            phone: user.phone,
+            isVerifiedPhone: user.isVerifiedPhone,
+            name: user.name,
+            givenName: user.givenName,
+            middleName: user.middleName,
+            familyName: user.familyName,
+            picture: user.picture,
+            authentication: user.authentication,
+            authorization: user.authorization,
+            customAttributes: customAttributes,
+            isUpdateRequired: user.isUpdateRequired,
+        )
+    }
+    
+    static func deserialize(_ user: SerializedUser) -> DescopeUser {
+        var customAttributes: [String: Any] = [:]
+        if let value = user.customAttributes, let json = try? JSONSerialization.jsonObject(with: Data(value.utf8)) {
+            customAttributes = json as? [String: Any] ?? [:]
+        }
+        
+        return DescopeUser(
+            userId: user.userId,
+            loginIds: user.loginIds,
+            status: Status(rawValue: user.status ?? "") ?? .enabled,
+            createdAt: user.createdAt,
+            email: user.email,
+            isVerifiedEmail: user.isVerifiedEmail,
+            phone: user.phone,
+            isVerifiedPhone: user.isVerifiedPhone,
+            name: user.name,
+            givenName: user.givenName,
+            middleName: user.middleName,
+            familyName: user.familyName,
+            picture: user.picture,
+            authentication: user.authentication ?? Authentication(passkey: false, password: false, totp: false, oauth: [], sso: false, scim: false),
+            authorization: user.authorization ?? Authorization(roles: [], ssoAppIds: []),
+            customAttributes: customAttributes,
+            isUpdateRequired: user.isUpdateRequired ?? true, // if the flag doesn't exist we've got old data without the new fields
+        )
+    }
+}

ios/Classes/descope-swift-sdk/internal/others/Internal.swift

@@ -6,13 +6,13 @@ final class AccessKey: DescopeAccessKey {
         self.client = client
     }
 
-    func exchange(accessKey: String) async throws -> DescopeToken {
+    func exchange(accessKey: String) async throws(DescopeError) -> DescopeToken {
         return try await client.accessKeyExchange(accessKey).convert()
     }
 }
 
 private extension DescopeClient.AccessKeyExchangeResponse {
-    func convert() throws -> DescopeToken {
+    func convert() throws(DescopeError) -> DescopeToken {
         return try Token(jwt: sessionJwt)
     }
 }

ios/Classes/descope-swift-sdk/internal/routes/AccessKey.swift

@@ -6,25 +6,25 @@ final class Auth: DescopeAuth {
         self.client = client
     }
 
-    func me(refreshJwt: String) async throws -> DescopeUser {
+    func me(refreshJwt: String) async throws(DescopeError) -> DescopeUser {
         return try await client.me(refreshJwt: refreshJwt).convert()
     }
 
-    func tenants(dct: Bool, tenantIds: [String], refreshJwt: String) async throws -> [DescopeTenant] {
+    func tenants(dct: Bool, tenantIds: [String], refreshJwt: String) async throws(DescopeError) -> [DescopeTenant] {
         return try await client.tenants(dct: dct, tenantIds: tenantIds, refreshJwt: refreshJwt).convert()
     }
 
-    func refreshSession(refreshJwt: String) async throws -> RefreshResponse {
+    func refreshSession(refreshJwt: String) async throws(DescopeError) -> RefreshResponse {
         return try await client.refresh(refreshJwt: refreshJwt).convert()
     }
 
-    func migrateSession(externalToken: String) async throws -> AuthenticationResponse {
+    func migrateSession(externalToken: String) async throws(DescopeError) -> AuthenticationResponse {
         let response: MigrateResponse = try await client.migrate(externalToken: externalToken).convert()
         let user = try await me(refreshJwt: response.refreshToken.jwt)
         return AuthenticationResponse(sessionToken: response.sessionToken, refreshToken: response.refreshToken, user: user, isFirstAuthentication: false)
     }
 
-    func revokeSessions(_ revoke: RevokeType, refreshJwt: String) async throws {
+    func revokeSessions(_ revoke: RevokeType, refreshJwt: String) async throws(DescopeError) {
         try await client.logout(type: revoke, refreshJwt: refreshJwt)
     }
 }
@@ -35,7 +35,7 @@ private struct MigrateResponse {
 }
 
 private extension DescopeClient.JWTResponse {
-    func convert() throws -> RefreshResponse {
+    func convert() throws(DescopeError) -> RefreshResponse {
         guard let sessionJwt, !sessionJwt.isEmpty else { throw DescopeError.decodeError.with(message: "Missing session JWT") }
         var refreshToken: DescopeToken?
         if let refreshJwt, !refreshJwt.isEmpty {
@@ -44,7 +44,7 @@ private extension DescopeClient.JWTResponse {
         return try RefreshResponse(sessionToken: Token(jwt: sessionJwt), refreshToken: refreshToken)
     }
 
-    func convert() throws -> MigrateResponse {
+    func convert() throws(DescopeError) -> MigrateResponse {
         guard let sessionJwt, !sessionJwt.isEmpty else { throw DescopeError.decodeError.with(message: "Missing session JWT") }
         guard let refreshJwt, !refreshJwt.isEmpty else { throw DescopeError.decodeError.with(message: "Missing refresh JWT") }
         return try MigrateResponse(sessionToken: Token(jwt: sessionJwt), refreshToken: Token(jwt: refreshJwt))