You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by bo...@apache.org on 2023/01/02 18:18:53 UTC
[streampipes] branch chore/ui-linting created (now 5f109cbcd)
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a change to branch chore/ui-linting
in repository https://gitbox.apache.org/repos/asf/streampipes.git
at 5f109cbcd add linting to enums models (#877)
This branch includes the following new commits:
new 3760347d9 add linting to enums module (#877)
new c2e0811c0 add linting to enums guards (#877)
new 5f109cbcd add linting to enums models (#877)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[streampipes] 01/03: add linting to enums module (#877)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/ui-linting
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 3760347d986af19becae00086a92155099f60624
Author: bossenti <bo...@posteo.de>
AuthorDate: Mon Jan 2 19:14:24 2023 +0100
add linting to enums module (#877)
---
ui/.eslintignore | 1 -
ui/.prettierignore | 1 -
ui/src/app/_enums/page-name.enum.ts | 28 ++++++++---------
ui/src/app/_enums/user-privilege.enum.ts | 54 ++++++++++++++++----------------
ui/src/app/_enums/user-role.enum.ts | 24 +++++++-------
5 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/ui/.eslintignore b/ui/.eslintignore
index 1c49c614c..4f9dc56c8 100644
--- a/ui/.eslintignore
+++ b/ui/.eslintignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to lint additional modules
# Please also see .prettierignore
projects
-src/app/_enums
src/app/_guards
src/app/_models
src/app/add
diff --git a/ui/.prettierignore b/ui/.prettierignore
index 920a48bda..f5743c083 100644
--- a/ui/.prettierignore
+++ b/ui/.prettierignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to format additional modules
# Please also see .eslintignore
projects
-src/app/_enums
src/app/_guards
src/app/_models
src/app/add
diff --git a/ui/src/app/_enums/page-name.enum.ts b/ui/src/app/_enums/page-name.enum.ts
index a681bcc02..99c9e30cc 100644
--- a/ui/src/app/_enums/page-name.enum.ts
+++ b/ui/src/app/_enums/page-name.enum.ts
@@ -17,18 +17,18 @@
*/
export enum PageName {
- HOME,
- PIPELINE_EDITOR,
- CONNECT,
- PIPELINE_OVERVIEW,
- PIPELINE_DETAILS,
- DASHBOARD,
- DATA_EXPLORER,
- APPS,
- NOTIFICATIONS,
- INSTALL_PIPELINE_ELEMENTS,
- FILE_UPLOAD,
- PROFILE,
- SETTINGS,
- ASSETS
+ HOME,
+ PIPELINE_EDITOR,
+ CONNECT,
+ PIPELINE_OVERVIEW,
+ PIPELINE_DETAILS,
+ DASHBOARD,
+ DATA_EXPLORER,
+ APPS,
+ NOTIFICATIONS,
+ INSTALL_PIPELINE_ELEMENTS,
+ FILE_UPLOAD,
+ PROFILE,
+ SETTINGS,
+ ASSETS,
}
diff --git a/ui/src/app/_enums/user-privilege.enum.ts b/ui/src/app/_enums/user-privilege.enum.ts
index 6f58fdfe8..53ec9a5f2 100644
--- a/ui/src/app/_enums/user-privilege.enum.ts
+++ b/ui/src/app/_enums/user-privilege.enum.ts
@@ -17,40 +17,40 @@
*/
export enum UserPrivilege {
- PRIVILEGE_READ_PIPELINE = 'PRIVILEGE_READ_PIPELINE',
- PRIVILEGE_WRITE_PIPELINE = 'PRIVILEGE_WRITE_PIPELINE',
- PRIVILEGE_DELETE_PIPELINE = 'PRIVILEGE_DELETE_PIPELINE',
+ PRIVILEGE_READ_PIPELINE = 'PRIVILEGE_READ_PIPELINE',
+ PRIVILEGE_WRITE_PIPELINE = 'PRIVILEGE_WRITE_PIPELINE',
+ PRIVILEGE_DELETE_PIPELINE = 'PRIVILEGE_DELETE_PIPELINE',
- PRIVILEGE_READ_DATA_EXPLORER_VIEW = 'PRIVILEGE_READ_DATA_EXPLORER_VIEW',
- PRIVILEGE_WRITE_DATA_EXPLORER_VIEW = 'PRIVILEGE_WRITE_DATA_EXPLORER_VIEW',
- PRIVILEGE_DELETE_DATA_EXPLORER_VIEW = 'PRIVILEGE_DELETE_DATA_EXPLORER_VIEW',
+ PRIVILEGE_READ_DATA_EXPLORER_VIEW = 'PRIVILEGE_READ_DATA_EXPLORER_VIEW',
+ PRIVILEGE_WRITE_DATA_EXPLORER_VIEW = 'PRIVILEGE_WRITE_DATA_EXPLORER_VIEW',
+ PRIVILEGE_DELETE_DATA_EXPLORER_VIEW = 'PRIVILEGE_DELETE_DATA_EXPLORER_VIEW',
- PRIVILEGE_READ_DASHBOARD = 'PRIVILEGE_READ_DASHBOARD',
- PRIVILEGE_WRITE_DASHBOARD = 'PRIVILEGE_WRITE_DASHBOARD',
- PRIVILEGE_DELETE_DASHBOARD = 'PRIVILEGE_DELETE_DASHBOARD',
+ PRIVILEGE_READ_DASHBOARD = 'PRIVILEGE_READ_DASHBOARD',
+ PRIVILEGE_WRITE_DASHBOARD = 'PRIVILEGE_WRITE_DASHBOARD',
+ PRIVILEGE_DELETE_DASHBOARD = 'PRIVILEGE_DELETE_DASHBOARD',
- PRIVILEGE_READ_ADAPTER = 'PRIVILEGE_READ_ADAPTER',
- PRIVILEGE_WRITE_ADAPTER = 'PRIVILEGE_WRITE_ADAPTER',
- PRIVILEGE_DELETE_ADAPTER = 'PRIVILEGE_DELETE_ADAPTER',
+ PRIVILEGE_READ_ADAPTER = 'PRIVILEGE_READ_ADAPTER',
+ PRIVILEGE_WRITE_ADAPTER = 'PRIVILEGE_WRITE_ADAPTER',
+ PRIVILEGE_DELETE_ADAPTER = 'PRIVILEGE_DELETE_ADAPTER',
- PRIVILEGE_READ_PIPELINE_ELEMENT = 'PRIVILEGE_READ_PIPELINE_ELEMENT',
- PRIVILEGE_WRITE_PIPELINE_ELEMENT = 'PRIVILEGE_WRITE_PIPELINE_ELEMENT',
- PRIVILEGE_DELETE_PIPELINE_ELEMENT = 'PRIVILEGE_DELETE_PIPELINE_ELEMENT',
+ PRIVILEGE_READ_PIPELINE_ELEMENT = 'PRIVILEGE_READ_PIPELINE_ELEMENT',
+ PRIVILEGE_WRITE_PIPELINE_ELEMENT = 'PRIVILEGE_WRITE_PIPELINE_ELEMENT',
+ PRIVILEGE_DELETE_PIPELINE_ELEMENT = 'PRIVILEGE_DELETE_PIPELINE_ELEMENT',
- PRIVILEGE_READ_DATA_EXPLORER_WIDGET = 'PRIVILEGE_READ_DATA_EXPLORER_WIDGET',
- PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET = 'PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET',
- PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET = 'PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET',
+ PRIVILEGE_READ_DATA_EXPLORER_WIDGET = 'PRIVILEGE_READ_DATA_EXPLORER_WIDGET',
+ PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET = 'PRIVILEGE_WRITE_DATA_EXPLORER_WIDGET',
+ PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET = 'PRIVILEGE_DELETE_DATA_EXPLORER_WIDGET',
- PRIVILEGE_READ_DASHBOARD_WIDGET = 'PRIVILEGE_READ_DASHBOARD_WIDGET',
- PRIVILEGE_WRITE_DASHBOARD_WIDGET = 'PRIVILEGE_WRITE_DASHBOARD_WIDGET',
- PRIVILEGE_DELETE_DASHBOARD_WIDGET = 'PRIVILEGE_DELETE_DASHBOARD_WIDGET',
+ PRIVILEGE_READ_DASHBOARD_WIDGET = 'PRIVILEGE_READ_DASHBOARD_WIDGET',
+ PRIVILEGE_WRITE_DASHBOARD_WIDGET = 'PRIVILEGE_WRITE_DASHBOARD_WIDGET',
+ PRIVILEGE_DELETE_DASHBOARD_WIDGET = 'PRIVILEGE_DELETE_DASHBOARD_WIDGET',
- PRIVILEGE_READ_APPS = 'PRIVILEGE_READ_APPS',
- PRIVILEGE_WRITE_APPS = 'PRIVILEGE_WRITE_APPS',
+ PRIVILEGE_READ_APPS = 'PRIVILEGE_READ_APPS',
+ PRIVILEGE_WRITE_APPS = 'PRIVILEGE_WRITE_APPS',
- PRIVILEGE_READ_NOTIFICATIONS = 'PRIVILEGE_READ_NOTIFICATIONS',
+ PRIVILEGE_READ_NOTIFICATIONS = 'PRIVILEGE_READ_NOTIFICATIONS',
- PRIVILEGE_READ_FILES = 'PRIVILEGE_READ_FILES',
- PRIVILEGE_WRITE_FILES = 'PRIVILEGE_WRITE_FILES',
- PRIVILEGE_DELETE_FILES = 'PRIVILEGE_DELETE_FILES'
+ PRIVILEGE_READ_FILES = 'PRIVILEGE_READ_FILES',
+ PRIVILEGE_WRITE_FILES = 'PRIVILEGE_WRITE_FILES',
+ PRIVILEGE_DELETE_FILES = 'PRIVILEGE_DELETE_FILES',
}
diff --git a/ui/src/app/_enums/user-role.enum.ts b/ui/src/app/_enums/user-role.enum.ts
index 2239132cf..90471d624 100644
--- a/ui/src/app/_enums/user-role.enum.ts
+++ b/ui/src/app/_enums/user-role.enum.ts
@@ -17,16 +17,16 @@
*/
export enum UserRole {
- ROLE_ADMIN = 'ROLE_ADMIN',
- ROLE_SERVICE_ADMIN = 'ROLE_SERVICE_ADMIN',
- ROLE_PIPELINE_ADMIN = 'ROLE_PIPELINE_ADMIN',
- ROLE_DASHBOARD_ADMIN = 'ROLE_DASHBOARD_ADMIN',
- ROLE_DATA_EXPLORER_ADMIN = 'ROLE_DATA_EXPLORER_ADMIN',
- ROLE_CONNECT_ADMIN = 'ROLE_CONNECT_ADMIN',
- ROLE_ASSET_ADMIN = 'ROLE_ASSET_ADMIN',
- ROLE_DASHBOARD_USER = 'ROLE_DASHBOARD_USER',
- ROLE_DATA_EXPLORER_USER = 'ROLE_DATA_EXPLORER_USER',
- ROLE_PIPELINE_USER = 'ROLE_PIPELINE_USER',
- ROLE_APP_USER = 'ROLE_APP_USER',
- ROLE_ASSET_USER = 'ROLE_ASSET_USER'
+ ROLE_ADMIN = 'ROLE_ADMIN',
+ ROLE_SERVICE_ADMIN = 'ROLE_SERVICE_ADMIN',
+ ROLE_PIPELINE_ADMIN = 'ROLE_PIPELINE_ADMIN',
+ ROLE_DASHBOARD_ADMIN = 'ROLE_DASHBOARD_ADMIN',
+ ROLE_DATA_EXPLORER_ADMIN = 'ROLE_DATA_EXPLORER_ADMIN',
+ ROLE_CONNECT_ADMIN = 'ROLE_CONNECT_ADMIN',
+ ROLE_ASSET_ADMIN = 'ROLE_ASSET_ADMIN',
+ ROLE_DASHBOARD_USER = 'ROLE_DASHBOARD_USER',
+ ROLE_DATA_EXPLORER_USER = 'ROLE_DATA_EXPLORER_USER',
+ ROLE_PIPELINE_USER = 'ROLE_PIPELINE_USER',
+ ROLE_APP_USER = 'ROLE_APP_USER',
+ ROLE_ASSET_USER = 'ROLE_ASSET_USER',
}
[streampipes] 03/03: add linting to enums models (#877)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/ui-linting
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 5f109cbcd218004d054c1f9ece4cfbbd31f14a9d
Author: bossenti <bo...@posteo.de>
AuthorDate: Mon Jan 2 19:18:34 2023 +0100
add linting to enums models (#877)
---
ui/.eslintignore | 1 -
ui/.prettierignore | 1 -
ui/src/app/_models/auth.model.ts | 6 +++---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ui/.eslintignore b/ui/.eslintignore
index 877a18339..101554f57 100644
--- a/ui/.eslintignore
+++ b/ui/.eslintignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to lint additional modules
# Please also see .prettierignore
projects
-src/app/_models
src/app/add
src/app/apidocs
src/app/app-asset-monitoring
diff --git a/ui/.prettierignore b/ui/.prettierignore
index dd6aaaa7d..e95abae01 100644
--- a/ui/.prettierignore
+++ b/ui/.prettierignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to format additional modules
# Please also see .eslintignore
projects
-src/app/_models
src/app/add
src/app/apidocs
src/app/app-asset-monitoring
diff --git a/ui/src/app/_models/auth.model.ts b/ui/src/app/_models/auth.model.ts
index 18fc771ef..ba4a98f28 100644
--- a/ui/src/app/_models/auth.model.ts
+++ b/ui/src/app/_models/auth.model.ts
@@ -22,7 +22,7 @@ import { UserRole } from '../_enums/user-role.enum';
export type RoleModel = Privilege | Role;
export interface RoleDescription {
- role: UserRole;
- roleTitle: string;
- roleDescription: string;
+ role: UserRole;
+ roleTitle: string;
+ roleDescription: string;
}
[streampipes] 02/03: add linting to enums guards (#877)
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bossenti pushed a commit to branch chore/ui-linting
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit c2e0811c062c29ffcd6c0be074accf80abe98907
Author: bossenti <bo...@posteo.de>
AuthorDate: Mon Jan 2 19:17:48 2023 +0100
add linting to enums guards (#877)
---
ui/.eslintignore | 1 -
ui/.prettierignore | 1 -
.../already-configured.can-activate.guard.ts | 20 ++++----
.../_guards/auth.can-activate-children.guard.ts | 33 +++++++------
.../_guards/base-configured.can-activate.guard.ts | 54 +++++++++++++---------
.../app/_guards/configured.can-activate.guard.ts | 21 ++++-----
ui/src/app/_guards/page-auth.can-active.guard.ts | 18 ++++----
.../registration-allowed.can-activate.guard.ts | 37 +++++++++------
.../restore-password-allowed.can-activate.guard.ts | 37 +++++++++------
9 files changed, 122 insertions(+), 100 deletions(-)
diff --git a/ui/.eslintignore b/ui/.eslintignore
index 4f9dc56c8..877a18339 100644
--- a/ui/.eslintignore
+++ b/ui/.eslintignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to lint additional modules
# Please also see .prettierignore
projects
-src/app/_guards
src/app/_models
src/app/add
src/app/apidocs
diff --git a/ui/.prettierignore b/ui/.prettierignore
index f5743c083..dd6aaaa7d 100644
--- a/ui/.prettierignore
+++ b/ui/.prettierignore
@@ -19,7 +19,6 @@ dist
# Remove these in the future to format additional modules
# Please also see .eslintignore
projects
-src/app/_guards
src/app/_models
src/app/add
src/app/apidocs
diff --git a/ui/src/app/_guards/already-configured.can-activate.guard.ts b/ui/src/app/_guards/already-configured.can-activate.guard.ts
index 5d51100d8..49cdd2830 100644
--- a/ui/src/app/_guards/already-configured.can-activate.guard.ts
+++ b/ui/src/app/_guards/already-configured.can-activate.guard.ts
@@ -23,17 +23,15 @@ import { BaseConfiguredCanActivateGuard } from './base-configured.can-activate.g
@Injectable()
export class AlreadyConfiguredCanActivateGuard extends BaseConfiguredCanActivateGuard {
+ constructor(router: Router, authService: AuthService) {
+ super(router, authService);
+ }
- constructor(router: Router,
- authService: AuthService) {
- super(router, authService);
- }
+ onIsConfigured(): boolean | UrlTree {
+ return this.router.parseUrl('login');
+ }
- onIsConfigured(): boolean | UrlTree {
- return this.router.parseUrl('login');
- }
-
- onIsUnconfigured(): boolean | UrlTree {
- return true;
- }
+ onIsUnconfigured(): boolean | UrlTree {
+ return true;
+ }
}
diff --git a/ui/src/app/_guards/auth.can-activate-children.guard.ts b/ui/src/app/_guards/auth.can-activate-children.guard.ts
index 7677ed570..cad3cf7ac 100644
--- a/ui/src/app/_guards/auth.can-activate-children.guard.ts
+++ b/ui/src/app/_guards/auth.can-activate-children.guard.ts
@@ -18,28 +18,27 @@
import { Injectable } from '@angular/core';
import {
- ActivatedRouteSnapshot,
- CanActivateChild,
- Router,
- RouterStateSnapshot
+ ActivatedRouteSnapshot,
+ CanActivateChild,
+ Router,
+ RouterStateSnapshot,
} from '@angular/router';
import { AuthService } from '../services/auth.service';
@Injectable()
export class AuthCanActivateChildrenGuard implements CanActivateChild {
+ constructor(private authService: AuthService, private router: Router) {}
- constructor(private authService: AuthService,
- private router: Router) {
- }
+ canActivateChild(
+ childRoute: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ): boolean {
+ if (this.authService.authenticated()) {
+ return true;
+ }
+ this.authService.logout();
+ this.router.navigate(['/login']);
- canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
- if (this.authService.authenticated()) {
- return true;
- }
- this.authService.logout();
- this.router.navigate(['/login']);
-
- return false;
-
- }
+ return false;
+ }
}
diff --git a/ui/src/app/_guards/base-configured.can-activate.guard.ts b/ui/src/app/_guards/base-configured.can-activate.guard.ts
index 4b28598b7..4310328b6 100644
--- a/ui/src/app/_guards/base-configured.can-activate.guard.ts
+++ b/ui/src/app/_guards/base-configured.can-activate.guard.ts
@@ -17,34 +17,44 @@
*/
import {
- ActivatedRouteSnapshot,
- CanActivate,
- Router,
- RouterStateSnapshot,
- UrlTree
+ ActivatedRouteSnapshot,
+ CanActivate,
+ Router,
+ RouterStateSnapshot,
+ UrlTree,
} from '@angular/router';
import { Observable } from 'rxjs';
import { AuthService } from '../services/auth.service';
export abstract class BaseConfiguredCanActivateGuard implements CanActivate {
+ constructor(protected router: Router, protected authService: AuthService) {}
- constructor(protected router: Router,
- protected authService: AuthService) { }
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ):
+ | Observable<boolean | UrlTree>
+ | Promise<boolean | UrlTree>
+ | boolean
+ | UrlTree {
+ return new Promise(resolve =>
+ this.authService.checkConfiguration().subscribe(
+ configured => {
+ if (!configured) {
+ resolve(this.onIsUnconfigured());
+ } else {
+ resolve(this.onIsConfigured());
+ }
+ },
+ error => {
+ const url = this.router.parseUrl('startup');
+ resolve(url);
+ },
+ ),
+ );
+ }
- canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- return new Promise((resolve) => this.authService.checkConfiguration().subscribe((configured) => {
- if (!configured) {
- resolve(this.onIsUnconfigured());
- } else {
- resolve(this.onIsConfigured());
- }
- }, error => {
- const url = this.router.parseUrl('startup');
- resolve(url);
- }));
- }
+ abstract onIsConfigured(): boolean | UrlTree;
- abstract onIsConfigured(): boolean | UrlTree;
-
- abstract onIsUnconfigured(): boolean | UrlTree;
+ abstract onIsUnconfigured(): boolean | UrlTree;
}
diff --git a/ui/src/app/_guards/configured.can-activate.guard.ts b/ui/src/app/_guards/configured.can-activate.guard.ts
index c787a6001..fc1e47cb6 100644
--- a/ui/src/app/_guards/configured.can-activate.guard.ts
+++ b/ui/src/app/_guards/configured.can-activate.guard.ts
@@ -23,18 +23,15 @@ import { BaseConfiguredCanActivateGuard } from './base-configured.can-activate.g
@Injectable()
export class ConfiguredCanActivateGuard extends BaseConfiguredCanActivateGuard {
+ constructor(router: Router, authService: AuthService) {
+ super(router, authService);
+ }
- constructor(router: Router,
- authService: AuthService) {
- super(router, authService);
- }
-
- onIsConfigured(): boolean | UrlTree {
- return true;
- }
-
- onIsUnconfigured(): boolean | UrlTree {
- return this.router.parseUrl('setup');
- }
+ onIsConfigured(): boolean | UrlTree {
+ return true;
+ }
+ onIsUnconfigured(): boolean | UrlTree {
+ return this.router.parseUrl('setup');
+ }
}
diff --git a/ui/src/app/_guards/page-auth.can-active.guard.ts b/ui/src/app/_guards/page-auth.can-active.guard.ts
index 2370ebba3..f1acc2320 100644
--- a/ui/src/app/_guards/page-auth.can-active.guard.ts
+++ b/ui/src/app/_guards/page-auth.can-active.guard.ts
@@ -16,20 +16,22 @@
*
*/
-import { ActivatedRouteSnapshot, CanActivateChild, Router } from '@angular/router';
+import {
+ ActivatedRouteSnapshot,
+ CanActivateChild,
+ Router,
+} from '@angular/router';
import { AuthService } from '../services/auth.service';
import { PageName } from '../_enums/page-name.enum';
import { Injectable } from '@angular/core';
@Injectable()
export class PageAuthGuard implements CanActivateChild {
+ constructor(private router: Router, private authService: AuthService) {}
- constructor(private router: Router,
- private authService: AuthService) {}
+ canActivateChild(activatedRouteSnapshot: ActivatedRouteSnapshot): boolean {
+ const pageNames: PageName[] = activatedRouteSnapshot.data.authPageNames;
- canActivateChild(activatedRouteSnapshot: ActivatedRouteSnapshot): boolean {
- const pageNames: PageName[] = activatedRouteSnapshot.data.authPageNames;
-
- return this.authService.isAnyAccessGranted(pageNames, true);
- }
+ return this.authService.isAnyAccessGranted(pageNames, true);
+ }
}
diff --git a/ui/src/app/_guards/registration-allowed.can-activate.guard.ts b/ui/src/app/_guards/registration-allowed.can-activate.guard.ts
index dbd48679e..61b91438f 100644
--- a/ui/src/app/_guards/registration-allowed.can-activate.guard.ts
+++ b/ui/src/app/_guards/registration-allowed.can-activate.guard.ts
@@ -18,11 +18,11 @@
import { Injectable } from '@angular/core';
import {
- ActivatedRouteSnapshot,
- CanActivate,
- Router,
- RouterStateSnapshot,
- UrlTree
+ ActivatedRouteSnapshot,
+ CanActivate,
+ Router,
+ RouterStateSnapshot,
+ UrlTree,
} from '@angular/router';
import { LoginService } from '../login/services/login.service';
import { Observable } from 'rxjs';
@@ -30,15 +30,22 @@ import { map } from 'rxjs/operators';
@Injectable()
export class RegistrationAllowedCanActivateGuard implements CanActivate {
+ constructor(private router: Router, private loginService: LoginService) {}
- constructor(private router: Router,
- private loginService: LoginService) {
- }
-
- canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- return this.loginService.fetchLoginSettings().pipe(map(config => {
- return config.allowSelfRegistration ? true : this.router.parseUrl('register');
- }));
- }
-
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ):
+ | Observable<boolean | UrlTree>
+ | Promise<boolean | UrlTree>
+ | boolean
+ | UrlTree {
+ return this.loginService.fetchLoginSettings().pipe(
+ map(config => {
+ return config.allowSelfRegistration
+ ? true
+ : this.router.parseUrl('register');
+ }),
+ );
+ }
}
diff --git a/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts b/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
index 8be421ba8..0499d21fa 100644
--- a/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
+++ b/ui/src/app/_guards/restore-password-allowed.can-activate.guard.ts
@@ -18,11 +18,11 @@
import { Injectable } from '@angular/core';
import {
- ActivatedRouteSnapshot,
- CanActivate,
- Router,
- RouterStateSnapshot,
- UrlTree
+ ActivatedRouteSnapshot,
+ CanActivate,
+ Router,
+ RouterStateSnapshot,
+ UrlTree,
} from '@angular/router';
import { LoginService } from '../login/services/login.service';
import { Observable } from 'rxjs';
@@ -30,13 +30,24 @@ import { map } from 'rxjs/operators';
@Injectable()
export class RestorePasswordAllowedCanActivateGuard implements CanActivate {
+ constructor(private router: Router, private loginService: LoginService) {}
- constructor(private router: Router,
- private loginService: LoginService) {
- }
-
- canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- return this.loginService.fetchLoginSettings().pipe(map(config => config.allowPasswordRecovery ? true : this.router.parseUrl('login')));
- }
-
+ canActivate(
+ route: ActivatedRouteSnapshot,
+ state: RouterStateSnapshot,
+ ):
+ | Observable<boolean | UrlTree>
+ | Promise<boolean | UrlTree>
+ | boolean
+ | UrlTree {
+ return this.loginService
+ .fetchLoginSettings()
+ .pipe(
+ map(config =>
+ config.allowPasswordRecovery
+ ? true
+ : this.router.parseUrl('login'),
+ ),
+ );
+ }
}