diff --git a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts index 0ec529dd37..735ee44ee9 100644 --- a/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts +++ b/npm/ng-packs/packages/account/src/lib/guards/authentication-flow.guard.ts @@ -1,5 +1,6 @@ import { AuthService, IAbpGuard } from '@abp/ng.core'; import { Injectable, inject } from '@angular/core'; +import { CanActivateFn } from '@angular/router'; /** * @deprecated Use `authenticationFlowGuard` instead. @@ -16,7 +17,7 @@ export class AuthenticationFlowGuard implements IAbpGuard { } } -export const authenticationFlowGuard = () => { +export const authenticationFlowGuard: CanActivateFn = () => { const authService = inject(AuthService); if (authService.isInternalAuth) return true; diff --git a/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts index 7a08418b26..67e68b92b4 100644 --- a/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts +++ b/npm/ng-packs/packages/account/src/lib/resolvers/extensions.resolver.ts @@ -1,6 +1,6 @@ import { inject } from '@angular/core'; import { ConfigStateService } from '@abp/ng.core'; -import { map, tap } from 'rxjs'; +import { Observable, map, tap } from 'rxjs'; import { ExtensionsService, getObjectExtensionEntitiesFromStore, @@ -9,8 +9,9 @@ import { } from '@abp/ng.theme.shared/extensions'; import { eAccountComponents } from '../enums'; import { ACCOUNT_EDIT_FORM_PROP_CONTRIBUTORS, DEFAULT_ACCOUNT_FORM_PROPS } from '../tokens'; +import { ResolveFn } from '@angular/router'; -export const accountExtensionsResolver = () => { +export const accountExtensionsResolver: ResolveFn> = () => { const configState = inject(ConfigStateService); const extensions = inject(ExtensionsService); diff --git a/npm/ng-packs/packages/account/src/public-api.ts b/npm/ng-packs/packages/account/src/public-api.ts index a383562c15..f9df16ebc7 100644 --- a/npm/ng-packs/packages/account/src/public-api.ts +++ b/npm/ng-packs/packages/account/src/public-api.ts @@ -6,3 +6,4 @@ export * from './lib/models'; export * from './lib/services'; export * from './lib/tokens'; export * from './lib/utils'; +export * from './lib/resolvers'; diff --git a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts index b80306cc6c..941798b8b0 100644 --- a/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/abstracts/auth.guard.ts @@ -20,4 +20,4 @@ export class AuthGuard implements IAbpGuard { export const authGuard: CanActivateFn = () => { console.error('You should add @abp/ng-oauth packages or create your own auth packages.'); return false; -}; \ No newline at end of file +}; diff --git a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts index 197ad0f70c..76aebdded0 100644 --- a/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts +++ b/npm/ng-packs/packages/core/src/lib/guards/permission.guard.ts @@ -1,5 +1,10 @@ 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 { 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 routesService = inject(RoutesService); const oAuthService = inject(OAuthService); @@ -67,4 +75,4 @@ export const permissionGuard: CanActivateFn = (route: ActivatedRouteSnapshot, s } }), ); -} +}; diff --git a/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts index c1676d1c39..2f5a831d62 100644 --- a/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts +++ b/npm/ng-packs/packages/identity/src/lib/resolvers/extensions.resolver.ts @@ -1,5 +1,5 @@ import { inject } from '@angular/core'; -import { map, tap } from 'rxjs'; +import { Observable, map, tap } from 'rxjs'; import { ConfigStateService } from '@abp/ng.core'; import { ExtensionsService, @@ -21,8 +21,9 @@ import { DEFAULT_IDENTITY_CREATE_FORM_PROPS, DEFAULT_IDENTITY_EDIT_FORM_PROPS, } from '../tokens'; +import { ResolveFn } from '@angular/router'; -export const identityExtensionsResolver = () => { +export const identityExtensionsResolver: ResolveFn> = () => { const configState = inject(ConfigStateService); const extensions = inject(ExtensionsService); diff --git a/npm/ng-packs/packages/identity/src/public-api.ts b/npm/ng-packs/packages/identity/src/public-api.ts index 7e85188004..4c4913f7eb 100644 --- a/npm/ng-packs/packages/identity/src/public-api.ts +++ b/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/models'; export * from './lib/tokens'; +export * from './lib/resolvers'; diff --git a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts index f75dc4893a..86b901eb46 100644 --- a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts +++ b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts @@ -1,5 +1,10 @@ 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 { OAuthService } from 'angular-oauth2-oidc'; @@ -31,7 +36,6 @@ export class AbpOAuthGuard implements IAbpGuard { } } - export const abpOAuthGuard: CanActivateFn = ( route: ActivatedRouteSnapshot, state: RouterStateSnapshot, @@ -48,4 +52,4 @@ export const abpOAuthGuard: CanActivateFn = ( const params = { returnUrl: state.url }; authService.navigateToLogin(params); return false; -}; \ No newline at end of file +}; diff --git a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts b/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts index 6831396898..98b8046d85 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/resolvers/extensions.resolver.ts @@ -1,5 +1,5 @@ import { inject } from '@angular/core'; -import { map, tap } from 'rxjs'; +import { Observable, map, tap } from 'rxjs'; import { ConfigStateService } from '@abp/ng.core'; import { ExtensionsService, @@ -21,8 +21,9 @@ import { DEFAULT_TENANT_MANAGEMENT_CREATE_FORM_PROPS, DEFAULT_TENANT_MANAGEMENT_EDIT_FORM_PROPS, } from '../tokens'; +import { ResolveFn } from '@angular/router'; -export const tenantManagementExtensionsResolver = () => { +export const tenantManagementExtensionsResolver: ResolveFn> = () => { const configState = inject(ConfigStateService); const extensions = inject(ExtensionsService); diff --git a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts index e1ac10c95e..2fcce5e108 100644 --- a/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts +++ b/npm/ng-packs/packages/tenant-management/src/lib/tenant-management-routing.module.ts @@ -18,7 +18,7 @@ const routes: Routes = [ { path: '', component: RouterOutletComponent, - canActivate: [authGuard, permissionGuard, ], + canActivate: [authGuard, permissionGuard], resolve: [tenantManagementExtensionsResolver], children: [ { diff --git a/npm/ng-packs/packages/tenant-management/src/public-api.ts b/npm/ng-packs/packages/tenant-management/src/public-api.ts index 6321ce8fae..f39c438435 100644 --- a/npm/ng-packs/packages/tenant-management/src/public-api.ts +++ b/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/tenant-management.module'; export * from './lib/tokens'; +export * from './lib/resolvers';