frontend/src/app/services/auth.service.ts

@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {LoginService} from '@api';
-import {BehaviorSubject, from, Observable, of, switchMap, throwError} from 'rxjs';
+import {BehaviorSubject, Observable, throwError} from 'rxjs';
 import {catchError, tap} from 'rxjs/operators';
 import {MatSnackBar} from '@angular/material/snack-bar';
 import {JwtHelperService} from '@auth0/angular-jwt';
@@ -25,34 +25,16 @@ export class AuthService {
     this.checkAuthStatus();
   }
 
-  private isBlob(value: any): boolean {
-    return value instanceof Blob;
-  }
-
-  private getAsBlob(value: any): Blob {
-    return value as Blob;
-  }
-
   /**
    * Attempt to login with the provided code
    */
   public login(code: string): Observable<any> {
     return this.loginService.login(code).pipe(
-      switchMap(response => {
+      tap(jwt => {
-        if (this.isBlob(response)) {
+        console.log(jwt);
-          return from(this.getAsBlob(response).text()).pipe(
+        console.log(atob(jwt));
-            tap(jwtText => {
+        this.saveJwt(atob(jwt)); //Decode jwt from base64
-              console.log('JWT from Blob:', jwtText);
+        this.isAuthenticatedSubject.next(true);
-              this.saveJwt(jwtText);
-              this.isAuthenticatedSubject.next(true);
-            })
-          );
-        } else {
-          console.log('JWT as string:', response);
-          this.saveJwt(atob(response));
-          this.isAuthenticatedSubject.next(true);
-          return of(response);
-        }
       }),
       catchError(error => {
         this.snackBar.open('Login failed', '', {duration: 2000});

open_api/src/main/resources/schemas/login/login.yml

@@ -11,7 +11,7 @@ UserLogin:
       '200':
         description: Logged in
         content:
-          text/plain:
+          application/text:
             schema:
               type: string
               description: A JWT token for this user