Browse Source

add method signs

pull/18005/head
Sinan997 3 years ago
parent
commit
2600e5b99f
  1. 3
      npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts
  2. 5
      npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts
  3. 1
      npm/ng-packs/packages/account/src/public-api.ts
  4. 2
      npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts
  5. 14
      npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts
  6. 5
      npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts
  7. 1
      npm/ng-packs/packages/identity/src/public-api.ts
  8. 10
      npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
  9. 5
      npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts
  10. 2
      npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts
  11. 1
      npm/ng-packs/packages/tenant-management/src/public-api.ts

3
npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts

@ -1,5 +1,6 @@
import { AuthService, IAbpGuard } from '@abp/ng.core'; import { AuthService, IAbpGuard } from '@abp/ng.core';
import { Injectable, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { CanActivateFn } from '@angular/router';
/** /**
* @deprecated Use `authenticationFlowGuard` instead. * @deprecated Use `authenticationFlowGuard` instead.
@ -16,7 +17,7 @@ export class AuthenticationFlowGuard implements IAbpGuard {
} }
} }
export const authenticationFlowGuard = () => { export const authenticationFlowGuard: CanActivateFn = () => {
const authService = inject(AuthService); const authService = inject(AuthService);
if (authService.isInternalAuth) return true; if (authService.isInternalAuth) return true;

5
npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts

@ -1,6 +1,6 @@
import { inject } from '@angular/core'; import { inject } from '@angular/core';
import { ConfigStateService } from '@abp/ng.core'; import { ConfigStateService } from '@abp/ng.core';
import { map, tap } from 'rxjs'; import { Observable, map, tap } from 'rxjs';
import { import {
ExtensionsService, ExtensionsService,
getObjectExtensionEntitiesFromStore, getObjectExtensionEntitiesFromStore,
@ -9,8 +9,9 @@ import {
} from '@abp/ng.theme.shared/extensions'; } from '@abp/ng.theme.shared/extensions';
import { eAccountComponents } from '../enums'; import { eAccountComponents } from '../enums';
import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, DEFAULT_ACCOUNT_FORM_PROPS } from '../tokens'; import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, DEFAULT_ACCOUNT_FORM_PROPS } from '../tokens';
import { ResolveFn } from '@angular/router';
export const accountExtensionsResolver = () => { export const accountExtensionsResolver: ResolveFn<Observable<boolean>> = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

1
npm/ng-packs/packages/account/src/public-api.ts

@ -6,3 +6,4 @@ export * from './lib/models';
export * from './lib/services'; export * from './lib/services';
export * from './lib/tokens'; export * from './lib/tokens';
export * from './lib/utils'; export * from './lib/utils';
export * from './lib/resolvers';

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

@ -20,4 +20,4 @@ export class AuthGuard implements IAbpGuard {
export const authGuard: CanActivateFn = () => { export const authGuard: CanActivateFn = () => {
console.error('You should add @abp/ng-oauth packages or create your own auth packages.'); console.error('You should add @abp/ng-oauth packages or create your own auth packages.');
return false; return false;
}; };

14
npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts

@ -1,5 +1,10 @@
import { Injectable, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivateFn, Router, RouterStateSnapshot } from '@angular/router'; import {
ActivatedRouteSnapshot,
CanActivateFn,
Router,
RouterStateSnapshot,
} from '@angular/router';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { Observable, of } from 'rxjs'; import { Observable, of } from 'rxjs';
@ -44,7 +49,10 @@ export class PermissionGuard implements IAbpGuard {
} }
} }
export const permissionGuard: CanActivateFn = (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => { export const permissionGuard: CanActivateFn = (
route: ActivatedRouteSnapshot,
state: RouterStateSnapshot,
) => {
const router = inject(Router); const router = inject(Router);
const routesService = inject(RoutesService); const routesService = inject(RoutesService);
const oAuthService = inject(OAuthService); const oAuthService = inject(OAuthService);
@ -67,4 +75,4 @@ export const permissionGuard: CanActivateFn = (route: ActivatedRouteSnapshot, s
} }
}), }),
); );
} };

5
npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts

@ -1,5 +1,5 @@
import { inject } from '@angular/core'; import { inject } from '@angular/core';
import { map, tap } from 'rxjs'; import { Observable, map, tap } from 'rxjs';
import { ConfigStateService } from '@abp/ng.core'; import { ConfigStateService } from '@abp/ng.core';
import { import {
ExtensionsService, ExtensionsService,
@ -21,8 +21,9 @@ import {
DEFAULT_IDENTITY_CREATE_FORM_PROPS, DEFAULT_IDENTITY_CREATE_FORM_PROPS,
DEFAULT_IDENTITY_EDIT_FORM_PROPS, DEFAULT_IDENTITY_EDIT_FORM_PROPS,
} from '../tokens'; } from '../tokens';
import { ResolveFn } from '@angular/router';
export const identityExtensionsResolver = () => { export const identityExtensionsResolver: ResolveFn<Observable<boolean>> = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

1
npm/ng-packs/packages/identity/src/public-api.ts

@ -4,3 +4,4 @@ export * from './lib/guards';
export * from './lib/identity.module'; export * from './lib/identity.module';
export * from './lib/models'; export * from './lib/models';
export * from './lib/tokens'; export * from './lib/tokens';
export * from './lib/resolvers';

10
npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts

@ -1,5 +1,10 @@
import { Injectable, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { UrlTree, ActivatedRouteSnapshot, RouterStateSnapshot, CanActivateFn } from '@angular/router'; import {
UrlTree,
ActivatedRouteSnapshot,
RouterStateSnapshot,
CanActivateFn,
} from '@angular/router';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';
@ -31,7 +36,6 @@ export class AbpOAuthGuard implements IAbpGuard {
} }
} }
export const abpOAuthGuard: CanActivateFn = ( export const abpOAuthGuard: CanActivateFn = (
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot, state: RouterStateSnapshot,
@ -48,4 +52,4 @@ export const abpOAuthGuard: CanActivateFn = (
const params = { returnUrl: state.url }; const params = { returnUrl: state.url };
authService.navigateToLogin(params); authService.navigateToLogin(params);
return false; return false;
}; };

5
npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts

@ -1,5 +1,5 @@
import { inject } from '@angular/core'; import { inject } from '@angular/core';
import { map, tap } from 'rxjs'; import { Observable, map, tap } from 'rxjs';
import { ConfigStateService } from '@abp/ng.core'; import { ConfigStateService } from '@abp/ng.core';
import { import {
ExtensionsService, ExtensionsService,
@ -21,8 +21,9 @@ import {
DEFAULT_TENANT_MANAGEMENT_CREATE_FORM_PROPS, DEFAULT_TENANT_MANAGEMENT_CREATE_FORM_PROPS,
DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS, DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS,
} from '../tokens'; } from '../tokens';
import { ResolveFn } from '@angular/router';
export const tenantManagementExtensionsResolver = () => { export const tenantManagementExtensionsResolver: ResolveFn<Observable<boolean>> = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

2
npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts

@ -18,7 +18,7 @@ const routes: Routes = [
{ {
path: '', path: '',
component: RouterOutletComponent, component: RouterOutletComponent,
canActivate: [authGuard, permissionGuard, ], canActivate: [authGuard, permissionGuard],
resolve: [tenantManagementExtensionsResolver], resolve: [tenantManagementExtensionsResolver],
children: [ children: [
{ {

1
npm/ng-packs/packages/tenant-management/src/public-api.ts

@ -4,3 +4,4 @@ export * from './lib/guards';
export * from './lib/models'; export * from './lib/models';
export * from './lib/tenant-management.module'; export * from './lib/tenant-management.module';
export * from './lib/tokens'; export * from './lib/tokens';
export * from './lib/resolvers';

Loading…
Cancel
Save