Loading lib/service/auth_service.dart +1 −5 Original line number Diff line number Diff line import 'package:firebase_auth/firebase_auth.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:stamped/data/entities/user.dart' as stamped; import 'package:stamped/service/user_service.dart'; import 'package:google_sign_in/google_sign_in.dart'; class AuthService { final FirebaseAuth _firebaseAuth = FirebaseAuth.instance; Loading Loading @@ -40,12 +40,8 @@ class AuthService { } } Future<void> singOut() async { await GoogleSignIn().signOut(); FirebaseAuth.instance.signOut(); } } lib/service/user_service.dart +9 −11 Original line number Diff line number Diff line import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; import 'package:rxdart/rxdart.dart'; import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:stamped/data/entities/user.dart'; import 'package:rxdart/rxdart.dart';import 'package:stamped/data/entities/user.dart'; class UserService { final _userCollection = Loading @@ -25,9 +22,8 @@ class UserService { final _users = BehaviorSubject<List<User>>.seeded([]); UserService() { final userStream = _userCollection .snapshots() .map((querySnapshot) => querySnapshot.docs.map((docSnapshot) => docSnapshot.data()).toList()); final userStream = _userCollection.snapshots().map((querySnapshot) => querySnapshot.docs.map((docSnapshot) => docSnapshot.data()).toList()); _users.addStream(userStream); } Loading Loading @@ -77,7 +73,9 @@ class UserService { } Future<User> findByGoogleId(String userGoogleId) async { final userSnapshot = await _userCollection.where('googleAuthId', isEqualTo: userGoogleId).get(); final userSnapshot = await _userCollection .where('googleAuthId', isEqualTo: userGoogleId) .get(); final result = userSnapshot.docs; if (result.isEmpty) { throw Exception('User with ID $userGoogleId not found'); Loading Loading
lib/service/auth_service.dart +1 −5 Original line number Diff line number Diff line import 'package:firebase_auth/firebase_auth.dart'; import 'package:google_sign_in/google_sign_in.dart'; import 'package:stamped/data/entities/user.dart' as stamped; import 'package:stamped/service/user_service.dart'; import 'package:google_sign_in/google_sign_in.dart'; class AuthService { final FirebaseAuth _firebaseAuth = FirebaseAuth.instance; Loading Loading @@ -40,12 +40,8 @@ class AuthService { } } Future<void> singOut() async { await GoogleSignIn().signOut(); FirebaseAuth.instance.signOut(); } }
lib/service/user_service.dart +9 −11 Original line number Diff line number Diff line import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:geocoding/geocoding.dart'; import 'package:geolocator/geolocator.dart'; import 'package:rxdart/rxdart.dart'; import 'package:firebase_auth/firebase_auth.dart' as auth; import 'package:stamped/data/entities/user.dart'; import 'package:rxdart/rxdart.dart';import 'package:stamped/data/entities/user.dart'; class UserService { final _userCollection = Loading @@ -25,9 +22,8 @@ class UserService { final _users = BehaviorSubject<List<User>>.seeded([]); UserService() { final userStream = _userCollection .snapshots() .map((querySnapshot) => querySnapshot.docs.map((docSnapshot) => docSnapshot.data()).toList()); final userStream = _userCollection.snapshots().map((querySnapshot) => querySnapshot.docs.map((docSnapshot) => docSnapshot.data()).toList()); _users.addStream(userStream); } Loading Loading @@ -77,7 +73,9 @@ class UserService { } Future<User> findByGoogleId(String userGoogleId) async { final userSnapshot = await _userCollection.where('googleAuthId', isEqualTo: userGoogleId).get(); final userSnapshot = await _userCollection .where('googleAuthId', isEqualTo: userGoogleId) .get(); final result = userSnapshot.docs; if (result.isEmpty) { throw Exception('User with ID $userGoogleId not found'); Loading