Merge branch 'rrt/dev' into rrt/testing

2020-06-02 00:24:16 -04:00 · 2020-06-02 00:24:16 -04:00 · 58db2737bd
parent f4c6852cf9 bedfe79b89
commit 58db2737bd
1 changed files with 5 additions and 1 deletions
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@ -39,7 +39,11 @@ export class NavbarComponent {
    if (isSignedIn()) {
      this.api.getUser().subscribe(u => {
        this.user = u;
-        this.googleAnalyticsService.setUser(this.user.uid);
+
+        if (this.user && this.user.uid) {
+          this.googleAnalyticsService.setUser(this.user.uid);
+        }
+
        this._loadNavLinks();
      }, error => {
        localStorage.removeItem('token');