Browse Source

Merge pull request #9372 from abpframework/feat/auth-utils

Angular UI: Added an utility function called pipeToTokenResponse
pull/9382/head
Mehmet Erim 5 years ago
committed by GitHub
parent
commit
0033873178
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/models.ts
  2. 21
      npm/ng-packs/packages/core/src/lib/utils/auth-utils.ts

6
npm/ng-packs/packages/core/src/lib/proxy/volo/abp/asp-net-core/mvc/application-configurations/models.ts

@ -1,7 +1,7 @@
import type { CurrentTenantDto, MultiTenancyInfoDto } from '../multi-tenancy/models';
import type { ObjectExtensionsDto } from './object-extending/models';
import type { LanguageInfo } from '../../../localization/models';
import type { NameValue } from '../../../models';
import type { CurrentTenantDto, MultiTenancyInfoDto } from '../multi-tenancy/models';
import type { ObjectExtensionsDto } from './object-extending/models';
export interface ApplicationAuthConfigurationDto {
policies: Record<string, boolean>;
@ -66,6 +66,8 @@ export interface CurrentUserDto {
phoneNumber?: string;
phoneNumberVerified: boolean;
roles: string[];
impersonatorUserId?: string;
impersonatorTenantId?: string;
}
export interface DateTimeFormatDto {

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

@ -1,5 +1,6 @@
import { Injector } from '@angular/core';
import { Router } from '@angular/router';
import { OAuthStorage, TokenResponse } from 'angular-oauth2-oidc';
import { pipe } from 'rxjs';
import { switchMap, tap } from 'rxjs/operators';
import { LoginParams } from '../models/auth';
@ -27,6 +28,26 @@ export function pipeToLogin(
);
}
export function setTokenResponseToStorage(injector: Injector, tokenRes: TokenResponse) {
const { access_token, refresh_token, scope: grantedScopes, expires_in } = tokenRes;
const storage = injector.get(OAuthStorage);
storage.setItem('access_token', access_token);
storage.setItem('refresh_token', refresh_token);
storage.setItem('access_token_stored_at', '' + Date.now());
if (grantedScopes) {
storage.setItem('granted_scopes', JSON.stringify(grantedScopes.split(' ')));
}
if (expires_in) {
const expiresInMilliSeconds = expires_in * 1000;
const now = new Date();
const expiresAt = now.getTime() + expiresInMilliSeconds;
storage.setItem('expires_at', '' + expiresAt);
}
}
export function setRememberMe(remember: boolean) {
removeRememberMe();
localStorage.setItem(storageKey, 'true');

Loading…
Cancel
Save