Merge branch 'main' into dhruv-documentation-writing

CS342 · Mar 14, 2024 · 57b0435 · 57b0435
2 parents 2c1701c + cc23b5b
commit 57b0435
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/Prisma/Home.swift b/Prisma/Home.swift
@@ -69,7 +69,25 @@ struct HomeView: View {
             }
             .verifyRequiredAccountDetails(Self.accountEnabled)
             .task {
-                await standard.authorizeAccessGroupForCurrentUser()
+                guard let user = Auth.auth().currentUser else {
+                    print("No signed in user.")
+                    return
+                }
+                let accessGroup = "637867499T.edu.stanford.cs342.2024.behavior"
+
+                guard (try? Auth.auth().getStoredUser(forAccessGroup: accessGroup)) == nil else {
+                    print("Access group already shared ...")
+                    return
+                }
+
+                do {
+                    try Auth.auth().useUserAccessGroup(accessGroup)
+                    try await Auth.auth().updateCurrentUser(user)
+                } catch let error as NSError {
+                    print("Error changing user access group: %@", error)
+                    // log out the user if fails
+                    try? Auth.auth().signOut()
+                }
             }
     }
 }

diff --git a/Prisma/Onboarding/AccountOnboarding.swift b/Prisma/Onboarding/AccountOnboarding.swift
@@ -14,14 +14,35 @@ import SwiftUI
 
 struct AccountOnboarding: View {
     @Environment(Account.self) private var account
+
     @Environment(PrismaStandard.self) private var standard
     @Environment(OnboardingNavigationPath.self) private var onboardingNavigationPath
 
 
     var body: some View {
         AccountSetup { _ in
             Task {
-                await standard.authorizeAccessGroupForCurrentUser()
+                guard let user = Auth.auth().currentUser else {
+                    print("No signed in user.")
+                    return
+                }
+                let accessGroup = "637867499T.edu.stanford.cs342.2024.behavior"
+
+                guard (try? Auth.auth().getStoredUser(forAccessGroup: accessGroup)) == nil else {
+                    print("Access group already shared ...")
+                    return
+                }
+
+                do {
+                    try Auth.auth().useUserAccessGroup(accessGroup)
+                    try await Auth.auth().updateCurrentUser(user)
+                } catch let error as NSError {
+                    print("Error changing user access group: %@", error)
+                    // log out the user if fails
+                    try? Auth.auth().signOut()
+                }
+
+
                 // Placing the nextStep() call inside this task will ensure that the sheet dismiss animation is
                 // played till the end before we navigate to the next step.
                 await standard.setAccountTimestamp()