Customize Security Overview

Sources/SpeziAccount/AccountValue/AccountKey+Views.swift

@@ -39,7 +39,17 @@
         return AnyView(DataDisplay(value))
     }
 
+    static func securityViewWithCurrentStoredValueIfPresent(from details: AccountDetails) -> AnyView? {
+        let value = details[Self.self]
+
+        if let securityView = DataDisplay as? any SecurityView.Type {
+            return AnyView(securityView.init()) // TODO: pass the current value!
+        }
+        return nil
+    }
+
     static func singleEditView(model: AccountOverviewFormViewModel, details accountDetails: AccountDetails) -> AnyView {
+        // TODO: pass as environment object
         AnyView(SingleEditView<Self>(model: model, details: accountDetails))
     }
 }

Sources/SpeziAccount/AccountValue/Keys/ConfiguredCredentials.swift

@@ -0,0 +1,29 @@
+//
+// This source file is part of the Stanford Spezi open-source project
+//
+// SPDX-FileCopyrightText: 2024 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+
+import SpeziFoundation
+
+
+extension AccountDetails {
+    fileprivate struct ConfiguredCredentials: DefaultProvidingKnowledgeSource {
+        typealias Anchor = AccountAnchor
+        typealias Value = [any AccountKey.Type]
+
+        static let defaultValue: Value = []
+    }
+
+    /// The list of credentials that are configured for the user account.
+    public var configuredCredentials: [any AccountKey.Type] {
+        get {
+            self[ConfiguredCredentials.self]
+        }
+        set {
+            self[ConfiguredCredentials.self] = newValue
+        }
+    }
+}

Sources/SpeziAccount/AccountValue/Keys/PasswordKey.swift

@@ -11,6 +11,39 @@
 import SwiftUI
 
 
+private struct ConfigureView: SecurityView {
+    typealias Value = String
+
+    @Environment(Account.self)
+    private var account
+
+    @State private var presentingPasswordSheet = false
+
+    private var label: Text {
+        if account.details?.configuredCredentials.contains(where: { $0 == AccountKeys.password }) == true {
+            Text("CHANGE_PASSWORD", bundle: .module)
+        } else {
+            Text("Setup Password", bundle: .module)
+        }
+    }
+
+    var body: some View {
+        Button(action: {
+            presentingPasswordSheet = true
+        }) {
+            label
+        }
+            .sheet(isPresented: $presentingPasswordSheet) {
+                PasswordChangeSheet()
+            }
+    }
+
+    init() { // TODO: does that make sense?
+        // password will be never present, configuring/changing password is done via other mechanisms
+    }
+}
+
+
 private struct EntryView: DataEntryView {
     @Environment(\.accountViewType)
     private var accountViewType
@@ -69,6 +102,7 @@
         name: LocalizedStringResource("UP_PASSWORD", bundle: .atURL(from: .module)),
         category: .credentials,
         as: String.self,
+        displayView: ConfigureView.self,
         entryView: EntryView.self
     )
     public var password: String?

Sources/SpeziAccount/Mock/InMemoryAccountService.swift

@@ -387,9 +387,12 @@
             details.userId = userId
         }
 
-        if storage.password == nil {
+        if let password = storage.password {
+            details.configuredCredentials = [AccountKeys.password]
+        } else {
             details.isAnonymous = true
         }
+
         return details
     }
 }

Sources/SpeziAccount/Resources/Localizable.xcstrings

@@ -362,6 +362,9 @@
           }
         }
       }
+    },
+    "Changing the password requires a signed in user account." : {
+
     },
     "CLOSE" : {
       "localizations" : {
@@ -1016,6 +1019,9 @@
           }
         }
       }
+    },
+    "No Account" : {
+
     },
     "Numeric Key" : {
       "localizations" : {
@@ -1174,6 +1180,9 @@
           }
         }
       }
+    },
+    "Setup Password" : {
+
     },
     "SIGN_IN_AND_SECURITY" : {
       "localizations" : {

Sources/SpeziAccount/Views/AccountOverview/AccountKeyOverviewRow.swift

@@ -14,10 +14,11 @@ import SwiftUI
 struct AccountKeyOverviewRow: View {
     private let accountDetails: AccountDetails
     private let accountKey: any AccountKey.Type
-    private let model: AccountOverviewFormViewModel
 
     @Environment(Account.self)
     private var account
+    @Environment(AccountOverviewFormViewModel.self)
+    private var model
     @Environment(\.editMode)
     private var editMode
 
@@ -58,15 +59,17 @@ struct AccountKeyOverviewRow: View {
             if let view = accountKey.dataDisplayViewWithCurrentStoredValue(from: accountDetails) {
                 view
                     .environment(\.accountViewType, .overview(mode: .display))
+            } else if let view = accountKey.securityViewWithCurrentStoredValueIfPresent(from: accountDetails) {
+                view
+                    .environment(\.accountViewType, .overview(mode: .display))
             }
         }
     }
 
 
-    init(details accountDetails: AccountDetails, for accountKey: any AccountKey.Type, model: AccountOverviewFormViewModel) {
+    init(details accountDetails: AccountDetails, for accountKey: any AccountKey.Type) {
         self.accountDetails = accountDetails
         self.accountKey = accountKey
-        self.model = model
     }
 
 
@@ -92,7 +95,8 @@ private let key = AccountKeys.genderIdentity
     return AccountDetailsReader { account, details in
         let model = AccountOverviewFormViewModel(account: account, details: details)
 
-        AccountKeyOverviewRow(details: details, for: key, model: model)
+        AccountKeyOverviewRow(details: details, for: key)
+            .environment(model)
             .injectEnvironmentObjects(configuration: details.accountServiceConfiguration, model: model)
     }
         .previewWith {

Sources/SpeziAccount/Views/AccountOverview/AccountOverviewSections.swift

@@ -155,6 +155,7 @@ struct AccountOverviewSections<AdditionalSections: View>: View {
         defaultSections
 
         sectionsView
+            .environment(model)
             .injectEnvironmentObjects(configuration: accountDetails.accountServiceConfiguration, model: model)
             .receiveValidation(in: $validation)
             .focused($isFocused)
@@ -194,7 +195,8 @@ struct AccountOverviewSections<AdditionalSections: View>: View {
             Section {
                 if displayName {
                     NavigationLink {
-                        NameOverview(model: model, details: accountDetails)
+                        NameOverview(details: accountDetails)
+                            .environment(model)
                     } label: {
                         Label {
                             model.accountIdentifierLabel(configuration: account.configuration, accountDetails)
@@ -206,7 +208,8 @@ struct AccountOverviewSections<AdditionalSections: View>: View {
 
                 if displaySecurity {
                     NavigationLink {
-                        SecurityOverview(model: model, details: accountDetails)
+                        SecurityOverview(details: accountDetails)
+                            .environment(model)
                     } label: {
                         Label {
                             Text("SIGN_IN_AND_SECURITY", bundle: .module)
@@ -229,7 +232,7 @@ struct AccountOverviewSections<AdditionalSections: View>: View {
                     }
 
                     ForEach(forEachWrappers) { wrapper in
-                        AccountKeyOverviewRow(details: accountDetails, for: wrapper.accountKey, model: model)
+                        AccountKeyOverviewRow(details: accountDetails, for: wrapper.accountKey)
                     }
                         .onDelete { indexSet in
                             model.deleteAccountKeys(at: indexSet, in: accountKeys)

Sources/SpeziAccount/Views/AccountOverview/NameOverview.swift

@@ -11,11 +11,12 @@ import SwiftUI
 
 
 struct NameOverview: View {
-    private let model: AccountOverviewFormViewModel
     private let accountDetails: AccountDetails
 
     @Environment(Account.self)
     private var account
+    @Environment(AccountOverviewFormViewModel.self)
+    private var model
 
 
     var body: some View {
@@ -63,8 +64,7 @@ struct NameOverview: View {
     }
 
 
-    init(model: AccountOverviewFormViewModel, details accountDetails: AccountDetails) {
-        self.model = model
+    init(details accountDetails: AccountDetails) {
         self.accountDetails = accountDetails
     }
 }
@@ -78,7 +78,8 @@ struct NameOverview: View {
 
     return NavigationStack {
         AccountDetailsReader { account, details in
-            NameOverview(model: AccountOverviewFormViewModel(account: account, details: details), details: details)
+            NameOverview(details: details)
+                .environment(AccountOverviewFormViewModel(account: account, details: details))
         }
     }
         .previewWith {
@@ -92,7 +93,8 @@ struct NameOverview: View {
 
     return NavigationStack {
         AccountDetailsReader { account, details in
-            NameOverview(model: AccountOverviewFormViewModel(account: account, details: details), details: details)
+            NameOverview(details: details)
+                .environment(AccountOverviewFormViewModel(account: account, details: details))
         }
     }
         .previewWith {