Browse Source

rename function names

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

12
npm/ng-packs/packages/account/src/lib/account-routing.module.ts

@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { import {
AuthGuardFn, authGuard,
ReplaceableComponents, ReplaceableComponents,
ReplaceableRouteContainerComponent, ReplaceableRouteContainerComponent,
RouterOutletComponent, RouterOutletComponent,
@ -14,10 +14,10 @@ import { ManageProfileComponent } from './components/manage-profile/manage-profi
import { RegisterComponent } from './components/register/register.component'; import { RegisterComponent } from './components/register/register.component';
import { ResetPasswordComponent } from './components/reset-password/reset-password.component'; import { ResetPasswordComponent } from './components/reset-password/reset-password.component';
import { eAccountComponents } from './enums/components'; import { eAccountComponents } from './enums/components';
import { AuthenticationFlowGuardFn } from './guards'; import { authenticationFlowGuard } from './guards';
import { AccountExtensionsResolver } from './resolvers'; import { accountExtensionsResolver } from './resolvers';
const canActivate = [AuthenticationFlowGuardFn]; const canActivate = [authenticationFlowGuard];
const routes: Routes = [ const routes: Routes = [
{ path: '', pathMatch: 'full', redirectTo: 'login' }, { path: '', pathMatch: 'full', redirectTo: 'login' },
@ -74,8 +74,8 @@ const routes: Routes = [
{ {
path: 'manage', path: 'manage',
component: ReplaceableRouteContainerComponent, component: ReplaceableRouteContainerComponent,
canActivate: [AuthGuardFn], canActivate: [authGuard],
resolve: [AccountExtensionsResolver], resolve: [accountExtensionsResolver],
data: { data: {
replaceableComponent: { replaceableComponent: {
key: eAccountComponents.ManageProfile, key: eAccountComponents.ManageProfile,

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

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

2
npm/ng-packs/packages/account/src/lib/guards/extensions.guard.ts

@ -18,7 +18,7 @@ import {
import { eAccountComponents } from '../enums/components'; import { eAccountComponents } from '../enums/components';
/** /**
* @deprecated Use `AccountExtensionsResolver` instead. * @deprecated Use `accountExtensionsResolver` instead.
*/ */
@Injectable() @Injectable()
export class AccountExtensionsGuard implements IAbpGuard { export class AccountExtensionsGuard implements IAbpGuard {

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

@ -10,7 +10,7 @@ import {
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';
export const AccountExtensionsResolver = () => { export const accountExtensionsResolver = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

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

@ -5,7 +5,7 @@ import { IAbpGuard } from './abstract-guard';
import { CanActivateFn } from '@angular/router'; import { CanActivateFn } from '@angular/router';
/** /**
* @deprecated Use `AuthGuardFn` instead. * @deprecated Use `authGuard` instead.
*/ */
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -17,7 +17,7 @@ export class AuthGuard implements IAbpGuard {
} }
} }
export const AuthGuardFn: 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;
}; };

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

@ -12,7 +12,7 @@ import { findRoute, getRoutePath } from '../utils/route-utils';
import { RoutesService, PermissionService, HttpErrorReporterService } from '../services'; import { RoutesService, PermissionService, HttpErrorReporterService } from '../services';
/** /**
* @deprecated Use `PermissionGuardFn` instead. * @deprecated Use `permissionGuard` instead.
*/ */
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -44,7 +44,7 @@ export class PermissionGuard implements IAbpGuard {
} }
} }
export const PermissionGuardFn: 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);

2
npm/ng-packs/packages/identity/src/lib/guards/extensions.guard.ts

@ -27,7 +27,7 @@ import {
} from '../tokens/extensions.token'; } from '../tokens/extensions.token';
/** /**
* @deprecated Use `IdentityExtensionsResolver` instead. * @deprecated Use `identityExtensionsResolver` instead.
*/ */
@Injectable() @Injectable()
export class IdentityExtensionsGuard implements IAbpGuard { export class IdentityExtensionsGuard implements IAbpGuard {

10
npm/ng-packs/packages/identity/src/lib/identity-routing.module.ts

@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { import {
AuthGuardFn, authGuard,
PermissionGuardFn, permissionGuard,
ReplaceableComponents, ReplaceableComponents,
ReplaceableRouteContainerComponent, ReplaceableRouteContainerComponent,
RouterOutletComponent, RouterOutletComponent,
@ -12,15 +12,15 @@ import {
import { RolesComponent } from './components/roles/roles.component'; import { RolesComponent } from './components/roles/roles.component';
import { UsersComponent } from './components/users/users.component'; import { UsersComponent } from './components/users/users.component';
import { eIdentityComponents } from './enums/components'; import { eIdentityComponents } from './enums/components';
import { IdentityExtensionsResolver } from './resolvers'; import { identityExtensionsResolver } from './resolvers';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'roles', pathMatch: 'full' }, { path: '', redirectTo: 'roles', pathMatch: 'full' },
{ {
path: '', path: '',
component: RouterOutletComponent, component: RouterOutletComponent,
canActivate: [AuthGuardFn, PermissionGuardFn], canActivate: [authGuard, permissionGuard],
resolve: [IdentityExtensionsResolver], resolve: [identityExtensionsResolver],
children: [ children: [
{ {
path: 'roles', path: 'roles',

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

@ -22,7 +22,7 @@ import {
DEFAULT_IDENTITY_EDIT_FORM_PROPS, DEFAULT_IDENTITY_EDIT_FORM_PROPS,
} from '../tokens'; } from '../tokens';
export const IdentityExtensionsResolver = () => { export const identityExtensionsResolver = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

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

@ -7,7 +7,7 @@ import { OAuthService } from 'angular-oauth2-oidc';
import { AuthService, IAbpGuard } from '@abp/ng.core'; import { AuthService, IAbpGuard } from '@abp/ng.core';
/** /**
* @deprecated Use `AbpOAuthGuardFn` instead. * @deprecated Use `abpOAuthGuard` instead.
*/ */
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -32,7 +32,7 @@ export class AbpOAuthGuard implements IAbpGuard {
} }
export const AbpOAuthGuardFn: CanActivateFn = ( export const abpOAuthGuard: CanActivateFn = (
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
state: RouterStateSnapshot, state: RouterStateSnapshot,
) => { ) => {

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

@ -4,7 +4,7 @@ import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc';
import { import {
AbpLocalStorageService, AbpLocalStorageService,
ApiInterceptor, ApiInterceptor,
AuthGuardFn, authGuard,
AuthService, AuthService,
CHECK_AUTHENTICATION_STATE_FN_KEY, CHECK_AUTHENTICATION_STATE_FN_KEY,
noop, noop,
@ -14,7 +14,7 @@ import { AbpOAuthService } from './services';
import { OAuthConfigurationHandler } from './handlers/oauth-configuration.handler'; import { OAuthConfigurationHandler } from './handlers/oauth-configuration.handler';
import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { OAuthApiInterceptor } from './interceptors/api.interceptor'; import { OAuthApiInterceptor } from './interceptors/api.interceptor';
import { AbpOAuthGuardFn } from './guards/oauth.guard'; import { abpOAuthGuard } from './guards/oauth.guard';
import { NavigateToManageProfileProvider } from './providers'; import { NavigateToManageProfileProvider } from './providers';
import { checkAccessToken, pipeToLogin } from './utils'; import { checkAccessToken, pipeToLogin } from './utils';
@ -31,8 +31,8 @@ export class AbpOAuthModule {
useClass: AbpOAuthService, useClass: AbpOAuthService,
}, },
{ {
provide: AuthGuardFn, provide: authGuard,
useValue: AbpOAuthGuardFn, useValue: abpOAuthGuard,
}, },
{ {
provide: ApiInterceptor, provide: ApiInterceptor,

4
npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts

@ -1,7 +1,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { import {
AuthGuardFn, authGuard,
ReplaceableComponents, ReplaceableComponents,
ReplaceableRouteContainerComponent, ReplaceableRouteContainerComponent,
RouterOutletComponent, RouterOutletComponent,
@ -13,7 +13,7 @@ const routes: Routes = [
{ {
path: '', path: '',
component: RouterOutletComponent, component: RouterOutletComponent,
canActivate: [AuthGuardFn], canActivate: [authGuard],
children: [ children: [
{ {
path: '', path: '',

3
npm/ng-packs/packages/tenant-management/src/lib/guards/extensions.guard.ts

@ -25,10 +25,9 @@ import {
TENANT_MANAGEMENT_ENTITY_PROP_CONTRIBUTORS, TENANT_MANAGEMENT_ENTITY_PROP_CONTRIBUTORS,
TENANT_MANAGEMENT_TOOLBAR_ACTION_CONTRIBUTORS, TENANT_MANAGEMENT_TOOLBAR_ACTION_CONTRIBUTORS,
} from '../tokens/extensions.token'; } from '../tokens/extensions.token';
import { CanActivateFn } from '@angular/router';
/** /**
* @deprecated Use `TenantManagementExtensionsGuardFn` instead. * @deprecated Use `tenantManagementExtensionsResolver` instead.
*/ */
@Injectable() @Injectable()
export class TenantManagementExtensionsGuard implements IAbpGuard { export class TenantManagementExtensionsGuard implements IAbpGuard {

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

@ -22,7 +22,7 @@ import {
DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS, DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS,
} from '../tokens'; } from '../tokens';
export const TenantManagementExtensionsResolver = () => { export const tenantManagementExtensionsResolver = () => {
const configState = inject(ConfigStateService); const configState = inject(ConfigStateService);
const extensions = inject(ExtensionsService); const extensions = inject(ExtensionsService);

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

@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router'; import { RouterModule, Routes } from '@angular/router';
import { import {
AuthGuardFn, authGuard,
PermissionGuardFn, permissionGuard,
ReplaceableComponents, ReplaceableComponents,
ReplaceableRouteContainerComponent, ReplaceableRouteContainerComponent,
RouterOutletComponent, RouterOutletComponent,
@ -11,15 +11,15 @@ import {
import { TenantsComponent } from './components/tenants/tenants.component'; import { TenantsComponent } from './components/tenants/tenants.component';
import { eTenantManagementComponents } from './enums/components'; import { eTenantManagementComponents } from './enums/components';
import { TenantManagementExtensionsResolver } from './resolvers'; import { tenantManagementExtensionsResolver } from './resolvers';
const routes: Routes = [ const routes: Routes = [
{ path: '', redirectTo: 'tenants', pathMatch: 'full' }, { path: '', redirectTo: 'tenants', pathMatch: 'full' },
{ {
path: '', path: '',
component: RouterOutletComponent, component: RouterOutletComponent,
canActivate: [AuthGuardFn, PermissionGuardFn, ], canActivate: [authGuard, permissionGuard, ],
resolve: [TenantManagementExtensionsResolver], resolve: [tenantManagementExtensionsResolver],
children: [ children: [
{ {
path: 'tenants', path: 'tenants',

Loading…
Cancel
Save