Skip to content

feat(auth_manager): enhance user session management by storing provid… #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sharjeelyunus wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(auth_manager): enhance user session management by storing provid… #2340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions modules/auth/lib/signin/auth_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ class AuthManager with UserAuthentication {
Future<void> updateCurrentFirebaseUser(BuildContext context, User newUser) async {
await StorageManager()
.writeToSystemStorage(UserAuthentication._idKey, newUser.uid);
await StorageManager().writeToSystemStorage(
UserAuthentication._providerKey, SignInProvider.firebase.name);
await StorageManager()
.writeToSystemStorage(UserAuthentication._isAnonymous, newUser.isAnonymous);
}
Expand Down Expand Up @@ -325,33 +327,6 @@ class AuthManager with UserAuthentication {
/// check if the user is current signed in or not.
Future<bool> isSignedIn() {
return getSignedInUser().then((user) => user != null);

// AuthenticatedUser? user = getCurrentUser();
// if (user != null) {
// // use the Provider to check sign in status
// if (user.provider == SignInProvider.firebase) {
// if (customFirebaseApp != null) {
// return Future.value(
// FirebaseAuth.instanceFor(app: customFirebaseApp!).currentUser !=
// null);
// }
// } else if (user.provider == SignInProvider.auth0) {
// return Future.value(Auth0CredentialsManager().hasCredentials());
// }
//
// // fallback to using the client to check for status
// if (user.client == SignInClient.google) {
// return GoogleAuthManager().isSignedIn();
// } else if (user.client == SignInClient.apple) {
// // nothing to do
// } else if (user.client == SignInClient.microsoft) {
// // TODO
// }
//
// // TODO: we have the current user in memory, does that mean signed in still?
// return Future.value(true);
// }
// return Future.value(false);
}

Future<AuthenticatedUser?> getSignedInUser() async {
Expand All @@ -360,6 +335,16 @@ class AuthManager with UserAuthentication {
if (user.client == SignInClient.google) {
return _getSignedInUserFromGoogle(user.provider);
}
// Storage can outlive the Firebase session — confirm Auth still has a user.
if (user.provider == SignInProvider.firebase ||
(user.provider == null && user.client == null)) {
final app = customFirebaseApp ??
(Firebase.apps.isNotEmpty ? Firebase.apps.first : null);
if (app == null ||
FirebaseAuth.instanceFor(app: app).currentUser == null) {
return null;
}
}
}
return user;
}
Expand Down
Loading