From f01921371cf9c699ec5f167dccfb20ab7dc0a818 Mon Sep 17 00:00:00 2001 From: Max Peintner Date: Wed, 17 Feb 2021 08:36:27 +0100 Subject: [PATCH] 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> --- console/src/app/guards/auth.guard.ts | 4 +--- console/src/assets/i18n/en.json | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/console/src/app/guards/auth.guard.ts b/console/src/app/guards/auth.guard.ts index a96376f742..02d02ddf18 100644 --- a/console/src/app/guards/auth.guard.ts +++ b/console/src/app/guards/auth.guard.ts @@ -17,9 +17,7 @@ export class AuthGuard implements CanActivate { state: RouterStateSnapshot, ): Observable | Promise | Promise | boolean { if (!this.auth.authenticated) { - return this.auth.authenticate().then(() => { - return this.authService.GetActiveOrg(); - }); + return this.auth.authenticate(); } return this.auth.authenticated; } diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index 2e3d2765b6..577b46fe2b 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -9,16 +9,16 @@ "STEPS_TITLE":"Complete the following steps in the order you want:", "STEPS": { "1": { - "TITLE":"Projekt erstellen", - "DESC":"Erstellen Sie Ihr erstes Projekt und legen Sie Zugangsberechtigungen eventueller Mitarbeiter fest." + "TITLE":"Create a project", + "DESC":"Create your first project and define access rights for any employees." }, "2": { - "TITLE":"Applikation erstellen", - "DESC":"Erstellen Sie eine Applikation innerhalb Ihres Projektes und legen Sie dessen Eigenschaften fest." + "TITLE":"Create Application", + "DESC":"Create an application within your project and define its properties." }, "3": { - "TITLE":"Sicherheit verbessern", - "DESC":"Erweitern Sie die Zugangsrichtlinien und erhöhen Sie dadurch die Sicherheit ihrer Benutzer." + "TITLE":"Improve security", + "DESC":"Extend the access policies and thereby increase the security of your users." } }, "START":"Start",