fix: login button remains after sys admin login (#975)

dasch-swiss · Mar 30, 2023 · 5034931 · 5034931
1 parent b1c2062
commit 5034931
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/apps/dsp-app/src/app/main/action/login-form/login-form.component.ts b/apps/dsp-app/src/app/main/action/login-form/login-form.component.ts
@@ -170,7 +170,7 @@ export class LoginFormComponent implements OnInit, AfterViewInit {
                         const username = this.session.user.name;
                         this._dspApiConnection.admin.usersEndpoint.getUserByUsername(username).subscribe(
                           (userResponse: ApiResponseData<UserResponse>) => {
-                              const uuid = this._projectService.iriToUuid(userResponse.body.user.projects[0].id);
+                              const uuid = this._projectService.iriToUuid(userResponse.body.user.projects[0]?.id);
                               // if user is NOT a sysAdmin and only a member of one project, redirect them to that projects dashboard
                               if(!this.session.user.sysAdmin && userResponse.body.user.projects.length === 1) {
                                   this._router.navigateByUrl('/refresh', { skipLocationChange: true }).then(

diff --git a/apps/dsp-app/src/app/user/user-menu/user-menu.component.ts b/apps/dsp-app/src/app/user/user-menu/user-menu.component.ts
@@ -62,7 +62,6 @@ export class UserMenuComponent implements OnChanges {
             this.username = this._session.getSession().user.name;
             this.sysAdmin = this._session.getSession().user.sysAdmin;
 
-            this._cache.get(this.username, this._dspApiConnection.admin.usersEndpoint.getUserByUsername(this.username));
             this._cache.get(this.username, this._dspApiConnection.admin.usersEndpoint.getUserByUsername(this.username)).subscribe(
                 (response: ApiResponseData<UserResponse>) => {
                     this.user = response.body.user;