@abp/ng.oauth 9.3.6 → 10.0.0-rc.2

package/index.d.ts

@@ -3,7 +3,7 @@ import { ModuleWithProviders, Injector, Provider } from '@angular/core';
 import * as angular_oauth2_oidc from 'angular-oauth2-oidc';
 import { OAuthStorage, OAuthErrorEvent, OAuthService, AuthConfig } from 'angular-oauth2-oidc';
 import * as _abp_ng_core from '@abp/ng.core';
-import { PipeToLoginFn, CheckAuthenticationStateFn, IAuthService, LoginParams, AbpAuthResponse, AbstractAuthErrorFilter, AuthErrorFilter, AbpLocalStorageService, HttpErrorReporterService, EnvironmentService, ConfigStateService, SessionStateService, AbpWindowService, ABP, IApiInterceptor, HttpWaitService, IAbpGuard, AuthService } from '@abp/ng.core';
+import { PipeToLoginFn, CheckAuthenticationStateFn, IAuthService, LoginParams, AbpAuthResponse, AbstractAuthErrorFilter, AuthErrorFilter, AbpLocalStorageService, AbpCookieStorageService, HttpErrorReporterService, EnvironmentService, ConfigStateService, SessionStateService, AbpWindowService, IApiInterceptor, IAbpGuard, AuthService } from '@abp/ng.core';
 import * as rxjs from 'rxjs';
 import { Observable } from 'rxjs';
 import { Params, Router, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, CanActivateFn } from '@angular/router';
@@ -19,25 +19,35 @@ declare class AbpOAuthModule {
     static ɵinj: i0.ɵɵInjectorDeclaration<AbpOAuthModule>;
 }
 
-declare const oAuthStorage: Storage;
-
-declare function storageFactory(): OAuthStorage;
+declare class MockStorage implements Storage {
+    private data;
+    get length(): number;
+    clear(): void;
+    getItem(key: string): string;
+    key(index: number): string;
+    removeItem(key: string): void;
+    setItem(key: string, value: string): void;
+}
+declare function oAuthStorageFactory(): OAuthStorage;
 
 declare const pipeToLogin: PipeToLoginFn;
 declare function isTokenExpired(expireDate: number): boolean;
 
-declare function clearOAuthStorage(storage?: OAuthStorage): void;
+declare function clearOAuthStorage(injector: Injector): void;
 
 declare const checkAccessToken: CheckAuthenticationStateFn;
 
 declare class AbpOAuthService implements IAuthService {
     protected injector: Injector;
+    private appStartedWithSsr;
+    private platformId;
+    private document;
     private strategy;
     private readonly oAuthService;
     get oidc(): boolean;
     set oidc(value: boolean);
     get isInternalAuth(): boolean;
-    constructor(injector: Injector);
+    constructor();
     init(): Promise<any>;
     logout(queryParams?: Params): Observable<any>;
     navigateToLogin(queryParams?: Params): void;
@@ -46,7 +56,7 @@ declare class AbpOAuthService implements IAuthService {
     loginUsingGrant(grantType: string, parameters: object, headers?: HttpHeaders): Promise<AbpAuthResponse>;
     getRefreshToken(): string;
     getAccessToken(): string;
-    refreshToken(): Promise<AbpAuthResponse>;
+    refreshToken(): Promise<AbpAuthResponse | void>;
     getAccessTokenExpiration(): number;
     static ɵfac: i0.ɵɵFactoryDeclaration<AbpOAuthService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<AbpOAuthService>;
@@ -67,6 +77,8 @@ declare class OAuthErrorFilterService extends AbstractAuthErrorFilter<AuthErrorF
 declare class RememberMeService {
     #private;
     protected readonly localStorageService: AbpLocalStorageService;
+    protected readonly cookieStorageService: AbpCookieStorageService;
+    private appStartedWithSsr;
     set(remember: boolean): void;
     remove(): void;
     get(): boolean;
@@ -75,6 +87,28 @@ declare class RememberMeService {
     static ɵprov: i0.ɵɵInjectableDeclaration<RememberMeService>;
 }
 
+declare class BrowserTokenStorageService implements OAuthStorage {
+    getItem(key: string): string;
+    removeItem(key: string): void;
+    setItem(key: string, data: string): void;
+    readCookie(name: string): string | null;
+    writeCookie(name: string, value: string, days?: number): void;
+    removeCookie(name: string): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<BrowserTokenStorageService, never>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<BrowserTokenStorageService>;
+}
+
+declare class ServerTokenStorageService implements OAuthStorage {
+    private req;
+    private cookies;
+    constructor(req: Request | null);
+    getItem(key: string): string;
+    setItem(_k: string, _v: string): void;
+    removeItem(_k: string): void;
+    static ɵfac: i0.ɵɵFactoryDeclaration<ServerTokenStorageService, [{ optional: true; }]>;
+    static ɵprov: i0.ɵɵInjectableDeclaration<ServerTokenStorageService>;
+}
+
 declare abstract class AuthFlowStrategy {
     protected injector: Injector;
     abstract readonly isInternalAuth: boolean;
@@ -103,7 +137,12 @@ declare abstract class AuthFlowStrategy {
 }
 
 declare class AuthCodeFlowStrategy extends AuthFlowStrategy {
+    protected injector: Injector;
     readonly isInternalAuth = false;
+    private platformId;
+    protected appStartedWithSSR: boolean;
+    protected document: Document;
+    constructor(injector: Injector);
     init(): Promise<void>;
     private checkRememberMeOption;
     private getCultureParams;
@@ -305,7 +344,7 @@ declare class OAuthConfigurationHandler {
     private oAuthService;
     private environmentService;
     private options;
-    constructor(oAuthService: OAuthService, environmentService: EnvironmentService, options: ABP.Root);
+    constructor();
     private listenToSetEnvironment;
     static ɵfac: i0.ɵɵFactoryDeclaration<OAuthConfigurationHandler, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<OAuthConfigurationHandler>;
@@ -316,7 +355,6 @@ declare class OAuthApiInterceptor implements IApiInterceptor {
     private sessionState;
     private httpWaitService;
     private tenantKey;
-    constructor(oAuthService: OAuthService, sessionState: SessionStateService, httpWaitService: HttpWaitService, tenantKey: string);
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>;
     getAdditionalHeaders(existingHeaders?: HttpHeaders): any;
     static ɵfac: i0.ɵɵFactoryDeclaration<OAuthApiInterceptor, never>;
@@ -334,9 +372,11 @@ declare class AbpOAuthGuard implements IAbpGuard {
     static ɵprov: i0.ɵɵInjectableDeclaration<AbpOAuthGuard>;
 }
 declare const abpOAuthGuard: CanActivateFn;
+declare const buildLoginUrl: (path: string, params?: Params) => string;
+declare const asyncAbpOAuthGuard: CanActivateFn;
 
 declare const NavigateToManageProfileProvider: Provider;
 
 declare function provideAbpOAuth(): i0.EnvironmentProviders;
 
-export { AUTH_FLOW_STRATEGY, AbpOAuthGuard, AbpOAuthModule, AbpOAuthService, AuthCodeFlowStrategy, AuthFlowStrategy, AuthPasswordFlowStrategy, NavigateToManageProfileProvider, OAuthApiInterceptor, OAuthConfigurationHandler, OAuthErrorFilterService, RememberMeService, abpOAuthGuard, checkAccessToken, clearOAuthStorage, isTokenExpired, oAuthStorage, pipeToLogin, provideAbpOAuth, storageFactory };
+export { AUTH_FLOW_STRATEGY, AbpOAuthGuard, AbpOAuthModule, AbpOAuthService, AuthCodeFlowStrategy, AuthFlowStrategy, AuthPasswordFlowStrategy, BrowserTokenStorageService, MockStorage, NavigateToManageProfileProvider, OAuthApiInterceptor, OAuthConfigurationHandler, OAuthErrorFilterService, RememberMeService, ServerTokenStorageService, abpOAuthGuard, asyncAbpOAuthGuard, buildLoginUrl, checkAccessToken, clearOAuthStorage, isTokenExpired, oAuthStorageFactory, pipeToLogin, provideAbpOAuth };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.oauth",
-  "version": "9.3.6",
+  "version": "10.0.0-rc.2",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~9.3.6",
-    "@abp/utils": "~9.3.6",
+    "@abp/ng.core": "~10.0.0-rc.2",
+    "@abp/utils": "~10.0.0-rc.2",
     "angular-oauth2-oidc": "^20.0.0",
     "just-clone": "^6.0.0",
     "just-compare": "^2.0.0",