fix(console): auth guard, i18n (#1296)

* fix: auth guard, i18n

* Update console/src/app/guards/auth.guard.ts

Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
This commit is contained in:
Max Peintner 2021-02-17 08:36:27 +01:00 committed by GitHub
parent 27be460c07
commit f01921371c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions

View File

@ -17,9 +17,7 @@ export class AuthGuard implements CanActivate {
state: RouterStateSnapshot, state: RouterStateSnapshot,
): Observable<boolean> | Promise<boolean> | Promise<any> | boolean { ): Observable<boolean> | Promise<boolean> | Promise<any> | boolean {
if (!this.auth.authenticated) { if (!this.auth.authenticated) {
return this.auth.authenticate().then(() => { return this.auth.authenticate();
return this.authService.GetActiveOrg();
});
} }
return this.auth.authenticated; return this.auth.authenticated;
} }

View File

@ -9,16 +9,16 @@
"STEPS_TITLE":"Complete the following steps in the order you want:", "STEPS_TITLE":"Complete the following steps in the order you want:",
"STEPS": { "STEPS": {
"1": { "1": {
"TITLE":"Projekt erstellen", "TITLE":"Create a project",
"DESC":"Erstellen Sie Ihr erstes Projekt und legen Sie Zugangsberechtigungen eventueller Mitarbeiter fest." "DESC":"Create your first project and define access rights for any employees."
}, },
"2": { "2": {
"TITLE":"Applikation erstellen", "TITLE":"Create Application",
"DESC":"Erstellen Sie eine Applikation innerhalb Ihres Projektes und legen Sie dessen Eigenschaften fest." "DESC":"Create an application within your project and define its properties."
}, },
"3": { "3": {
"TITLE":"Sicherheit verbessern", "TITLE":"Improve security",
"DESC":"Erweitern Sie die Zugangsrichtlinien und erhöhen Sie dadurch die Sicherheit ihrer Benutzer." "DESC":"Extend the access policies and thereby increase the security of your users."
} }
}, },
"START":"Start", "START":"Start",