Reformat and change AbstractModel name to AuthResponse

npm/ng-packs/packages/core/src/lib/abstracts/abstract.model.ts → npm/ng-packs/packages/core/src/lib/abstracts/auth-response.model.ts

@@ -1,4 +1,4 @@
-export interface AbstractModel {
+export interface AbpAuthResponse {
   access_token: string;
   id_token: string;
   token_type: string;
@@ -6,6 +6,5 @@ export interface AbstractModel {
   refresh_token: string;
   scope: string;
   state?: string;
-  tenant_domain?:string
+  tenant_domain?: string;
 }
-

npm/ng-packs/packages/core/src/lib/abstracts/auth.service.ts

@@ -1,9 +1,9 @@
-import {HttpHeaders} from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
-import {Injectable} from '@angular/core';
+import { Injectable } from '@angular/core';
-import {Params} from '@angular/router';
+import { Params } from '@angular/router';
-import {Observable, of} from 'rxjs';
+import { Observable, of } from 'rxjs';
-import {LoginParams} from '../models/auth';
+import { LoginParams } from '../models/auth';
-import {AbstractModel} from "./abstract.model";
+import { AbpAuthResponse } from './auth-response.model';
 
 /**
  * Abstract service for Authentication.
@@ -12,9 +12,6 @@ import {AbstractModel} from "./abstract.model";
   providedIn: 'root',
 })
 export class AuthService implements IAuthService {
-  constructor() {
-  }
-
   private warningMessage() {
     console.error('You should add @abp/ng-oauth packages or create your own auth packages.');
   }
@@ -34,8 +31,7 @@ export class AuthService implements IAuthService {
     return of(undefined);
   }
 
-  navigateToLogin(queryParams?: Params): void {
+  navigateToLogin(queryParams?: Params): void {}
-  }
 
   get isInternalAuth() {
     throw new Error('not implemented');
@@ -47,8 +43,12 @@ export class AuthService implements IAuthService {
     return false;
   }
 
-  loginUsingGrant(grantType: string, parameters: object, headers?: HttpHeaders): Promise<AbstractModel> {
+  loginUsingGrant(
-    console.log({grantType, parameters, headers})
+    grantType: string,
+    parameters: object,
+    headers?: HttpHeaders,
+  ): Promise<AbpAuthResponse> {
+    console.log({ grantType, parameters, headers });
     return Promise.reject(new Error('not implemented'));
   }
 }
@@ -66,5 +66,9 @@ export interface IAuthService {
 
   login(params: LoginParams): Observable<any>;
 
-  loginUsingGrant(grantType: string, parameters: object, headers?: HttpHeaders): Promise<AbstractModel>;
+  loginUsingGrant(
+    grantType: string,
+    parameters: object,
+    headers?: HttpHeaders,
+  ): Promise<AbpAuthResponse>;
 }

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

@@ -1,4 +1,4 @@
 export * from './ng-model.component';
 export * from './auth.guard';
 export * from './auth.service';
-export * from './abstract.model'
+export * from './auth-response.model';

npm/ng-packs/packages/oauth/src/lib/services/oauth.service.ts

@@ -1,26 +1,27 @@
-import {Injectable, Injector} from '@angular/core';
+import { Injectable, Injector } from '@angular/core';
-import {Params} from '@angular/router';
+import { Params } from '@angular/router';
-import {from, Observable, lastValueFrom} from 'rxjs';
+import { from, Observable, lastValueFrom } from 'rxjs';
-import {filter, map, switchMap, take, tap} from 'rxjs/operators';
+import { filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { AbstractModel, IAuthService, LoginParams} from '@abp/ng.core';
+import { AbpAuthResponse, IAuthService, LoginParams } from '@abp/ng.core';
-import {AuthFlowStrategy} from '../strategies';
+import { AuthFlowStrategy } from '../strategies';
-import {EnvironmentService} from '@abp/ng.core';
+import { EnvironmentService } from '@abp/ng.core';
-import {AUTH_FLOW_STRATEGY} from '../tokens/auth-flow-strategy';
+import { AUTH_FLOW_STRATEGY } from '../tokens/auth-flow-strategy';
-import {OAuthService} from "angular-oauth2-oidc";
+import { OAuthService } from 'angular-oauth2-oidc';
-import {HttpHeaders} from '@angular/common/http';
+import { HttpHeaders } from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root',
 })
 export class AbpOAuthService implements IAuthService {
   private strategy!: AuthFlowStrategy;
-  private oAuthService: OAuthService;
+  private readonly oAuthService: OAuthService;
+
   get isInternalAuth() {
     return this.strategy.isInternalAuth;
   }
 
-  constructor(protected injector: Injector,) {
+  constructor(protected injector: Injector) {
-    this.oAuthService = this.injector.get(OAuthService)
+    this.oAuthService = this.injector.get(OAuthService);
   }
 
   async init() {
@@ -58,21 +59,24 @@ export class AbpOAuthService implements IAuthService {
     return this.oAuthService.hasValidAccessToken();
   }
 
-  loginUsingGrant(grantType: string, parameters: object, headers?: HttpHeaders): Promise<AbstractModel> {
+  loginUsingGrant(
-
+    grantType: string,
-    const {clientId: client_id, dummyClientSecret: client_secret} = this.oAuthService;
+    parameters: object,
-    const access_token = this.oAuthService.getAccessToken()
+    headers?: HttpHeaders,
+  ): Promise<AbpAuthResponse> {
+    const { clientId: client_id, dummyClientSecret: client_secret } = this.oAuthService;
+    const access_token = this.oAuthService.getAccessToken();
     const p = {
       access_token,
       grant_type: grantType,
       client_id,
-      ...parameters
+      ...parameters,
     };
 
     if (client_secret) {
       p['client_secret'] = client_secret;
     }
 
-    return this.oAuthService.fetchTokenUsingGrant(grantType, p, headers)
+    return this.oAuthService.fetchTokenUsingGrant(grantType, p, headers);
   }
 }