@annalib/anna-cognito-lib 2.2.10 → 2.2.12

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

@@ -101,13 +101,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
     } });
 
 class AnnaLibAuthService {
-    constructor(router, aclService, httpClient, toastr, consumingProjectAuthService, consumingProjectConfigService) {
+    constructor(router, aclService, httpClient, toastr, consumingProjectAuthService) {
         this.router = router;
         this.aclService = aclService;
         this.httpClient = httpClient;
         this.toastr = toastr;
         this.consumingProjectAuthService = consumingProjectAuthService;
-        this.consumingProjectConfigService = consumingProjectConfigService;
         this.noOfAttempts = 0;
         this.sessionLocked = false;
         if (!consumingProjectAuthService) {
@@ -122,7 +121,7 @@ class AnnaLibAuthService {
                 return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
                     const session = yield fetchAuthSession();
                     if (session === null || session === void 0 ? void 0 : session.tokens) {
-                        this.IdToken = session === null || session === void 0 ? void 0 : session.tokens.idToken.toString();
+                        this.consumingProjectAuthService.IdToken = session === null || session === void 0 ? void 0 : session.tokens.idToken.toString();
                         this.getAllCognitoTokenAndGroups(session.tokens);
                         resolve(true);
                     }
@@ -144,7 +143,7 @@ class AnnaLibAuthService {
     sessionTimeout() {
         localStorage.clear();
         clearInterval(this.accessTokenTimerId);
-        this.router.navigate([this.defaultLoginPageUrl ? this.defaultLoginPageUrl : LoginConstant.loginPageUrl]);
+        this.router.navigate([this.consumingProjectAuthService.defaultLoginPageUrl ? this.consumingProjectAuthService.defaultLoginPageUrl : LoginConstant.loginPageUrl]);
     }
     computeTokenExpiration(idToken) {
         let currentTime = Math.floor(Date.now() / 1000);
@@ -165,7 +164,7 @@ class AnnaLibAuthService {
                         break;
                     case "CONFIRM_SIGN_IN_WITH_NEW_PASSWORD_REQUIRED":
                         this.consumingProjectAuthService.isLoggingIn = false;
-                        this.userName = username;
+                        this.consumingProjectAuthService.userName = username;
                         this.router.navigate([LoginConstant.setNewPasswordUrl]);
                         this.setNewPasswordErrorMessage = null;
                         break;
@@ -190,16 +189,19 @@ class AnnaLibAuthService {
     }
     onLoginOrSetNewPassword(session) {
         let newExpTime = this.computeTokenExpiration(session.tokens.idToken);
-        this.accessToken = session.tokens.accessToken.toString();
-        this.IdToken = session.tokens.idToken.toString();
+        this.consumingProjectAuthService.accessToken = session.tokens.accessToken.toString();
+        this.consumingProjectAuthService.IdToken = session.tokens.idToken.toString();
         localStorage.setItem("accessTokenExpiration", newExpTime.toString());
         this.refreshAccessToken();
         this.loginErrorMessage = null;
     }
+    setAccessAndIDTokens(token) {
+        this.consumingProjectAuthService.accessToken = token.accessToken.toString();
+        this.consumingProjectAuthService.IdToken = token.idToken;
+    }
     getAllCognitoTokenAndGroups(token) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.accessToken = token.accessToken.toString();
-            this.IdToken = token.idToken;
+            this.setAccessAndIDTokens(token);
             if ("cognito:groups" in token.accessToken.payload) {
                 let userGroupsInCognitoJWT = token.accessToken.payload["cognito:groups"];
                 this.aclService.userGroupsInCognitoJWT = userGroupsInCognitoJWT;
@@ -220,7 +222,7 @@ class AnnaLibAuthService {
                     let token = session.tokens;
                     if (token) {
                         this.getAllCognitoTokenAndGroups(token);
-                        let newExpTime = this.computeTokenExpiration(this.IdToken);
+                        let newExpTime = this.computeTokenExpiration(this.consumingProjectAuthService.IdToken);
                         if (newExpTime <= 0) {
                             newExpTime = 1000;
                             counter = 0;
@@ -271,7 +273,7 @@ class AnnaLibAuthService {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let username = email;
-            this.userName = email;
+            this.consumingProjectAuthService.userName = email;
             try {
                 let result = yield resetPassword({ username });
                 this.verifyAndSetNewPasswordMessage =
@@ -287,10 +289,8 @@ class AnnaLibAuthService {
     verifyCode(confirmationCode, newPassword) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                // const { username } = await getCurrentUser();
-                confirmResetPassword({ username: this.userName, newPassword: newPassword, confirmationCode: confirmationCode });
-                this.consumingProjectAuthService.onPasswordUpdate(this.userName);
-                this.expiryAllExistingCurrentSession(this.userName, newPassword);
+                confirmResetPassword({ username: this.consumingProjectAuthService.userName, newPassword: newPassword, confirmationCode: confirmationCode });
+                yield this.expiryAllExistingCurrentSession(this.consumingProjectAuthService.userName, newPassword);
             }
             catch (err) {
                 console.log(err);
@@ -332,20 +332,17 @@ class AnnaLibAuthService {
         });
     }
     expiryAllExistingCurrentSession(username, newPassword) {
-        this.setUserDetails();
-        this.onLoginInCogntioToGetAccessToken(username, newPassword);
-    }
-    setUserDetails() {
         this.loginErrorMessage = null;
+        this.onLoginInCogntioToGetAccessToken(username, newPassword);
     }
     onLoginInCogntioToGetAccessToken(username, password) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const { isSignedIn, nextStep } = yield signIn({ username, password });
-                let session = yield fetchAuthSession();
+                const { nextStep } = yield signIn({ username, password });
                 switch (nextStep === null || nextStep === void 0 ? void 0 : nextStep.signInStep) {
                     case "DONE":
-                        this.getAllCognitoTokenAndGroups(session.tokens);
+                        this.setAccessAndIDTokens(yield (yield fetchAuthSession()).tokens);
+                        this.consumingProjectAuthService.onPasswordUpdate(this.consumingProjectAuthService.userName);
                         this.onCallGlobalSignout();
                         break;
                 }
@@ -366,7 +363,7 @@ class AnnaLibAuthService {
         });
     }
 }
-AnnaLibAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AnnaLibAuthService, deps: [{ token: i3.Router }, { token: AnnaLibAclService }, { token: i3$1.HttpClient }, { token: i4.ToastrService }, { token: AUTH_SERVICE_TOKEN }, { token: CONFIG_SERVICE_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable });
+AnnaLibAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AnnaLibAuthService, deps: [{ token: i3.Router }, { token: AnnaLibAclService }, { token: i3$1.HttpClient }, { token: i4.ToastrService }, { token: AUTH_SERVICE_TOKEN }], target: i0.ɵɵFactoryTarget.Injectable });
 AnnaLibAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AnnaLibAuthService, providedIn: "root" });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: AnnaLibAuthService, decorators: [{
             type: Injectable,
@@ -377,9 +374,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         return [{ type: i3.Router }, { type: AnnaLibAclService }, { type: i3$1.HttpClient }, { type: i4.ToastrService }, { type: undefined, decorators: [{
                         type: Inject,
                         args: [AUTH_SERVICE_TOKEN]
-                    }] }, { type: undefined, decorators: [{
-                        type: Inject,
-                        args: [CONFIG_SERVICE_TOKEN]
                     }] }];
     } });
 
@@ -688,12 +682,13 @@ class UserState {
 
 // Angular import statements
 class ForgotPasswordComponent {
-    constructor(authService, fb, toastr, router, consumingProjectConfigService) {
+    constructor(authService, fb, toastr, router, consumingProjectConfigService, consumingProjectAuthService) {
         this.authService = authService;
         this.fb = fb;
         this.toastr = toastr;
         this.router = router;
         this.consumingProjectConfigService = consumingProjectConfigService;
+        this.consumingProjectAuthService = consumingProjectAuthService;
         this.passwordNotMatching = false;
         this.password = { value: null, status: null };
         this.confirmPassword = { value: null, status: null };
@@ -704,7 +699,7 @@ class ForgotPasswordComponent {
         this.infoMessageToRedirectLogin = null;
         this.constants = LoginConstant;
         this.onIntialiseForm();
-        if (this.authService.userName) {
+        if (this.consumingProjectAuthService.userName) {
             this.onUpdateForm();
         }
         this.authService.forgotPasswordAndGlobalSignoutLoader = false;
@@ -716,7 +711,7 @@ class ForgotPasswordComponent {
     }
     onUpdateForm() {
         this.verifyRegisteredEmail.patchValue({
-            email: this.authService.userName,
+            email: this.consumingProjectAuthService.userName,
         });
     }
     isFormValid() {
@@ -768,7 +763,7 @@ class ForgotPasswordComponent {
         }
     }
 }
-ForgotPasswordComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ForgotPasswordComponent, deps: [{ token: AnnaLibAuthService }, { token: i2.FormBuilder }, { token: i4.ToastrService }, { token: i3.Router }, { token: CONFIG_SERVICE_TOKEN }], target: i0.ɵɵFactoryTarget.Component });
+ForgotPasswordComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ForgotPasswordComponent, deps: [{ token: AnnaLibAuthService }, { token: i2.FormBuilder }, { token: i4.ToastrService }, { token: i3.Router }, { token: CONFIG_SERVICE_TOKEN }, { token: AUTH_SERVICE_TOKEN }], target: i0.ɵɵFactoryTarget.Component });
 ForgotPasswordComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.9", type: ForgotPasswordComponent, selector: "anna-cognito-lib-forgot-password", ngImport: i0, template: "<div class=\"main\">\r\n  <section>\r\n      <header>\r\n          <img [src]=\"consumingProjectConfigService.appGenericConfig.loginPageLogoImgUrl\" alt=\"Anna Logo\" />\r\n      </header>\r\n      <article>\r\n          <form [formGroup]=\"verifyRegisteredEmail\">\r\n              <ng-container *ngIf=\"!infoMessageToRedirectLogin\">\r\n                <div id=\"heading\">\r\n                  {{ constants.forgotPasswordHeading }}\r\n                </div>\r\n                <p>\r\n                    {{ constants.forgotPasswordMessage }}\r\n                </p>\r\n              </ng-container>\r\n              <div id=\"alert-div\" *ngIf=\"errorMessage\">\r\n                  <span class=\"material-icons\">report</span>\r\n                  <p id=\"alert-msg\">{{ errorMessage }}</p>\r\n              </div>\r\n              <div id=\"info-div\" *ngIf=\"infoMessageToRedirectLogin\">\r\n                  <i class=\"mi mdi-info\"></i>\r\n                  <p>{{ infoMessageToRedirectLogin }}</p>\r\n              </div>\r\n\r\n              <input *ngIf=\"!infoMessageToRedirectLogin\"\r\n                  type=\"text\"\r\n                  tabindex=\"1\"\r\n                  formControlName=\"email\"\r\n                  [placeholder]=\"constants.enterEmail\"\r\n                  [ngClass]=\"{\r\n                      'input-invalid': verifyRegisteredEmail.get('email')?.dirty && verifyRegisteredEmail.get('email')?.errors\r\n                  }\"\r\n              />\r\n\r\n              <button\r\n                tabindex=\"2\"\r\n                type=\"submit\"\r\n                class=\"login-btn\"\r\n                [anna-cognito-lib-SpinnerButton]=\"isLoading\"\r\n                (click)=\"onLoginOrGetOtpButtonClick()\"\r\n                [spinnerButtonText]=\"infoMessageToRedirectLogin ? constants.login : constants.forgotPasswordButton\"\r\n              ></button>\r\n          </form>\r\n      </article>\r\n      <footer>\r\n        <anna-cognito-lib-powered-by-logo-template>\r\n        </anna-cognito-lib-powered-by-logo-template>\r\n      </footer>\r\n  </section>\r\n</div>\r\n\r\n<div class=\"page-footer\">\r\n  <anna-cognito-lib-surewaves-year-logo></anna-cognito-lib-surewaves-year-logo>\r\n  <anna-cognito-lib-version-and-term-policy></anna-cognito-lib-version-and-term-policy>\r\n</div>\r\n", styles: ["@keyframes show{0%{opacity:0}50%{opacity:.5}to{opacity:1}}html{overflow-y:scroll}.main{background-color:#fff;background-size:cover;font-family:Roboto;height:calc(100vh - 50px)}section{top:45%;left:50%;position:absolute;transform:translate(-50%,-50%);width:20.875rem;animation:show .5s 1;-moz-animation:show .5s 1}.container{width:100%;height:100%;overflow:auto}header{height:auto;width:100%;text-align:center}article{margin-top:.9375rem;margin-bottom:.9375rem;border:1px solid #979797;background-color:#f4f4f4;padding:2rem 1.375rem;border-radius:.375rem;box-shadow:0 .125rem .4375rem #0000001a}article .sub-title{color:#6e6e6e;font-family:Roboto;font-size:1.25rem;font-weight:700;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal}article #heading{color:#212121;text-align:center;margin-bottom:1.5rem;font-family:Roboto;font-size:1.125rem;font-weight:400;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal}p{text-align:center;margin-bottom:1rem}#alert-div{padding:.25rem 0 0;margin-bottom:.75rem;border-radius:.25rem;border:solid 1px #f9b3ae;background-color:#fde4e3}#alert-div .material-icons{color:#f44336;font-size:1rem;margin-left:.5rem}#alert-div .mdi-info{color:#268bff;font-size:1rem}#alert-div p{margin:-1.5625rem 0 0 1.8rem;padding:.3125rem 0;color:#4a4a4a;font-family:Roboto;font-size:.75rem;font-weight:400;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal}#info-div{padding:6px 0;margin-bottom:.75rem;border-radius:.25rem;border:1px solid #268bff;background:#e3f0ff}#info-div .mdi-info{color:#268bff;font-size:1rem;margin-left:6px}#info-div p{margin:-1.5625rem 0 0 1.8rem;padding:.3125rem 0;color:#4a4a4a;font-family:Roboto;font-size:.75rem;font-weight:400;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal}footer{align-items:baseline;color:#6e6e6e;opacity:.9;display:flex;font-family:Ubuntu;font-size:1.25rem;font-weight:400;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal;justify-content:center}footer span{font-size:1.5625rem;margin-left:.25rem}input[type=password],input[type=text],input[type=number]{width:100%;height:30px;padding:.75rem 1rem;border:1px solid #979797;margin-bottom:.625rem;border-radius:.375rem}.login-btn{width:100%;height:2.5rem;border:0;color:#fff;background-color:#268bff;border-radius:.375rem;font-size:1rem}.login-btn:hover{background-color:#4099ff;cursor:pointer}.login-btn:disabled{background-color:#ccc;color:#fff;cursor:not-allowed}.input-invalid{border:1px solid #fe3824!important}input[type=password].ng-dirty.ng-invalid,input[type=text].ng-dirty.ng-invalid{border:1px solid #fe3824}input[type=submit]:focus,input[type=password]:focus,input[type=text]:focus,input[type=checkbox]:focus,button:focus{outline:none}input::placeholder{color:#a4a4a4}:host ::ng-deep .verison-and-policy{color:#8bac2a}p{color:#4a4a4a;font-family:Roboto;font-size:1rem;font-weight:400;font-stretch:normal;font-style:normal;line-height:normal;letter-spacing:normal}input[type=text]{margin-bottom:16px}input[type=text]:focus{box-shadow:none}.back-btn{font-size:27px;position:relative;color:#268bff;float:left;top:-30px;left:-15px;font-weight:400!important}\n"], dependencies: [{ kind: "directive", type: i2.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i2.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i2.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i2.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i2.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }, { kind: "directive", type: i4$1.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i4$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: SpinnerButtonDirective, selector: "[anna-cognito-lib-SpinnerButton]", inputs: ["anna-cognito-lib-SpinnerButton", "spinnerButtonText"] }, { kind: "component", type: VersionAndTermPolicyComponent, selector: "anna-cognito-lib-version-and-term-policy" }, { kind: "component", type: SurewavesYearLogoComponent, selector: "anna-cognito-lib-surewaves-year-logo" }, { kind: "component", type: PoweredByLogoTemplateComponent, selector: "anna-cognito-lib-powered-by-logo-template" }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImport: i0, type: ForgotPasswordComponent, decorators: [{
             type: Component,
@@ -777,6 +772,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
         return [{ type: AnnaLibAuthService }, { type: i2.FormBuilder }, { type: i4.ToastrService }, { type: i3.Router }, { type: undefined, decorators: [{
                         type: Inject,
                         args: [CONFIG_SERVICE_TOKEN]
+                    }] }, { type: undefined, decorators: [{
+                        type: Inject,
+                        args: [AUTH_SERVICE_TOKEN]
                     }] }];
     } });