@thzero/library_client_firebase 0.14.7 → 0.14.12

package/boot/starter.js

@@ -1,6 +1,6 @@
-import firebase from 'firebase/app';
-import 'firebase/auth';
-import 'firebase/analytics';
+import { initializeApp } from 'firebase/app';
+import { getAuth } from "firebase/auth";
+import { getAnalytics } from "firebase/analytics";
 
 import LibraryConstants from '@thzero/library_client/constants';
 
@@ -22,9 +22,9 @@ export default ({
 	const configFirebase = configExternal.firebase;
 	if (!configFirebase)
 		throw Error('Invalid firebase config.');
-	firebase.initializeApp(configFirebase);
+	const firebaseApp = initializeApp(configFirebase);
 	if (configFirebase.measurementId)
-		firebase.analytics();
+		getAnalytics();
 
 	let outsideResolve;
 	let outsideReject;
@@ -33,7 +33,8 @@ export default ({
 		outsideReject = reject;
 	});
 
-	// if (firebase.auth().currentUser) {
+	const firebaseAuth = getAuth();
+	// if (firebaseAuth.currentUser) {
 	//	 const timer = setInterval(async () => {
 	//			 clearInterval(timer)
 	//			 const auth = GlobalUtility.$injector.getService(LibraryConstants.InjectorKeys.SERVICE_AUTH)
@@ -42,7 +43,7 @@ export default ({
 	// }
 	// eslint-disable-next-line
 	let init = false;
-	firebase.auth().onAuthStateChanged(async function(user) {
+	firebaseAuth.onAuthStateChanged(async function(user) {
 		// if (user == null) {
 		//	 // GlobalUtility.$navRouter.push('/auth')
 		//	 return

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thzero/library_client_firebase",
-  "version": "0.14.7",
+  "version": "0.14.12",
   "version_major": 0,
   "version_minor": 14,
-  "version_patch": 7,
-  "version_date": "09/01/2021",
+  "version_patch": 12,
+  "version_date": "09/26/2021",
   "author": "thZero",
   "license": "MIT",
   "repository": {
@@ -21,11 +21,11 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "firebase": "^9.0.1",
+    "firebase": "^9.1.0",
     "@thzero/library_client": "^0.14",
     "@thzero/library_common": "^0.13"
   },
   "devDependencies": {
-    "@thzero/library_cli": "^0.13.17"
+    "@thzero/library_cli": "^0.13.19"
   }
 }

package/service/index.js

@@ -1,5 +1,6 @@
-import firebase from 'firebase/app';
-import 'firebase/auth';
+// import firebase from 'firebase/app';
+// import 'firebase/auth';
+import { getAuth, signInWithPopup, GoogleAuthProvider } from "firebase/auth";
 
 import LibraryConstants from '@thzero/library_client/constants';
 
@@ -19,7 +20,7 @@ class FirebaseAuthService extends UserAuthService {
 
 	async deleteUser(correlationId) {
 		try {
-			const user = await firebase.auth().currentUser;
+			const user = await getAuth().currentUser;
 			if (!user)
 				return;
 
@@ -39,13 +40,13 @@ class FirebaseAuthService extends UserAuthService {
 	}
 
 	get externalUser() {
-		const user = firebase.auth().currentUser;
+		const user = getAuth().currentUser;
 		this._logger.debug('FirebaseAuthService', 'tokenUser', 'user', user, LibraryUtility.generateId());
 		return user;
 	}
 
 	get isAuthenticated() {
-		const user = this.user;
+		const user = getAuth().currentUser;
 		this._logger.debug('FirebaseAuthService', 'isAuthenticated', 'user', user);
 		return user != null;
 	}
@@ -86,8 +87,11 @@ class FirebaseAuthService extends UserAuthService {
 			return false;
 
 		try {
-			const result = await firebase.auth().signInWithPopup(new firebase.auth.GoogleAuthProvider());
+			const provider = new GoogleAuthProvider();
+			const result = await signInWithPopup(getAuth(), provider);
 			if (result && result.user) {
+				//const credential = GoogleAuthProvider.credentialFromResult(result);
+				// const token = credential.accessToken;
 				this.updateExternalUser(correlationId, result.user);
 				// this._serviceRouter.route('/')
 				window.location.href = '/';
@@ -107,7 +111,7 @@ class FirebaseAuthService extends UserAuthService {
 	async signInCompleted(correlationId) {
 		// if (await auth.isAuthenticated())
 		//   return
-		// firebase.auth().getRedirectResult().then(function (result) {
+		// getAuth().getRedirectResult().then(function (result) {
 		// 	if (result.credential) {
 		// 		// This gives you a Google Access Token. You can use it to access the Google API.
 		// 		// eslint-disable-next-line
@@ -135,14 +139,14 @@ class FirebaseAuthService extends UserAuthService {
 
 	async signOut(correlationId) {
 		try {
-			// await firebase.auth().signOut()
+			// await getAuth().signOut()
 			// await this._serviceUser.dispatcher.user.setTokenResult(correlationId, null)
 			// await this._serviceUser.dispatcher.user.setClaims(correlationId, null)
 			// await this._serviceUser.dispatcher.user.setUser(correlationId, null)
 			// await this._serviceUser.dispatcher.user.setLoggedIn(correlationId, false)
 
 			const list = [];
-			list.push(firebase.auth().signOut());
+			list.push(getAuth().signOut());
 			// list.push(this._serviceUser.dispatcher.user.setTokenResult(correlationId, null))
 			// list.push(this._serviceUser.dispatcher.user.setClaims(correlationId, null))
 			// list.push(this._serviceUser.dispatcher.user.setUser(correlationId, null))
@@ -187,7 +191,7 @@ class FirebaseAuthService extends UserAuthService {
 			}
 
 			this._logger.debug('FirebaseAuthService', 'tokenUser', 'forceRefresh', forceRefresh, correlationId);
-			const currentUser = await firebase.auth().currentUser;
+			const currentUser = await getAuth().currentUser;
 			this._logger.debug('FirebaseAuthService', 'tokenUser', 'currentUser', currentUser, correlationId);
 			if (!currentUser)
 				return;
@@ -209,7 +213,7 @@ class FirebaseAuthService extends UserAuthService {
 				const diff = expired.diff(now);
 				const min = 5 * 60 * 1000;
 				if (diff <= min) {
-					await this.refreshToken(correlationId, this.user, true).then();
+					await this.refreshToken(correlationId, getAuth().currentUser, true).then();
 					return;
 				}