From a9e937b391a969a6814e37a9d7bc95b84d5101de Mon Sep 17 00:00:00 2001 From: Deavon Barlow Date: Thu, 14 Jan 2021 17:15:31 -0700 Subject: [PATCH 1/2] Changing all `private` accessors to `protected`, as we must not needlessly prevent inheritance or customization; --- .../src/lib/angular-token.interceptor.ts | 4 +- .../src/lib/angular-token.service.ts | 44 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/projects/angular-token/src/lib/angular-token.interceptor.ts b/projects/angular-token/src/lib/angular-token.interceptor.ts index 9872ebcf..28adc9eb 100755 --- a/projects/angular-token/src/lib/angular-token.interceptor.ts +++ b/projects/angular-token/src/lib/angular-token.interceptor.ts @@ -9,7 +9,7 @@ import { tap } from 'rxjs/operators'; @Injectable() export class AngularTokenInterceptor implements HttpInterceptor { - constructor( private tokenService: AngularTokenService ) { } + constructor( protected tokenService: AngularTokenService ) { } intercept(req: HttpRequest, next: HttpHandler): Observable> { @@ -43,7 +43,7 @@ export class AngularTokenInterceptor implements HttpInterceptor { // Parse Auth data from response - private handleResponse(res: HttpResponse | HttpErrorResponse | HttpEvent): void { + protected handleResponse(res: HttpResponse | HttpErrorResponse | HttpEvent): void { if (res instanceof HttpResponse || res instanceof HttpErrorResponse) { if (this.tokenService.tokenOptions.apiBase === null || (res.url && res.url.match(this.tokenService.tokenOptions.apiBase))) { this.tokenService.getAuthHeadersFromResponse(res); diff --git a/projects/angular-token/src/lib/angular-token.service.ts b/projects/angular-token/src/lib/angular-token.service.ts index 5290f626..28604d87 100755 --- a/projects/angular-token/src/lib/angular-token.service.ts +++ b/projects/angular-token/src/lib/angular-token.service.ts @@ -60,20 +60,20 @@ export class AngularTokenService implements CanActivate { this.options = (Object).assign(this.options, options); } - private options: AngularTokenOptions; + protected options: AngularTokenOptions; public userType: BehaviorSubject = new BehaviorSubject(null); public authData: BehaviorSubject = new BehaviorSubject(null); public userData: BehaviorSubject = new BehaviorSubject(null); - private global: Window | any; + protected global: Window | any; - private localStorage: Storage | any = {}; + protected localStorage: Storage | any = {}; constructor( - private http: HttpClient, + protected http: HttpClient, @Inject(ANGULAR_TOKEN_OPTIONS) config: any, - @Inject(PLATFORM_ID) private platformId: Object, - @Optional() private activatedRoute: ActivatedRoute, - @Optional() private router: Router + @Inject(PLATFORM_ID) protected platformId: Object, + @Optional() protected activatedRoute: ActivatedRoute, + @Optional() protected router: Router ) { this.global = (typeof window !== 'undefined') ? window : {}; @@ -399,8 +399,8 @@ export class AngularTokenService implements CanActivate { // Reset password request resetPassword(resetPasswordData: ResetPasswordData, additionalData?: any): Observable { - - + + if (additionalData !== undefined) { resetPasswordData.additionalData = additionalData; } @@ -424,11 +424,11 @@ export class AngularTokenService implements CanActivate { * */ - private getUserPath(): string { + protected getUserPath(): string { return (this.userType.value == null) ? '' : this.userType.value.path + '/'; } - private getApiPath(): string { + protected getApiPath(): string { let constructedPath = ''; if (this.options.apiBase != null) { @@ -442,11 +442,11 @@ export class AngularTokenService implements CanActivate { return constructedPath; } - private getServerPath(): string { + protected getServerPath(): string { return this.getApiPath() + this.getUserPath(); } - private getOAuthPath(oAuthType: string): string { + protected getOAuthPath(oAuthType: string): string { let oAuthPath: string; oAuthPath = this.options.oAuthPaths[oAuthType]; @@ -458,7 +458,7 @@ export class AngularTokenService implements CanActivate { return oAuthPath; } - private getOAuthUrl(oAuthPath: string, callbackUrl: string, windowType: string): string { + protected getOAuthUrl(oAuthPath: string, callbackUrl: string, windowType: string): string { let url: string; url = `${this.options.oAuthBase}/${oAuthPath}`; @@ -480,7 +480,7 @@ export class AngularTokenService implements CanActivate { */ // Try to load auth data - private tryLoadAuthData(): void { + protected tryLoadAuthData(): void { const userType = this.getUserTypeByName(this.localStorage.getItem('userType')); @@ -515,7 +515,7 @@ export class AngularTokenService implements CanActivate { } // Parse Auth data from post message - private getAuthDataFromPostMessage(data: any): void { + protected getAuthDataFromPostMessage(data: any): void { const authData: AuthData = { accessToken: data['auth_token'], client: data['client_id'], @@ -544,7 +544,7 @@ export class AngularTokenService implements CanActivate { } // Try to get auth data from url parameters. - private getAuthDataFromParams(): void { + protected getAuthDataFromParams(): void { this.activatedRoute.queryParams.subscribe(queryParams => { const authData: AuthData = { accessToken: queryParams['token'] || queryParams['auth_token'], @@ -567,7 +567,7 @@ export class AngularTokenService implements CanActivate { */ // Write auth data to storage - private setAuthData(authData: AuthData): void { + protected setAuthData(authData: AuthData): void { if (this.checkAuthData(authData)) { this.authData.next(authData); @@ -593,7 +593,7 @@ export class AngularTokenService implements CanActivate { */ // Check if auth data complete and if response token is newer - private checkAuthData(authData: AuthData): boolean { + protected checkAuthData(authData: AuthData): boolean { if ( authData.accessToken != null && @@ -617,7 +617,7 @@ export class AngularTokenService implements CanActivate { * */ - private requestCredentialsViaPostMessage(authWindow: any): Observable { + protected requestCredentialsViaPostMessage(authWindow: any): Observable { const pollerObserv = interval(500); const responseObserv = fromEvent(this.global, 'message').pipe( @@ -640,7 +640,7 @@ export class AngularTokenService implements CanActivate { return responseObserv; } - private oAuthWindowResponseFilter(data: any): any { + protected oAuthWindowResponseFilter(data: any): any { if (data.message === 'deliverCredentials' || data.message === 'authFailure') { return data; } @@ -654,7 +654,7 @@ export class AngularTokenService implements CanActivate { */ // Match user config by user config name - private getUserTypeByName(name: string): UserType { + protected getUserTypeByName(name: string): UserType { if (name == null || this.options.userTypes == null) { return null; } From 3fa4bdef9a2f2e582808d51ea9b6bbf525725c1d Mon Sep 17 00:00:00 2001 From: Ombo <41498208+omboapp@users.noreply.github.com> Date: Thu, 14 Jan 2021 17:45:33 -0700 Subject: [PATCH 2/2] Cleanup --- projects/angular-token/src/lib/angular-token.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/angular-token/src/lib/angular-token.service.ts b/projects/angular-token/src/lib/angular-token.service.ts index 28604d87..c9f41a8b 100755 --- a/projects/angular-token/src/lib/angular-token.service.ts +++ b/projects/angular-token/src/lib/angular-token.service.ts @@ -399,8 +399,8 @@ export class AngularTokenService implements CanActivate { // Reset password request resetPassword(resetPasswordData: ResetPasswordData, additionalData?: any): Observable { - - + + if (additionalData !== undefined) { resetPasswordData.additionalData = additionalData; }