Merge pull request #1220 from linjie997/remove-jsrsasign

Remove jsrsasign

Author: damienbod

package-lock.json

@@ -64,7 +64,6 @@
     "@angular/platform-browser-dynamic": "~13.0.1",
     "@angular/router": "~13.0.1",
     "@schematics/angular": "~13.0.1",
-    "jsrsasign-reduced": "^8.0.15",
     "rxjs": "^7.4.0",
     "tslib": "^2.1.0",
     "zone.js": "~0.11.4"
@@ -101,6 +100,7 @@
     "ng-packagr": "^13.0.3",
     "prettier": "^2.2.1",
     "protractor": "~7.0.0",
+    "rfc4648": "^1.5.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
     "typescript": "~4.4.3"

package.json

@@ -4,5 +4,5 @@
   "lib": {
     "entryFile": "src/public-api.ts"
   },
-  "allowedNonPeerDependencies": ["jsrsasign-reduced", "@angular-devkit/core", "@schematics/angular", "@angular-devkit/schematics"]
+  "allowedNonPeerDependencies": ["rfc4648", "@angular-devkit/core", "@schematics/angular", "@angular-devkit/schematics"]
 }

projects/angular-auth-oidc-client/ng-package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "jsrsasign-reduced": "^8.0.15"
+    "rfc4648": "^1.5.0"
   },
   "repository": {
     "type": "git",

projects/angular-auth-oidc-client/package.json

@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
+import { Observable, of } from 'rxjs';
 import { AuthWellKnownEndpoints } from './auth-well-known-endpoints';
 
 @Injectable()
 export class AuthWellKnownServiceMock {
-  getAuthWellKnownEndPoints(authWellknownEndpoint: string) {
-    return null;
+  getAuthWellKnownEndPoints(authWellknownEndpoint: string): Observable<AuthWellKnownEndpoints> {
+    return of(null);
   }
 
   storeWellKnownEndpoints(mappedWellKnownEndpoints: AuthWellKnownEndpoints) {}

projects/angular-auth-oidc-client/src/lib/config/auth-well-known/auth-well-known.service-mock.ts

@@ -21,4 +21,5 @@ export interface AuthResult {
   error?: any;
   // eslint-disable-next-line @typescript-eslint/naming-convention
   session_state?: any;
+  state?: any;
 }

projects/angular-auth-oidc-client/src/lib/flows/callback-context.ts

@@ -12,6 +12,7 @@ import { CallbackContext } from '../callback-context';
 import { ResetAuthDataService } from '../reset-auth-data.service';
 import { ResetAuthDataServiceMock } from '../reset-auth-data.service-mock';
 import { StateValidationCallbackHandlerService } from './state-validation-callback-handler.service';
+import { of } from 'rxjs';
 
 describe('StateValidationCallbackHandlerService', () => {
   let service: StateValidationCallbackHandlerService;
@@ -35,7 +36,8 @@ describe('StateValidationCallbackHandlerService', () => {
               get hash() {
                 return '&anyFakeHash';
               },
-              set hash(v) {},
+              set hash(v) {
+              },
             },
           },
         },
@@ -59,10 +61,12 @@ describe('StateValidationCallbackHandlerService', () => {
     it(
       'returns callbackContext with validationResult if validationResult is valid',
       waitForAsync(() => {
-        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue({
-          idToken: 'idTokenJustForTesting',
-          authResponseIsValid: true,
-        } as StateValidationResult);
+        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue(
+          of({
+            idToken: 'idTokenJustForTesting',
+            authResponseIsValid: true,
+          } as StateValidationResult),
+        );
 
         service.callbackStateValidation({} as CallbackContext, 'configId').subscribe((newCallbackContext) => {
           expect(newCallbackContext).toEqual({
@@ -72,36 +76,40 @@ describe('StateValidationCallbackHandlerService', () => {
             },
           } as CallbackContext);
         });
-      })
+      }),
     );
 
     it(
       'logs error in case of an error',
       waitForAsync(() => {
-        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue({
-          authResponseIsValid: false,
-        } as StateValidationResult);
+        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue(
+          of({
+            authResponseIsValid: false,
+          } as StateValidationResult),
+        );
 
         const loggerSpy = spyOn(loggerService, 'logWarning');
 
         service.callbackStateValidation({} as CallbackContext, 'configId').subscribe({
           error: (err) => {
             expect(loggerSpy).toHaveBeenCalledOnceWith(
               'configId',
-              'authorizedCallback, token(s) validation failed, resetting. Hash: &anyFakeHash'
+              'authorizedCallback, token(s) validation failed, resetting. Hash: &anyFakeHash',
             );
           },
         });
-      })
+      }),
     );
 
     it(
       'calls resetAuthDataService.resetAuthorizationData and authStateService.updateAndPublishAuthState in case of an error',
       waitForAsync(() => {
-        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue({
-          authResponseIsValid: false,
-          state: ValidationResult.LoginRequired,
-        } as StateValidationResult);
+        spyOn(stateValidationService, 'getValidatedStateResult').and.returnValue(
+          of({
+            authResponseIsValid: false,
+            state: ValidationResult.LoginRequired,
+          } as StateValidationResult),
+        );
 
         const resetAuthorizationDataSpy = spyOn(resetAuthDataService, 'resetAuthorizationData');
         const updateAndPublishAuthStateSpy = spyOn(authStateService, 'updateAndPublishAuthState');
@@ -116,7 +124,7 @@ describe('StateValidationCallbackHandlerService', () => {
             });
           },
         });
-      })
+      }),
     );
   });
 });

projects/angular-auth-oidc-client/src/lib/flows/callback-handling/state-validation-callback-handler.service.spec.ts

@@ -1,12 +1,13 @@
 import { DOCUMENT } from '@angular/common';
 import { Inject, Injectable } from '@angular/core';
-import { Observable, of, throwError } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
 import { AuthStateService } from '../../auth-state/auth-state.service';
 import { LoggerService } from '../../logging/logger.service';
 import { StateValidationResult } from '../../validation/state-validation-result';
 import { StateValidationService } from '../../validation/state-validation.service';
 import { CallbackContext } from '../callback-context';
 import { ResetAuthDataService } from '../reset-auth-data.service';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class StateValidationCallbackHandlerService {
@@ -21,21 +22,24 @@ export class StateValidationCallbackHandlerService {
   // STEP 4 All flows
 
   callbackStateValidation(callbackContext: CallbackContext, configId: string): Observable<CallbackContext> {
-    const validationResult = this.stateValidationService.getValidatedStateResult(callbackContext, configId);
-    callbackContext.validationResult = validationResult;
+    return this.stateValidationService.getValidatedStateResult(callbackContext, configId).pipe(
+      map((validationResult: StateValidationResult) => {
+        callbackContext.validationResult = validationResult;
 
-    if (validationResult.authResponseIsValid) {
-      this.authStateService.setAuthorizationData(validationResult.accessToken, callbackContext.authResult, configId);
+        if (validationResult.authResponseIsValid) {
+          this.authStateService.setAuthorizationData(validationResult.accessToken, callbackContext.authResult, configId);
 
-      return of(callbackContext);
-    } else {
-      const errorMessage = `authorizedCallback, token(s) validation failed, resetting. Hash: ${this.doc.location.hash}`;
-      this.loggerService.logWarning(configId, errorMessage);
-      this.resetAuthDataService.resetAuthorizationData(configId);
-      this.publishUnauthorizedState(callbackContext.validationResult, callbackContext.isRenewProcess);
-
-      return throwError(() => new Error(errorMessage));
-    }
+          return callbackContext;
+        } else {
+          const errorMessage = `authorizedCallback, token(s) validation failed, resetting. Hash: ${this.doc.location.hash}`;
+          this.loggerService.logWarning(configId, errorMessage);
+          this.resetAuthDataService.resetAuthorizationData(configId);
+          this.publishUnauthorizedState(callbackContext.validationResult, callbackContext.isRenewProcess);
+          
+          throw new Error(errorMessage);
+        }
+      })
+    );
   }
 
   private publishUnauthorizedState(stateValidationResult: StateValidationResult, isRenewProcess: boolean): void {

projects/angular-auth-oidc-client/src/lib/flows/callback-handling/state-validation-callback-handler.service.ts

@@ -38,7 +38,7 @@ describe('RefreshSessionIframeService ', () => {
     it(
       'calls sendAuthorizeRequestUsingSilentRenew with created url',
       waitForAsync(() => {
-        spyOn(urlService, 'getRefreshSessionSilentRenewUrl').and.returnValue('a-url');
+        spyOn(urlService, 'getRefreshSessionSilentRenewUrl').and.returnValue(of('a-url'));
         const sendAuthorizeRequestUsingSilentRenewSpy = spyOn(
           refreshSessionIframeService as any,
           'sendAuthorizeRequestUsingSilentRenew'
@@ -53,7 +53,7 @@ describe('RefreshSessionIframeService ', () => {
     it(
       'returns correct observable',
       waitForAsync(() => {
-        spyOn(urlService, 'getRefreshSessionSilentRenewUrl').and.returnValue('a-url');
+        spyOn(urlService, 'getRefreshSessionSilentRenewUrl').and.returnValue(of('a-url'));
         const sessionIFrame = document.createElement('iframe');
         sessionIFrame.onload = () => {
           // contentWindow is set!

projects/angular-auth-oidc-client/src/lib/iframe/refresh-session-iframe.service.spec.ts

@@ -1,6 +1,7 @@
 import { DOCUMENT } from '@angular/common';
 import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
 import { Observable } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 import { LoggerService } from '../logging/logger.service';
 import { UrlService } from '../utils/url/url.service';
 import { SilentRenewService } from './silent-renew.service';
@@ -14,16 +15,19 @@ export class RefreshSessionIframeService {
     private loggerService: LoggerService,
     private urlService: UrlService,
     private silentRenewService: SilentRenewService,
-    rendererFactory: RendererFactory2
+    rendererFactory: RendererFactory2,
   ) {
     this.renderer = rendererFactory.createRenderer(null, null);
   }
 
   refreshSessionWithIframe(configId: string, customParams?: { [key: string]: string | number | boolean }): Observable<boolean> {
     this.loggerService.logDebug(configId, 'BEGIN refresh session Authorize Iframe renew');
-    const url = this.urlService.getRefreshSessionSilentRenewUrl(configId, customParams);
 
-    return this.sendAuthorizeRequestUsingSilentRenew(url, configId);
+    return this.urlService.getRefreshSessionSilentRenewUrl(configId, customParams).pipe(
+      switchMap((url) => {
+        return this.sendAuthorizeRequestUsingSilentRenew(url, configId);
+      }),
+    );
   }
 
   private sendAuthorizeRequestUsingSilentRenew(url: string, configId: string): Observable<boolean> {
@@ -53,13 +57,13 @@ export class RefreshSessionIframeService {
       }
     });
     const renewDestroyHandler = this.renderer.listen('window', 'oidc-silent-renew-message', (e) =>
-      this.silentRenewService.silentRenewEventHandler(e, configId)
+      this.silentRenewService.silentRenewEventHandler(e, configId),
     );
 
     this.doc.defaultView.dispatchEvent(
       new CustomEvent('oidc-silent-renew-init', {
         detail: instanceId,
-      })
+      }),
     );
   }
 }