sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check null safety

Browse Source
This commit is contained in:
tzw
2021-09-10 14:27:38 +06:30
parent a144c945b6
commit 7670779b03
57 changed files with 620 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
lib/data/provider/auth_fb.dart
View File

@@ -9,7 +9,7 @@ import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/domain/exceiptions/signin_exception.dart';
import 'package:fcs/helpers/api_helper.dart';
import 'package:fcs/helpers/firebase_helper.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_auth/firebase_auth.dart' as fb;
import 'package:logging/logging.dart';
class AuthFb {
@@ -18,17 +18,17 @@ class AuthFb {
static final AuthFb instance = AuthFb._();
AuthFb._();
StreamController<User> controller;
static final FirebaseAuth _fb = FirebaseAuth.instance;
static String _verificationId;
late StreamController<User?> controller;
static final fb.FirebaseAuth _fb = fb.FirebaseAuth.instance;
static String _verificationId = '';
Future<fcs.AuthResult> sendSmsCodeToPhoneNumber(String phoneNumber) {
Completer<fcs.AuthResult> completer = Completer();
bool codeSentCompleted = false;
final PhoneVerificationCompleted verificationCompleted =
(AuthCredential credential) async {
AuthResult _authResult;
final fb.PhoneVerificationCompleted verificationCompleted =
(fb.AuthCredential credential) async {
fb.UserCredential _authResult;
try {
_authResult = await _fb.signInWithCredential(credential);
print("PhoneVerificationCompleted :$_authResult");
@@ -48,23 +48,23 @@ class AuthFb {
'Inside _sendCodeToPhoneNumber: signInWithPhoneNumber auto succeeded: ${_authResult.user}');
};
final PhoneVerificationFailed verificationFailed =
(AuthException authException) async {
final fb.PhoneVerificationFailed verificationFailed =
(fb.FirebaseAuthException authException) async {
print(
'Phone number verification failed. Code: ${authException.code}. Message: ${authException.message}');
completer.completeError(SigninException(
"Phone number verification failed:${authException.message}"));
};
final PhoneCodeSent codeSent =
(String verificationId, [int forceResendingToken]) async {
final fb.PhoneCodeSent codeSent =
(String verificationId, [int? forceResendingToken]) async {
_verificationId = verificationId;
print("codeSent " + phoneNumber);
codeSentCompleted = true;
completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
};
final PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
final fb.PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
(String verificationId) {
print("codeAutoRetrievalTimeout $verificationId ");
@@ -89,11 +89,11 @@ class AuthFb {
Future<fcs.AuthResult> signInWithPhoneNumber(String smsCode) async {
try {
final AuthCredential credential = PhoneAuthProvider.getCredential(
verificationId: _verificationId,
smsCode: smsCode,
);
AuthResult _authResult = await _fb.signInWithCredential(credential);
final fb.AuthCredential credential = fb.PhoneAuthProvider.credential(
verificationId: _verificationId, smsCode: smsCode);
fb.UserCredential _authResult =
await _fb.signInWithCredential(credential);
if (_authResult == null) {
throw SigninException("Sigin error!");
}
@@ -105,19 +105,21 @@ class AuthFb {
}
Future<void> signout() async {
if (userListener != null) await userListener.cancel();
if (userListener != null) await userListener!.cancel();
return _fb.signOut();
}
Future<void> _addUserToStream({bool refreshIdToken = false}) async {
FirebaseUser firebaseUser = await _fb.currentUser();
fb.User? firebaseUser = _fb.currentUser;
if (firebaseUser == null) return null;
Map claims = await getClaims(refreshIdToken: refreshIdToken);
Map<dynamic, dynamic>? claims =
await getClaims(refreshIdToken: refreshIdToken);
log.info("Claims:$claims");
if (claims == null) return;
String cid = claims["cid"];
User user;
User? user;
if (cid != null && cid != "") {
user = await _getUserFromFirestore(cid);
}
@@ -136,20 +138,20 @@ class AuthFb {
controller.add(user);
}
Future<User> _getUserFromFirestore(String userID) async {
DocumentSnapshot snap = await Firestore.instance
Future<User?> _getUserFromFirestore(String userID) async {
DocumentSnapshot snap = await FirebaseFirestore.instance
.collection(user_collection)
.document(userID)
.doc(userID)
.get();
if (snap.exists) {
User user = User.fromMap(snap.data, snap.documentID);
User user = User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
return user;
}
return null;
}
Future<bool> isLogin() async {
final FirebaseUser firebaseUser = await _fb.currentUser();
final fb.User? firebaseUser = _fb.currentUser;
return Future.value(firebaseUser != null);
}
@@ -193,48 +195,50 @@ class AuthFb {
}
Stream<Setting> settings() async* {
Stream<DocumentSnapshot> snapshot = Firestore.instance
Stream<DocumentSnapshot> snapshot = FirebaseFirestore.instance
.collection(config_collection)
.document(setting_doc_id)
.doc(setting_doc_id)
.snapshots();
await for (var snap in snapshot) {
Setting setting = Setting.fromMap(snap.data);
Setting setting = Setting.fromMap(snap.data() as Map<String, dynamic>);
yield setting;
}
}
Future<String> _getCurrentUserID() async {
FirebaseUser firebaseUser = await _fb.currentUser();
Future<String?> _getCurrentUserID() async {
fb.User? firebaseUser = _fb.currentUser;
if (firebaseUser == null) return null;
Map claims = await getClaims();
Map? claims = await getClaims();
if (claims == null) return null;
String cid = claims["cid"];
return cid;
}
Future<void> _startUserListener() async {
if (userListener != null) userListener.cancel();
String _userID = await _getCurrentUserID();
if (userListener != null) userListener!.cancel();
String? _userID = await _getCurrentUserID();
if (_userID == null) {
return;
}
Stream<DocumentSnapshot> snapshot = Firestore.instance
Stream<DocumentSnapshot> snapshot = FirebaseFirestore.instance
.collection(user_collection)
.document(_userID)
.doc(_userID)
.snapshots();
userListener = snapshot.listen((snap) async {
User user = User.fromMap(snap.data, snap.documentID);
User user = User.fromMap(snap.data() as Map<String, dynamic>, snap.id);
FirebaseUser firebaseUser = await _fb.currentUser();
fb.User? firebaseUser = _fb.currentUser;
if (firebaseUser == null) {
userListener.cancel();
userListener?.cancel();
return;
}
try {
// get privilege from claim
IdTokenResult idToken = await firebaseUser.getIdToken(refresh: true);
String privileges = idToken.claims["pr"];
fb.IdTokenResult idToken = await firebaseUser.getIdTokenResult(true);
String privileges = idToken.claims?["pr"] ?? '';
if (privileges != null && privileges != "") {
user.privileges = privileges.split(":").toList();
}
@@ -245,13 +249,13 @@ class AuthFb {
});
}
StreamSubscription<DocumentSnapshot> userListener;
Stream<User> user() {
StreamSubscription<DocumentSnapshot>? userListener;
Stream<User?> user() {
// ignore: close_sinks
StreamSubscription<FirebaseUser> authListener;
StreamSubscription<fb.User?>? authListener;
Future<void> _start() async {
authListener = _fb.onAuthStateChanged.listen((firebaseUser) async {
authListener = _fb.authStateChanges().listen((firebaseUser) {
if (firebaseUser == null) {
controller.add(null);
} else {
@@ -263,10 +267,10 @@ class AuthFb {
void _stop() {
if (userListener != null) {
userListener.cancel();
userListener!.cancel();
}
if (authListener != null) {
authListener.cancel();
authListener!.cancel();
}
}