@thzero/library_client_firebase 0.17.17 → 0.17.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/service/index.js +17 -18
package/package.json
CHANGED
package/service/index.js
CHANGED
|
@@ -45,7 +45,7 @@ class FirebaseAuthService extends UserAuthService {
|
|
|
45
45
|
|
|
46
46
|
async getExternalUser() {
|
|
47
47
|
if (this._auth) {
|
|
48
|
-
this._logger.debug('FirebaseAuthService', '
|
|
48
|
+
this._logger.debug('FirebaseAuthService', 'getExternalUser', 'user', this._auth.currentUser);
|
|
49
49
|
return this._auth.currentUser;
|
|
50
50
|
}
|
|
51
51
|
return null;
|
|
@@ -198,14 +198,14 @@ class FirebaseAuthService extends UserAuthService {
|
|
|
198
198
|
this._logger.info2('requiresAuth');
|
|
199
199
|
let isLoggedIn = await this.isAuthenticated();
|
|
200
200
|
this._logger.info2('authorization.isLoggedIn', isLoggedIn);
|
|
201
|
-
console.log('authorization.isLoggedIn', isLoggedIn);
|
|
201
|
+
// console.log('authorization.isLoggedIn', isLoggedIn);
|
|
202
202
|
if (!isLoggedIn) {
|
|
203
203
|
// Briefly wait for authentication to settle...
|
|
204
204
|
let i = 0;
|
|
205
205
|
while (await this.sleep(150)) {
|
|
206
206
|
if (this._serviceStore.userAuthCompleted) {
|
|
207
207
|
this._logger.info2('authorization.userAuthCompleted', userAuthCompleted);
|
|
208
|
-
console.log('authorization.userAuthCompleted', userAuthCompleted);
|
|
208
|
+
// console.log('authorization.userAuthCompleted', userAuthCompleted);
|
|
209
209
|
break;
|
|
210
210
|
}
|
|
211
211
|
i++;
|
|
@@ -217,14 +217,14 @@ class FirebaseAuthService extends UserAuthService {
|
|
|
217
217
|
}
|
|
218
218
|
const isLoggedInAuthCompleted = await this.isAuthenticated();
|
|
219
219
|
this._logger.info2('authorization.isLoggedIn.userAuthCompleted', isLoggedInAuthCompleted);
|
|
220
|
-
console.log('authorization.isLoggedIn.userAuthCompleted', isLoggedInAuthCompleted);
|
|
220
|
+
// console.log('authorization.isLoggedIn.userAuthCompleted', isLoggedInAuthCompleted);
|
|
221
221
|
isLoggedIn = isLoggedInAuthCompleted;
|
|
222
222
|
}
|
|
223
223
|
this._logger.info2('authorization.isLoggedIn.final', isLoggedIn);
|
|
224
|
-
console.log('authorization.isLoggedIn.final', isLoggedIn);
|
|
224
|
+
// console.log('authorization.isLoggedIn.final', isLoggedIn);
|
|
225
225
|
if (!isLoggedIn) {
|
|
226
226
|
this._logger.warn2('authorization.isLoggedIn - failed');
|
|
227
|
-
console.log('authorization.isLoggedIn - failed');
|
|
227
|
+
// console.log('authorization.isLoggedIn - failed');
|
|
228
228
|
// LibraryClientUtility.$EventBus.on('auth-refresh', (user) => {
|
|
229
229
|
// this._logger.debug('auth-refresh', user)
|
|
230
230
|
// this._logger.debug('middleware', 'auth-refresh', null, user, correlationId);
|
|
@@ -235,28 +235,27 @@ class FirebaseAuthService extends UserAuthService {
|
|
|
235
235
|
}
|
|
236
236
|
|
|
237
237
|
this._logger.info2('authorization.isLoggedIn - success');
|
|
238
|
-
console.log('authorization.isLoggedIn - success');
|
|
238
|
+
// console.log('authorization.isLoggedIn - success');
|
|
239
239
|
|
|
240
240
|
const user = this._serviceUser.user;
|
|
241
241
|
let success = true;
|
|
242
|
-
|
|
243
|
-
this
|
|
244
|
-
console.log('authorization.
|
|
245
|
-
this._logger.
|
|
246
|
-
console.log('authorization.requiresAuthLogical', requiresAuthLogical);
|
|
242
|
+
// console.log('authorization.requiresAuthRoles', requiresAuthRoles);
|
|
243
|
+
this._logger.debug('FirebaseAuthService', 'resolveAuthorization', 'requiresAuthRoles', requiresAuthRoles);
|
|
244
|
+
// console.log('authorization.requiresAuthLogical', requiresAuthLogical);
|
|
245
|
+
this._logger.debug('FirebaseAuthService', 'resolveAuthorization', 'requiresAuthLogical', requiresAuthLogical);
|
|
247
246
|
|
|
248
247
|
if (requiresAuthRoles) {
|
|
249
248
|
success = await this._serviceSecurity.authorizationCheckRoles(correlationId, user, requiresAuthRoles, requiresAuthLogical);
|
|
250
249
|
this._logger.info2('authorization.roles.success', success);
|
|
251
|
-
console.log('authorization.roles.success', success);
|
|
250
|
+
// console.log('authorization.roles.success', success);
|
|
252
251
|
}
|
|
253
252
|
|
|
254
|
-
this._logger.debug('
|
|
255
|
-
console.log('authorization.roles.success', success);
|
|
253
|
+
this._logger.debug('FirebaseAuthService', 'resolveAuthorization', 'success', success, correlationId);
|
|
254
|
+
// console.log('authorization.roles.success', success);
|
|
256
255
|
this._logger.info2('authorization.roles.success', success);
|
|
257
256
|
if (!success) {
|
|
258
257
|
this._logger.warn2('authorization.roles - failed');
|
|
259
|
-
console.log('authorization.roles - failed');
|
|
258
|
+
// console.log('authorization.roles - failed');
|
|
260
259
|
LibraryClientUtility.$navRouter.push('/', null, () => {
|
|
261
260
|
// LibraryClientUtility.$navRouter.push('/')
|
|
262
261
|
// window.location.href = '/'
|
|
@@ -264,8 +263,8 @@ class FirebaseAuthService extends UserAuthService {
|
|
|
264
263
|
return false;
|
|
265
264
|
}
|
|
266
265
|
|
|
267
|
-
this._logger.
|
|
268
|
-
console.log('authorization.roles - success');
|
|
266
|
+
this._logger.debug('FirebaseAuthService', 'resolveAuthorization', 'roles.success', true, correlationId);
|
|
267
|
+
// console.log('authorization.roles - success');
|
|
269
268
|
|
|
270
269
|
return true;
|
|
271
270
|
}
|