@annalib/anna-cognito-lib 2.2.8 → 2.2.10

package/fesm2020/annalib-anna-cognito-lib.mjs

@@ -5,7 +5,7 @@ import { Validators, FormBuilder, FormsModule, ReactiveFormsModule } from '@angu
 import * as i3$1 from '@angular/common/http';
 import * as i3 from '@angular/router';
 import { RouterModule } from '@angular/router';
-import { getCurrentUser, fetchAuthSession, signIn, confirmSignIn, resetPassword, confirmResetPassword, signOut } from 'aws-amplify/auth';
+import { fetchAuthSession, signIn, confirmSignIn, getCurrentUser, resetPassword, confirmResetPassword, signOut } from 'aws-amplify/auth';
 import * as i4 from 'ngx-toastr';
 import * as i4$1 from '@angular/common';
 import { CommonModule, NgOptimizedImage } from '@angular/common';
@@ -115,7 +115,7 @@ class AnnaLibAuthService {
     ngOnInit() { }
     async isUserLoggedIn() {
         try {
-            await getCurrentUser();
+            // await getCurrentUser();
             return new Promise(async (resolve, reject) => {
                 const session = await fetchAuthSession();
                 if (session?.tokens) {
@@ -140,7 +140,7 @@ class AnnaLibAuthService {
     sessionTimeout() {
         localStorage.clear();
         clearInterval(this.accessTokenTimerId);
-        this.router.navigate([LoginConstant.loginPageUrl]);
+        this.router.navigate([this.defaultLoginPageUrl ? this.defaultLoginPageUrl : LoginConstant.loginPageUrl]);
     }
     computeTokenExpiration(idToken) {
         let currentTime = Math.floor(Date.now() / 1000);
@@ -154,11 +154,7 @@ class AnnaLibAuthService {
             switch (nextStep?.signInStep) {
                 case "DONE":
                     let session = await fetchAuthSession();
-                    let newExpTime = this.computeTokenExpiration(session.tokens.idToken);
-                    this.accessToken = session.tokens.accessToken.toString();
-                    localStorage.setItem("accessTokenExpiration", newExpTime.toString());
-                    this.refreshAccessToken();
-                    this.loginErrorMessage = null;
+                    this.onLoginOrSetNewPassword(session);
                     await this.consumingProjectAuthService.onSuccessfulAuthenticatingUser(false);
                     this.getAllCognitoTokenAndGroups(session.tokens);
                     break;
@@ -186,6 +182,14 @@ class AnnaLibAuthService {
             }
         }
     }
+    onLoginOrSetNewPassword(session) {
+        let newExpTime = this.computeTokenExpiration(session.tokens.idToken);
+        this.accessToken = session.tokens.accessToken.toString();
+        this.IdToken = session.tokens.idToken.toString();
+        localStorage.setItem("accessTokenExpiration", newExpTime.toString());
+        this.refreshAccessToken();
+        this.loginErrorMessage = null;
+    }
     async getAllCognitoTokenAndGroups(token) {
         this.accessToken = token.accessToken.toString();
         this.IdToken = token.idToken;
@@ -241,6 +245,8 @@ class AnnaLibAuthService {
             const data = await confirmSignIn(inputParam);
             const { username } = await getCurrentUser();
             console.log(data);
+            let session = await fetchAuthSession();
+            this.onLoginOrSetNewPassword(session);
             this.consumingProjectAuthService.onPasswordUpdate(username);
             this.router.navigate([LoginConstant.loginPageUrl]);
             this.consumingProjectAuthService.newPasswordSetThenUpdateToBackend(username);
@@ -266,16 +272,18 @@ class AnnaLibAuthService {
         }
     }
     async verifyCode(confirmationCode, newPassword) {
-        const { username } = await getCurrentUser();
         try {
-            confirmResetPassword({ username, newPassword, confirmationCode });
-            this.consumingProjectAuthService.onPasswordUpdate(username);
-            this.expiryAllExistingCurrentSession(username, newPassword);
+            // const { username } = await getCurrentUser();
+            confirmResetPassword({ username: this.userName, newPassword: newPassword, confirmationCode: confirmationCode });
+            this.consumingProjectAuthService.onPasswordUpdate(this.userName);
+            this.expiryAllExistingCurrentSession(this.userName, newPassword);
         }
         catch (err) {
             console.log(err);
             this.noOfAttempts = this.noOfAttempts + 1;
             this.verifyAndSetNewPasswordErrorMessage = this.forgotPasswordError(err, this.noOfAttempts);
+        }
+        finally {
             this.forgotPasswordAndGlobalSignoutLoader = false;
         }
     }
@@ -666,6 +674,7 @@ class ForgotPasswordComponent {
         if (this.authService.userName) {
             this.onUpdateForm();
         }
+        this.authService.forgotPasswordAndGlobalSignoutLoader = false;
     }
     onIntialiseForm() {
         this.verifyRegisteredEmail = this.fb.group({