bug: fixed router navigating to homepage on page loads

gotify · Nov 5, 2024 · 2e1f27d · 2e1f27d
1 parent 3f29ded
commit 2e1f27d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ui/src/CurrentUser.ts b/ui/src/CurrentUser.ts
@@ -99,7 +99,9 @@ export class CurrentUser {
     };
 
     public tryAuthenticate = async (): Promise<AxiosResponse<IUser>> => {
+        this.authenticating = true;
         if (this.token() === '') {
+            this.authenticating = false;
             return Promise.reject();
         }
 
@@ -111,11 +113,13 @@ export class CurrentUser {
                 .then((passThrough) => {
                     this.user = passThrough.data;
                     this.loggedIn = true;
+                    this.authenticating = false;
                     this.connectionErrorMessage = null;
                     this.reconnectTime = 7500;
                     return passThrough;
                 })
                 .catch((error: AxiosError) => {
+                    this.authenticating = false;
                     if (!error || !error.response) {
                         this.connectionError('No network connection or server unavailable.');
                         return Promise.reject(error);

diff --git a/ui/src/tests/user.test.ts b/ui/src/tests/user.test.ts
@@ -24,8 +24,8 @@ const $dialog = selector.form('#add-edit-user-dialog');
 
 describe('User', () => {
     it('does login', async () => await auth.login(page));
-    it('navigates to users', async () => {
-        await page.click('#navigate-users');
+    it('navigates to users through window location', async () => {
+        await page.goto(gotify.url + '/#/users');
         await waitForExists(page, selector.heading(), 'Users');
     });
     it('has changed url', async () => {