Merge pull request #230 from stytchauth/member-client-parity

[SDK-1474][B2B] Add methods for b2b member client

Sources/StytchCore/Environment.swift

@@ -63,6 +63,8 @@ struct Environment {
 
     let userStorage: UserStorage = .init()
 
+    let memberStorage: MemberStorage = .init()
+
     var localStorage: LocalStorage = .init()
 
     var cookieClient: CookieClient = .live

Sources/StytchCore/Generated/StytchB2BClient.Members.deleteFactor+AsyncVariants.generated.swift

@@ -0,0 +1,33 @@
+// Generated using Sourcery 2.0.2 — https://github.com/krzysztofzablocki/Sourcery
+// DO NOT EDIT
+import Combine
+import Foundation
+
+public extension StytchB2BClient.Members {
+    /// Deletes, by id, an existing authentication factor associated with the current member.
+    func deleteFactor(_ factor: Member.AuthenticationFactor, completion: @escaping Completion<MemberResponse>) {
+        Task {
+            do {
+                completion(.success(try await deleteFactor(factor)))
+            } catch {
+                completion(.failure(error))
+            }
+        }
+    }
+
+    /// Deletes, by id, an existing authentication factor associated with the current member.
+    func deleteFactor(_ factor: Member.AuthenticationFactor) -> AnyPublisher<MemberResponse, Error> {
+        return Deferred {
+            Future({ promise in
+                Task {
+                    do {
+                        promise(.success(try await deleteFactor(factor)))
+                    } catch {
+                        promise(.failure(error))
+                    }
+                }
+            })
+        }
+        .eraseToAnyPublisher()
+    }
+}

Sources/StytchCore/Generated/StytchB2BClient.Members.update+AsyncVariants.generated.swift

@@ -0,0 +1,33 @@
+// Generated using Sourcery 2.0.2 — https://github.com/krzysztofzablocki/Sourcery
+// DO NOT EDIT
+import Combine
+import Foundation
+
+public extension StytchB2BClient.Members {
+    /// Updates the current member.
+    func update(parameters: UpdateParameters, completion: @escaping Completion<MemberResponse>) {
+        Task {
+            do {
+                completion(.success(try await update(parameters: parameters)))
+            } catch {
+                completion(.failure(error))
+            }
+        }
+    }
+
+    /// Updates the current member.
+    func update(parameters: UpdateParameters) -> AnyPublisher<MemberResponse, Error> {
+        return Deferred {
+            Future({ promise in
+                Task {
+                    do {
+                        promise(.success(try await update(parameters: parameters)))
+                    } catch {
+                        promise(.failure(error))
+                    }
+                }
+            })
+        }
+        .eraseToAnyPublisher()
+    }
+}

Sources/StytchCore/MemberStorage.swift

@@ -0,0 +1,28 @@
+import Combine
+import Foundation
+
+final class MemberStorage {
+    private(set) var member: Member? {
+        get { localStorage.member }
+        set { localStorage.member = newValue }
+    }
+
+    private(set) lazy var onMemberChange = _onMemberChange
+        .map { [weak self] in self?.member == nil }
+        .removeDuplicates()
+        .map { [weak self] _ in self?.member }
+
+    private let _onMemberChange = PassthroughSubject<Void, Never>()
+
+    @Dependency(\.localStorage) private var localStorage
+
+    func updateMember(_ member: Member) {
+        self.member = member
+        _onMemberChange.send(())
+    }
+
+    func reset() {
+        member = nil
+        _onMemberChange.send(())
+    }
+}

Sources/StytchCore/StytchB2BClient/Models/Member.swift

@@ -12,6 +12,7 @@ public struct Member: Codable {
     public let ssoRegistrations: [SSORegistration]
     public let trustedMetadata: JSON
     public let untrustedMetadata: JSON
+    public let memberPasswordId: String
 
     let memberId: ID
 }
@@ -29,6 +30,13 @@ public extension Member {
             self = .init(rawValue: rawValue) ?? .unknown
         }
     }
+
+    /// The authentication factors which are able to be managed via member-management calls.
+    enum AuthenticationFactor {
+        case totp
+        case phoneNumber
+        case password(passwordId: String)
+    }
 }
 
 /// A type representing a specific SSO registration.

Sources/StytchCore/StytchB2BClient/StytchB2BClient+Members.swift

@@ -1,9 +1,22 @@
+import Combine
+
+public extension StytchB2BClient {
+    /// The interface for interacting with member products.
+    static var member: Members { .init(router: organization.router.scopedRouter { $0.members }) }
+}
+
 public extension StytchB2BClient {
     /// The SDK allows you to view the current member's information, such as fetching (or viewing the most recent cached version) of the current member.
     struct Members {
         let router: NetworkingRouter<StytchB2BClient.OrganizationsRoute.MembersRoute>
 
         @Dependency(\.localStorage) private var localStorage
+        @Dependency(\.memberStorage) private var memberStorage
+
+        /// A publisher which emits following a change in member status and returns either the member object or nil. You can use this as an indicator to set up or tear down your UI accordingly.
+        public var onMemberChange: AnyPublisher<Member?, Never> {
+            memberStorage.onMemberChange.eraseToAnyPublisher()
+        }
 
         /// Returns the most-recent cached copy of the member object, if it has already been fetched via another method, else nil.
         public func getSync() -> Member? {
@@ -17,12 +30,37 @@ public extension StytchB2BClient {
             localStorage.member = response.member
             return response
         }
-    }
-}
 
-public extension StytchB2BClient {
-    /// The interface for interacting with member products.
-    static var member: Members { .init(router: organization.router.scopedRouter { $0.members }) }
+        // sourcery: AsyncVariants
+        /// Updates the current member.
+        public func update(parameters: UpdateParameters) async throws -> MemberResponse {
+            try await updatingCachedMember {
+                try await router.put(to: .update, parameters: parameters)
+            }
+        }
+
+        // sourcery: AsyncVariants
+        /// Deletes, by id, an existing authentication factor associated with the current member.
+        public func deleteFactor(_ factor: Member.AuthenticationFactor) async throws -> MemberResponse {
+            let response: MemberResponse
+            switch factor {
+            case .totp:
+                response = try await router.delete(route: .deleteTOTP)
+            case .phoneNumber:
+                response = try await router.delete(route: .deletePhoneNumber)
+            case let .password(passwordId):
+                response = try await router.delete(route: .deletePassword(passwordId: passwordId))
+            }
+            memberStorage.updateMember(response.member)
+            return response
+        }
+
+        private func updatingCachedMember(_ performRequest: () async throws -> MemberResponse) async rethrows -> MemberResponse {
+            let response = try await performRequest()
+            memberStorage.updateMember(response.wrapped.member)
+            return response
+        }
+    }
 }
 
 public extension StytchB2BClient.Members {
@@ -31,7 +69,38 @@ public extension StytchB2BClient.Members {
 
     /// The underlying data for the MemberResponse type.
     struct MemberResponseData: Codable {
+        /// The current member's member id.
+        public let memberId: String?
+
         /// The current member.
         public let member: Member
+
+        /// The current member's organization.
+        public let organization: Organization?
+    }
+}
+
+public extension StytchB2BClient.Members {
+    /// The dedicated parameters type for the update member call.
+    struct UpdateParameters: Codable {
+        let name: String?
+        let untrustedMetadata: JSON?
+        let mfaEnrolled: Bool?
+        let mfaPhoneNumber: String?
+        let defaultMfaMethod: String?
+
+        public init(
+            name: String? = nil,
+            untrustedMetadata: JSON? = nil,
+            mfaEnrolled: Bool? = nil,
+            mfaPhoneNumber: String? = nil,
+            defaultMfaMethod: String? = nil
+        ) {
+            self.name = name
+            self.untrustedMetadata = untrustedMetadata
+            self.mfaEnrolled = mfaEnrolled
+            self.mfaPhoneNumber = mfaPhoneNumber
+            self.defaultMfaMethod = defaultMfaMethod
+        }
     }
 }

Sources/StytchCore/StytchB2BClient/StytchB2BClient+Routes.swift

@@ -111,12 +111,27 @@ extension StytchB2BClient {
             }
         }
 
-        enum MembersRoute: String, RouteType {
+        enum MembersRoute: RouteType {
             // swiftlint:disable:next identifier_name
             case me
+            case update
+            case deletePhoneNumber
+            case deleteTOTP
+            case deletePassword(passwordId: String)
 
             var path: Path {
-                .init(rawValue: rawValue)
+                switch self {
+                case .me:
+                    return Path(rawValue: "me")
+                case .update:
+                    return Path(rawValue: "update")
+                case .deletePhoneNumber:
+                    return Path(rawValue: "deletePhoneNumber")
+                case .deleteTOTP:
+                    return Path(rawValue: "deleteTOTP")
+                case let .deletePassword(passwordId):
+                    return Path(rawValue: "passwords/\(passwordId)")
+                }
             }
         }
     }