Merge pull request #15934 from abpframework/auto-merge/rel-7-1/1791

Merge branch dev with rel-7.1

npm/ng-packs/packages/core/src/lib/services/index.ts

@@ -18,3 +18,4 @@ export * from './routes.service';
 export * from './session-state.service';
 export * from './subscription.service';
 export * from './track-by.service';
+export * from './local-storage.service';

npm/ng-packs/packages/core/src/lib/services/local-storage.service.ts

@@ -0,0 +1,28 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class AbpLocalStorageService implements Storage {
+  constructor() {}
+  [name: string]: any;
+  get length(): number {
+    return localStorage.length;
+  }
+
+  clear(): void {
+    localStorage.clear();
+  }
+  getItem(key: string): string {
+    return localStorage.getItem(key);
+  }
+  key(index: number): string {
+    return localStorage.key(index);
+  }
+  removeItem(key: string): void {
+    localStorage.removeItem(key);
+  }
+  setItem(key: string, value: string): void {
+    localStorage.setItem(key, value);
+  }
+}

npm/ng-packs/packages/core/src/lib/services/session-state.service.ts

@@ -5,6 +5,7 @@ import { Session } from '../models/session';
 import { CurrentTenantDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';
 import { InternalStore } from '../utils/internal-store-utils';
 import { ConfigStateService } from './config-state.service';
+import { AbpLocalStorageService } from './local-storage.service';
 
 @Injectable({
   providedIn: 'root',
@@ -13,16 +14,19 @@ export class SessionStateService {
   private readonly store = new InternalStore({} as Session.State);
 
   private updateLocalStorage = () => {
-    localStorage.setItem('abpSession', JSON.stringify(this.store.state));
+    this.localStorageService.setItem('abpSession', JSON.stringify(this.store.state));
   };
 
-  constructor(private configState: ConfigStateService) {
+  constructor(
+    private configState: ConfigStateService,
+    private localStorageService: AbpLocalStorageService,
+  ) {
     this.init();
     this.setInitialLanguage();
   }
 
   private init() {
-    const session = localStorage.getItem('abpSession');
+    const session = this.localStorageService.getItem('abpSession');
     if (session) {
       this.store.set(JSON.parse(session));
     }

npm/ng-packs/packages/core/src/lib/tests/local-storage.service.spec.ts

@@ -0,0 +1,52 @@
+import { TestBed } from '@angular/core/testing';
+
+import { AbpLocalStorageService } from '../services/local-storage.service';
+
+describe('LocalStorageService', () => {
+  let service: AbpLocalStorageService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(AbpLocalStorageService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should be called getItem', () => {
+    const spy = jest.spyOn(service, 'getItem');
+    service.getItem('test');
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should be called setItem', () => {
+    const spy = jest.spyOn(service, 'setItem');
+    service.setItem('test', 'value');
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should be called removeItem', () => {
+    const spy = jest.spyOn(service, 'removeItem');
+    service.removeItem('test');
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should be called clear', () => {
+    const spy = jest.spyOn(service, 'clear');
+    service.clear();
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should be called key', () => {
+    const spy = jest.spyOn(service, 'key');
+    service.key(0);
+    expect(spy).toHaveBeenCalled();
+  });
+
+  it('should be called length', () => {
+    const spy = jest.spyOn(service, 'length', 'get');
+    service.length;
+    expect(spy).toHaveBeenCalled();
+  });
+});

npm/ng-packs/packages/oauth/src/lib/oauth.module.ts

@@ -2,14 +2,14 @@ import { APP_INITIALIZER, ModuleWithProviders, NgModule, Provider } from '@angul
 import { CommonModule } from '@angular/common';
 import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
 import {
+  AbpLocalStorageService,
   ApiInterceptor,
   AuthGuard,
   AuthService,
   CHECK_AUTHENTICATION_STATE_FN_KEY,
   noop,
-  PIPE_TO_LOGIN_FN_KEY
+  PIPE_TO_LOGIN_FN_KEY,
 } from '@abp/ng.core';
-import { storageFactory } from './utils/storage.factory';
 import { AbpOAuthService } from './services';
 import { OAuthConfigurationHandler } from './handlers/oauth-configuration.handler';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
@@ -59,7 +59,7 @@ export class AbpOAuthModule {
           useFactory: noop,
         },
         OAuthModule.forRoot().providers as Provider[],
-        { provide: OAuthStorage, useFactory: storageFactory },
+        { provide: OAuthStorage, useClass: AbpLocalStorageService },
       ],
     };
   }

npm/ng-packs/packages/oauth/src/lib/strategies/auth-flow-strategy.ts

@@ -9,6 +9,7 @@ import {
 import { Observable, of } from 'rxjs';
 import { filter, switchMap, tap } from 'rxjs/operators';
 import {
+  AbpLocalStorageService,
   ConfigStateService,
   EnvironmentService,
   HttpErrorReporterService,
@@ -29,6 +30,7 @@ export abstract class AuthFlowStrategy {
   protected oAuthService: OAuthService2;
   protected oAuthConfig!: AuthConfig;
   protected sessionState: SessionStateService;
+  protected localStorageService: AbpLocalStorageService;
   protected tenantKey: string;
 
   abstract checkIfInternalAuth(queryParams?: Params): boolean;
@@ -50,6 +52,7 @@ export abstract class AuthFlowStrategy {
     this.configState = injector.get(ConfigStateService);
     this.oAuthService = injector.get(OAuthService2);
     this.sessionState = injector.get(SessionStateService);
+    this.localStorageService = injector.get(AbpLocalStorageService);
     this.oAuthConfig = this.environment.getEnvironment().oAuthConfig || {};
     this.tenantKey = injector.get(TENANT_KEY);
 

npm/ng-packs/packages/oauth/src/lib/strategies/auth-password-flow-strategy.ts

@@ -4,7 +4,7 @@ import { Params, Router } from '@angular/router';
 import { from, Observable, pipe } from 'rxjs';
 import { HttpHeaders } from '@angular/common/http';
 import { AuthFlowStrategy } from './auth-flow-strategy';
-import { pipeToLogin, removeRememberMe, setRememberMe } from '../utils/auth-utils';
+import { pipeToLogin, removeRememberMe } from '../utils/auth-utils';
 import { LoginParams } from '@abp/ng.core';
 import { clearOAuthStorage } from '../utils/clear-o-auth-storage';
 
@@ -33,7 +33,7 @@ export class AuthPasswordFlowStrategy extends AuthFlowStrategy {
           this.refreshToken();
         } else {
           this.oAuthService.logOut();
-          removeRememberMe();
+          removeRememberMe(this.localStorageService);
           this.configState.refreshAppState().subscribe();
         }
       });
@@ -74,7 +74,7 @@ export class AuthPasswordFlowStrategy extends AuthFlowStrategy {
       switchMap(() => this.configState.refreshAppState()),
       tap(() => {
         router.navigateByUrl('/');
-        removeRememberMe();
+        removeRememberMe(this.localStorageService);
       }),
     );
   }
@@ -82,7 +82,7 @@ export class AuthPasswordFlowStrategy extends AuthFlowStrategy {
   protected refreshToken() {
     return this.oAuthService.refreshToken().catch(() => {
       clearOAuthStorage();
-      removeRememberMe();
+      removeRememberMe(this.localStorageService);
     });
   }
 }

npm/ng-packs/packages/oauth/src/lib/utils/auth-utils.ts

@@ -7,7 +7,7 @@ import {
   ConfigStateService,
   LoginParams,
   PipeToLoginFn,
-  SetTokenResponseToStorageFn,
+  AbpLocalStorageService,
 } from '@abp/ng.core';
 
 const cookieKey = 'rememberMe';
@@ -19,25 +19,28 @@ export const pipeToLogin: PipeToLoginFn = function (
 ) {
   const configState = injector.get(ConfigStateService);
   const router = injector.get(Router);
-
+  const localStorage = injector.get(AbpLocalStorageService);
   return pipe(
     switchMap(() => configState.refreshAppState()),
     tap(() => {
-      setRememberMe(params.rememberMe);
+      setRememberMe(params.rememberMe, localStorage);
       if (params.redirectUrl) router.navigate([params.redirectUrl]);
     }),
   );
 };
 
-export function setRememberMe(remember: boolean | undefined) {
-  removeRememberMe();
-  localStorage.setItem(storageKey, 'true');
+export function setRememberMe(
+  remember: boolean | undefined,
+  localStorageService: AbpLocalStorageService,
+) {
+  removeRememberMe(localStorageService);
+  localStorageService.setItem(storageKey, 'true');
   document.cookie = `${cookieKey}=true; path=/${
     remember ? ' ;expires=Fri, 31 Dec 9999 23:59:59 GMT' : ''
   }`;
 }
 
-export function removeRememberMe() {
-  localStorage.removeItem(storageKey);
+export function removeRememberMe(localStorageService: AbpLocalStorageService) {
+  localStorageService.removeItem(storageKey);
   document.cookie = cookieKey + '= ; path=/; expires = Thu, 01 Jan 1970 00:00:00 GMT';
 }