Information page change

cname87 · Nov 17, 2019 · bdab25f · bdab25f
1 parent 765c69e
commit bdab25f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 55 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -248,7 +248,25 @@
         "focus": true,
         "panel": "dedicated"
       },
-      "problemMatcher": []
+      "problemMatcher": [
+        {
+          "pattern": [
+            {
+              "regexp": ".",
+              "file": 1,
+              "location": 2,
+              "message": 3
+            }
+          ],
+          "background": {
+            "activeOnStart": true,
+            "beginsPattern": {
+              "regexp": "(.*?)"
+            },
+            "endsPattern": "Connected to"
+          }
+        }
+      ]
     },
     {
       "label": "Check Server",

diff --git a/frontend/src/app/components/information/information.component.ts b/frontend/src/app/components/information/information.component.ts
@@ -50,12 +50,15 @@ export class InformationComponent implements OnInit {
 
       /* set up log in only if a mode query parameter of 'login' is passed in */
     } else if (this.mode === 'login') {
-      this.header = this.auth.isLoggedIn ? 'Log Out' : 'Log In';
-      this.hint = this.auth.isLoggedIn
-        ? 'Click on the log out button above (or click on a link above)'
-        : 'Click on the Log In button above';
-      this.isGoBackVisible = false;
-
+      this.auth.isAuthenticated$.subscribe({
+        next: (loggedIn) => {
+          this.header = loggedIn ? 'Log Out' : 'Log In';
+          this.hint = loggedIn
+            ? 'Click on the log out button above (or click on a link above)'
+            : 'Click on the Log In button above';
+          this.isGoBackVisible = false;
+        },
+      });
       /* else set up the page not found */
     } else {
       this.header = 'Page Not Found';

diff --git a/frontend/src/app/router/guards/login.guard.ts b/frontend/src/app/router/guards/login.guard.ts
diff --git a/frontend/src/app/shared/auth.service/auth.service.ts b/frontend/src/app/shared/auth.service/auth.service.ts
@@ -85,7 +85,7 @@ export class AuthService {
   );
 
   /**
-   * Calls the Auth0 client instance to check whether the user has logged in and been authenticated.  Sets isLoggedIn to the result.
+   * Calls the Auth0 client instance to check whether the user has logged in and been authenticated.  Emits true if authenticated and false if not and sets isLoggedIn to the result.
    * Note: Called by AuthGuard to check status, i.e. when the login expires AuthGuard will direct to the login page.
    */
   public isAuthenticated$ = this.auth0Client$.pipe(