@ohioepa/oepa-ui-lib 1.2.12 → 1.2.14

package/fesm2022/ohioepa-oepa-ui-lib.mjs

@@ -7202,6 +7202,7 @@ class OepaUserAccountService {
     idleSubject = new Subject();
     timeoutID;
     userAccount$ = new Subject();
+    sessionID$ = new Subject(); // session ID is used for "backdoor" processing of internal (webapps) accounts
     authToken = '';
     constructor(http, ebizRootURL) {
         this.http = http;
@@ -7217,7 +7218,6 @@ class OepaUserAccountService {
         return this.http.get(this.hostUrl + this.accountsUrl + '/' + userid);
     }
     retrieveAccountByOHID(ohid, app) {
-        console.log('retrieve account for: ' + ohid);
         const url = this.hostUrl + this.accountsUrl + '/ohid/' + ohid;
         return this.http.get(url, { params: { 'app': app } }).pipe(map((userAccount) => {
             this.userAccount$.next(userAccount);
@@ -7225,31 +7225,27 @@ class OepaUserAccountService {
         }));
     }
     /**
-     * @deprecated Should not use session user ID for Amplify apps
      * Retrieve the user account for the currently logged in user.
      * @returns Observable<OepaUserAccount>
      */
-    retrieveAccountForCurrentUser() {
+    retrieveAccountForCurrentUser(app) {
         return this.http.get(this.hostUrl + '/api/v1/userAccounts/login').pipe(map((account) => {
             if (!account) {
                 if (this.personID && this.sessionID) {
-                    this.retrieveAccountForInternalSession(this.personID, this.sessionID).subscribe({
+                    this.retrieveAccountForInternalSession(this.personID, this.sessionID, app).subscribe({
                         next: internalAccount => {
                             if (internalAccount) {
                                 this.account = internalAccount;
                             }
                             else {
-                                this.logMessageOnServer('retrieveAccountForCurrentUser - no account, redirecting to logout');
                                 this.redirectToLogout();
                             }
                         }, error: err => {
-                            this.logMessageOnServer('Failed retrieving internal account: ' + err);
                             this.redirectToLogout();
                         }
                     });
                 }
                 else {
-                    this.logMessageOnServer('retrieveAccountForCurrentUser - no account, redirecting to logout');
                     this.redirectToLogout();
                 }
             }
@@ -7274,19 +7270,17 @@ class OepaUserAccountService {
     }
     /**
      * Retrieve the user account for the currently logged in user.
-     * @deprecated should retrieve account by OHID instead
      * @param sessionID person ID for internal user
      * @returns Observable<OepaUserAccount>
      */
-    retrieveAccountForInternalSession(personID, sessionID) {
+    retrieveAccountForInternalSession(personID, sessionID, app) {
         this.account = {};
-        const url = this.hostUrl + '/api/v1/userAccounts/internal/personID/' + personID + '/sessionID/' + sessionID;
-        console.log('retrieveAccountForInternalSession: ' + url);
-        return this.http.get(url).pipe(map((account) => {
+        const url = this.hostUrl + this.accountsUrl + '/internal/personID/' + personID + '/sessionID/' + sessionID;
+        return this.http.get(url, { params: { 'app': app } }).pipe(map((account) => {
             this.account = account;
             this.personID = personID;
             this.sessionID = sessionID;
-            console.log('retrieveAccountForInternalSession: ' + this.account?.loginName || '<unknown>');
+            this.sessionID$.next(sessionID);
             return account;
         }));
     }
@@ -7361,13 +7355,13 @@ class OepaUserAccountService {
      * The methods below currently apply only to eBiz.
      * ===========================================================================================================================
      */
-    getWebappsRootURL() {
+    getWebappsRootURL(app) {
         if (this.webappsRootURL) {
             return of(this.webappsRootURL);
         }
         else {
             const url = this.hostUrl + '/api/v1/gateway/gatewayConfig';
-            return this.http.get(url).pipe(map((gatewayConfig) => {
+            return this.http.get(url, { params: { 'app': app } }).pipe(map((gatewayConfig) => {
                 if (gatewayConfig) {
                     this.webappsRootURL = gatewayConfig.webappsRootURL;
                 }
@@ -7375,13 +7369,13 @@ class OepaUserAccountService {
             }));
         }
     }
-    getEBizVersion() {
+    getEBizVersion(app) {
         if (this.ebizVersion) {
             return of(this.ebizVersion);
         }
         else {
             const url = this.hostUrl + '/api/v1/gateway/gatewayConfig';
-            return this.http.get(url).pipe(map((gatewayConfig) => {
+            return this.http.get(url, { params: { 'app': app } }).pipe(map((gatewayConfig) => {
                 if (gatewayConfig) {
                     this.ebizVersion = gatewayConfig.versionNumber;
                 }
@@ -7588,6 +7582,7 @@ class PinModalComponent {
     }
     submitCallback;
     submittingComponent;
+    app = '';
     close = new EventEmitter();
     imageRoot = '/AngularWebApp/assets/images';
     oepaSubmissionForm;
@@ -7618,7 +7613,7 @@ class PinModalComponent {
     }
     retrievePin() {
         this.errorMessage = '';
-        this.userAccountService.retrieveAccountForCurrentUser().subscribe(account => {
+        this.userAccountService.retrieveAccountForCurrentUser(this.app).subscribe(account => {
             if (account) {
                 this.userAccount = account;
                 this.currentUserID = account.loginName;
@@ -7736,7 +7731,7 @@ class PinModalComponent {
         });
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PinModalComponent, deps: [{ token: OepaUserAccountService }, { token: i1$2.FormBuilder }, { token: OepaPinService }, { token: i2$1.BsModalRef }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.13", type: PinModalComponent, selector: "oepa-pin-modal", inputs: { attestationID: "attestationID", submitCallback: "submitCallback", submittingComponent: "submittingComponent" }, outputs: { close: "close" }, ngImport: i0, template: "<form [formGroup]=\"oepaSubmissionForm\">\n  <div class=\"modal-body\">\n\n    <div [hidden]=\"noPin\">\n      <div class=\"card-header\">\n          <div class=\"row\" *ngIf=\"pinAttestation.text\">\n              <div class=\"col-md-12\">\n                <div class=\"well\" [innerHTML]=\"pinAttestation.text\"></div>\n              </div>\n            </div>\n      </div>\n      <br>\n      <div class=\"card-header\" *ngIf=\"serviceAttestation\">\n          <div class=\"row\" *ngIf=\"serviceAttestation.text\">\n              <div class=\"col-md-12\">\n                <div class=\"well\" [innerHTML]=\"serviceAttestation.text\">\"</div>\n              </div>\n            </div>\n      </div>\n    </div>\n    <br>\n\n    <div class=\"row\" *ngIf=\"loadingAttestations\">\n      <div class=\"col-md-12\">\n        <div class=\"alert alert-info\">\n          <span class=\"spinner-border text-primary\" role=\"status\"></span> Loading PIN information...\n        </div>\n      </div>\n    </div>\n\n    <div [hidden]=\"loadingAttestations || noPin\">\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <div class=\"form-group\">\n            <label style=\"padding: 5px;\"><b>Security Question:</b></label>\n            <label>{{securityQuestion.question}}</label>\n            <div>\n              <input  [ngClass]=\"{'is-invalid':showValidation && !oepaSubmissionForm.controls['securityAnswer'].valid}\"\n                formControlName=\"securityAnswer\" type=\"password\" class=\"form-control\" name=\"securityAnswer\" placeholder=\"Answer\" required>\n              <small class=\"invalid-feedback\" *ngIf=\"showValidation && !oepaSubmissionForm.controls['securityAnswer'].valid\">Answer to security question is required</small>\n            </div>\n          </div>\n        </div>\n      </div>\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <div class=\"form-group\">\n            <label><b>PIN: </b></label>\n            <div>\n              <input [ngClass]=\"{'is-invalid':showValidation && !oepaSubmissionForm.controls['securityPIN'].valid}\"\n                formControlName=\"securityPIN\" type=\"password\" class=\"form-control\" name=\"securityPIN\" placeholder=\"PIN\" required>\n              <small class=\"invalid-feedback\" *ngIf=\"showValidation && !oepaSubmissionForm.controls['securityPIN'].valid\">A valid PIN is required</small>\n            </div>\n          </div>\n        </div>\n      </div>\n    </div>\n    \n    <div >\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <!-- toggle hasPin message -->\n          <div *ngIf=\"noPin\">\n            <b>Attention:</b> Before you can submit, you first must activate your PIN. Cancel this submission, save the application/report and go back to the main eBusiness Home Page. \n            Select <b>MY Account- Request New PIN</b> to get started. <br>\n          </div>\n        </div>\n      </div>\n    </div>\n\n    <div class=\"row\" *ngIf=\"errorMessage\">\n      <div class=\"col-md-12\">\n        <div class=\"alert alert-danger\" role=\"alert\">{{ errorMessage }}</div>\n      </div>\n    </div>\n\n  </div>\n\n\n  <div class=\"modal-footer\">\n    <span *ngIf=\"submitInProgress === true\" id=\"wait\"><span class=\"spinner-border text-primary\" role=\"status\"></span>Please wait...&nbsp;&nbsp;</span>\n    <button class=\"btn btn-primary mr-1\" (click)=\"submit()\" [disabled]=\"submitInProgress || !oepaSubmissionForm.valid\">Submit</button>\n    <button class=\"btn btn-primary mr-1\" (click)=\"cancel()\" [disabled]=\"submitInProgress\">Cancel</button>\n  </div>\n\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$2.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1$2.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: i1$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$2.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1$2.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i1$2.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1$2.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "18.2.13", type: PinModalComponent, selector: "oepa-pin-modal", inputs: { attestationID: "attestationID", submitCallback: "submitCallback", submittingComponent: "submittingComponent", app: "app" }, outputs: { close: "close" }, ngImport: i0, template: "<form [formGroup]=\"oepaSubmissionForm\">\n  <div class=\"modal-body\">\n\n    <div [hidden]=\"noPin\">\n      <div class=\"card-header\">\n          <div class=\"row\" *ngIf=\"pinAttestation.text\">\n              <div class=\"col-md-12\">\n                <div class=\"well\" [innerHTML]=\"pinAttestation.text\"></div>\n              </div>\n            </div>\n      </div>\n      <br>\n      <div class=\"card-header\" *ngIf=\"serviceAttestation\">\n          <div class=\"row\" *ngIf=\"serviceAttestation.text\">\n              <div class=\"col-md-12\">\n                <div class=\"well\" [innerHTML]=\"serviceAttestation.text\">\"</div>\n              </div>\n            </div>\n      </div>\n    </div>\n    <br>\n\n    <div class=\"row\" *ngIf=\"loadingAttestations\">\n      <div class=\"col-md-12\">\n        <div class=\"alert alert-info\">\n          <span class=\"spinner-border text-primary\" role=\"status\"></span> Loading PIN information...\n        </div>\n      </div>\n    </div>\n\n    <div [hidden]=\"loadingAttestations || noPin\">\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <div class=\"form-group\">\n            <label style=\"padding: 5px;\"><b>Security Question:</b></label>\n            <label>{{securityQuestion.question}}</label>\n            <div>\n              <input  [ngClass]=\"{'is-invalid':showValidation && !oepaSubmissionForm.controls['securityAnswer'].valid}\"\n                formControlName=\"securityAnswer\" type=\"password\" class=\"form-control\" name=\"securityAnswer\" placeholder=\"Answer\" required>\n              <small class=\"invalid-feedback\" *ngIf=\"showValidation && !oepaSubmissionForm.controls['securityAnswer'].valid\">Answer to security question is required</small>\n            </div>\n          </div>\n        </div>\n      </div>\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <div class=\"form-group\">\n            <label><b>PIN: </b></label>\n            <div>\n              <input [ngClass]=\"{'is-invalid':showValidation && !oepaSubmissionForm.controls['securityPIN'].valid}\"\n                formControlName=\"securityPIN\" type=\"password\" class=\"form-control\" name=\"securityPIN\" placeholder=\"PIN\" required>\n              <small class=\"invalid-feedback\" *ngIf=\"showValidation && !oepaSubmissionForm.controls['securityPIN'].valid\">A valid PIN is required</small>\n            </div>\n          </div>\n        </div>\n      </div>\n    </div>\n    \n    <div >\n      <div class=\"row\">\n        <div class=\"col-md-12\">\n          <!-- toggle hasPin message -->\n          <div *ngIf=\"noPin\">\n            <b>Attention:</b> Before you can submit, you first must activate your PIN. Cancel this submission, save the application/report and go back to the main eBusiness Home Page. \n            Select <b>MY Account- Request New PIN</b> to get started. <br>\n          </div>\n        </div>\n      </div>\n    </div>\n\n    <div class=\"row\" *ngIf=\"errorMessage\">\n      <div class=\"col-md-12\">\n        <div class=\"alert alert-danger\" role=\"alert\">{{ errorMessage }}</div>\n      </div>\n    </div>\n\n  </div>\n\n\n  <div class=\"modal-footer\">\n    <span *ngIf=\"submitInProgress === true\" id=\"wait\"><span class=\"spinner-border text-primary\" role=\"status\"></span>Please wait...&nbsp;&nbsp;</span>\n    <button class=\"btn btn-primary mr-1\" (click)=\"submit()\" [disabled]=\"submitInProgress || !oepaSubmissionForm.valid\">Submit</button>\n    <button class=\"btn btn-primary mr-1\" (click)=\"cancel()\" [disabled]=\"submitInProgress\">Cancel</button>\n  </div>\n\n</form>", styles: [""], dependencies: [{ kind: "directive", type: i2.NgClass, selector: "[ngClass]", inputs: ["class", "ngClass"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i1$2.ɵNgNoValidate, selector: "form:not([ngNoForm]):not([ngNativeValidate])" }, { kind: "directive", type: i1$2.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: i1$2.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1$2.NgControlStatusGroup, selector: "[formGroupName],[formArrayName],[ngModelGroup],[formGroup],form:not([ngNoForm]),[ngForm]" }, { kind: "directive", type: i1$2.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i1$2.FormGroupDirective, selector: "[formGroup]", inputs: ["formGroup"], outputs: ["ngSubmit"], exportAs: ["ngForm"] }, { kind: "directive", type: i1$2.FormControlName, selector: "[formControlName]", inputs: ["formControlName", "disabled", "ngModel"], outputs: ["ngModelChange"] }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: PinModalComponent, decorators: [{
             type: Component,
@@ -7747,6 +7742,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.2.13", ngImpo
                 type: Input
             }], submittingComponent: [{
                 type: Input
+            }], app: [{
+                type: Input
             }], close: [{
                 type: Output
             }] } });
@@ -9461,6 +9458,7 @@ class OepaHttpInterceptor {
     userAccountService;
     defaultTimeout = 5 * 60 * 1000;
     userID = '';
+    sessionID = '';
     constructor(userAccountService) {
         this.userAccountService = userAccountService;
         this.userAccountService.userAccount$.subscribe(account => {
@@ -9468,6 +9466,9 @@ class OepaHttpInterceptor {
                 this.userID = account.loginName || '';
             }
         });
+        this.userAccountService.sessionID$.subscribe(sessionID => {
+            this.sessionID = sessionID;
+        });
     }
     /**
      * Add a timestamp as a query parameter to all http requests
@@ -9483,6 +9484,9 @@ class OepaHttpInterceptor {
         if (this.userID) {
             params['userid'] = this.userID;
         }
+        if (this.sessionID) {
+            params['sessionid'] = this.sessionID;
+        }
         let changedReq = undefined;
         if (authToken) {
             changedReq = req.clone({