@thzero/library_client_firebase 0.17.7 → 0.17.8

package/boot/starter.js

@@ -1,48 +1,50 @@
-import { initializeApp } from 'firebase/app';
-import { getAuth } from "firebase/auth";
-import { getAnalytics } from "firebase/analytics";
+// import { initializeApp } from 'firebase/app';
+// import { getAuth } from "firebase/auth";
+// import { getAnalytics } from "firebase/analytics";
 
 import LibraryClientConstants from '@thzero/library_client/constants';
 
 import LibrartyClientUtility from '@thzero/library_client/utility/index';
 
-import config from 'local-config';
+// import config from 'local-config';
 
 // export default async ({
-export default (setup) => {
-	const configExternal = config.external;
-	if (!configExternal)
-		throw Error('Invalid external config.');
-	const configFirebase = configExternal.firebase;
-	if (!configFirebase)
-		throw Error('Invalid firebase config.');
-	initializeApp(configFirebase);
-	if (configFirebase.measurementId)
-		getAnalytics();
-
-	let outsideResolve;
-	let outsideReject;
-	const promiseAuth = new Promise(function(resolve, reject) {
-		outsideResolve = resolve;
-		outsideReject = reject;
-	});
-
-	const firebaseAuth = getAuth();
-	// eslint-disable-next-line
-	let init = false;
-	firebaseAuth.onAuthStateChanged(async function(user) {
-		const auth = LibrartyClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_AUTH);
-		await auth.onAuthStateChanged(user);
-		if (!init) {
-			init = true;
-			outsideResolve(true);
-			return;
-		}
-
-		outsideReject();
-	});
-
-	setup();
-
-	return promiseAuth;
+export default (router) => {
+	const auth = LibrartyClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_AUTH);
+	return auth.initialize(router);
+	// const configExternal = config.external;
+	// if (!configExternal)
+	// 	throw Error('Invalid external config.');
+	// const configFirebase = configExternal.firebase;
+	// if (!configFirebase)
+	// 	throw Error('Invalid firebase config.');
+	// initializeApp(configFirebase);
+	// if (configFirebase.measurementId)
+	// 	getAnalytics();
+
+	// let outsideResolve;
+	// let outsideReject;
+	// const promiseAuth = new Promise(function(resolve, reject) {
+	// 	outsideResolve = resolve;
+	// 	outsideReject = reject;
+	// });
+
+	// const firebaseAuth = getAuth();
+	// // eslint-disable-next-line
+	// let init = false;
+	// firebaseAuth.onAuthStateChanged(async function(user) {
+	// 	const auth = LibrartyClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_AUTH);
+	// 	await auth.onAuthStateChanged(user);
+	// 	if (!init) {
+	// 		init = true;
+	// 		outsideResolve(true);
+	// 		return;
+	// 	}
+
+	// 	outsideReject();
+	// });
+
+	// setup();
+
+	// return promiseAuth;
 };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@thzero/library_client_firebase",
-  "version": "0.17.7",
+  "version": "0.17.8",
   "version_major": 0,
   "version_minor": 17,
-  "version_patch": 7,
-  "version_date": "04/19/2023",
+  "version_patch": 8,
+  "version_date": "04/20/2023",
   "author": "thZero",
   "license": "MIT",
   "repository": {

package/service/index.js

@@ -1,5 +1,6 @@
-// import firebase from 'firebase/app';
-// import 'firebase/auth';
+import { initializeApp } from 'firebase/app';
+// import { getAuth } from "firebase/auth";
+import { getAnalytics } from "firebase/analytics";
 import { getAuth, signInWithPopup, GoogleAuthProvider } from "firebase/auth";
 
 import LibraryClientConstants from '@thzero/library_client/constants';
@@ -18,6 +19,12 @@ class FirebaseAuthService extends UserAuthService {
 		this._serviceRouter = null;
 	}
 
+	async init(injector) {
+		await super.init(injector);
+
+		this._serviceRouter = this._injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_ROUTER);
+	}
+
 	async deleteUser(correlationId) {
 		try {
 			const user = await getAuth().currentUser;
@@ -33,28 +40,56 @@ class FirebaseAuthService extends UserAuthService {
 		}
 	}
 
-	async init(injector) {
-		await super.init(injector);
-
-		this._serviceRouter = this._injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_ROUTER);
-	}
-
 	get externalUser() {
 		const user = getAuth().currentUser;
 		this._logger.debug('FirebaseAuthService', 'tokenUser', 'user', user, LibraryCommonUtility.generateId());
 		return user;
 	}
 
+	async initialize(router) {
+		const configExternal = this._config.getExternal();
+		if (!configExternal)
+			throw Error('Invalid external config.');
+		const configFirebase = configExternal.firebase;
+		if (!configFirebase)
+			throw Error('Invalid firebase config.');
+		initializeApp(configFirebase);
+		if (configFirebase.measurementId)
+			getAnalytics();
+
+		let outsideResolve;
+		let outsideReject;
+		const promiseAuth = new Promise(function(resolve, reject) {
+			outsideResolve = resolve;
+			outsideReject = reject;
+		});
+
+		const self = this;
+		const firebaseAuth = getAuth();
+		// eslint-disable-next-line
+		let init = false;
+		firebaseAuth.onAuthStateChanged(async function(user) {
+			// const auth = LibrartyClientUtility.$injector.getService(LibraryClientConstants.InjectorKeys.SERVICE_AUTH);
+			// await auth.onAuthStateChanged(user);
+			await self.onAuthStateChanged(user);
+			if (!init) {
+				init = true;
+				outsideResolve(true);
+				return;
+			}
+
+			outsideReject();
+		});
+
+		return promiseAuth;
+	}
+
 	get isAuthenticated() {
 		const user = getAuth().currentUser;
 		this._logger.debug('FirebaseAuthService', 'isAuthenticated', 'user', user);
 		return user !== null;
 	}
 
-	get token() {
-		return this._serviceUser.token;
-	}
-
 	async onAuthStateChanged(user) {
 		const correlationId = LibraryCommonUtility.correlationId();
 		try {
@@ -317,6 +352,10 @@ class FirebaseAuthService extends UserAuthService {
 	  });
 	}
 
+	get token() {
+		return this._serviceUser.token;
+	}
+
 	// async token(forceRefresh) {
 	// 	if (!forceRefresh)
 	// 		forceRefresh = false