Update oidc-auth-provider-service.ts

twake/frontend/src/app/features/auth/provider/oidc/oidc-auth-provider-service.ts

@@ -69,59 +69,57 @@ export default class OIDCAuthProviderService
         this.signOut();
       }
       
-      this.userManager.events.addUserLoaded((user: any) => {
+      this.userManager.events.addUserLoaded((user: any, ...args) => {
-        console.log('New User Loaded：', arguments);
+        this.logger.debug('New User Loaded：', user, args);
-        console.log('Acess_token: ', user.access_token);
+        this.logger.debug('Acess_token: ', user.access_token);
       });
 
-      this.userManager.events.addAccessTokenExpiring(function () {
+      this.userManager.events.addAccessTokenExpiring((...args) => {
-        console.log('AccessToken Expiring：', arguments);
+        this.logger.debug('AccessToken Expiring：', args);
       });
 
-      this.userManager.events.addAccessTokenExpired(() => {
+      this.userManager.events.addAccessTokenExpired((...args) => {
-        console.log('AccessToken Expired：', arguments);
+        this.logger.debug('AccessToken Expired：', args);
       });
 
-      this.userManager.events.addSilentRenewError(function () {
+      this.userManager.events.addSilentRenewError((...args) => {
-        console.error('Silent Renew Error：', arguments);
+        console.error('Silent Renew Error：', args);
       });
 
-      (async () => {
-        try {
-          await this.userManager!.signinRedirectCallback();
-        } catch (e) {}
-
-        const user = await this.userManager?.getUser();
-
-        if (user) {
-          this.getJWTFromOidcToken(user, (err, jwt) => {
-            if (err) {
-              this.logger.error(
-                'OIDC user loaded listener, error while getting the JWT from OIDC token',
-                err,
-              );
-              this.signinRedirect();
-            }
-
-            if (!this.initialized) {
-              this.onInitialized();
-              this.initialized = true;
-            } else {
-              jwt && params.onNewToken(jwt);
-            }
-          });
-        } else {
-          this.userManager?.signinRedirect();
-        }
-      })();
-    }
-
     return this;
   }
 
   async signIn(): Promise<void> {
     this.logger.info('Signin');
-    this.signinRedirect();
+    
+    try {
+      await this.userManager!.signinRedirectCallback();
+    } catch (e) {
+      console.log("Not connected, connect through SSO");
+    }
+
+    const user = await this.userManager?.getUser();
+
+    if (user) {
+      this.getJWTFromOidcToken(user, (err, jwt) => {
+        if (err) {
+          this.logger.error(
+            'OIDC user loaded listener, error while getting the JWT from OIDC token',
+            err,
+          );
+          this.signinRedirect();
+        }
+
+        if (!this.initialized) {
+          this.onInitialized();
+          this.initialized = true;
+        } else {
+          jwt && this.params!.onNewToken(jwt);
+        }
+      });
+    } else {
+      this.userManager?.signinRedirect();
+    }
   }
 
   async signUp(): Promise<void> {