IOT-43: Login using KOMBIT adgangsstyring

Author: VirtualSatai

src/app/applications/applications.module.ts

@@ -15,7 +15,6 @@ import { IotDevicesModule } from './iot-devices/iot-devices.module';
 import { SharedModule } from '@shared/shared.module';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { DirectivesModule } from '@shared/directives/directives.module';
-import { HttpClientModule } from '@angular/common/http';
 import { NGMaterialModule } from '@shared/Modules/materiale.module';
 import { BulkImportComponent } from './bulk-import/bulk-import.component';
 import { DeleteDialogComponent } from '@shared/components/delete-dialog/delete-dialog.component';
@@ -44,7 +43,6 @@ import { DeleteDialogComponent } from '@shared/components/delete-dialog/delete-d
         IotDevicesModule,
         DatatargetModule,
         DirectivesModule,
-        HttpClientModule,
         FormModule,
         SharedModule,
         FontAwesomeModule,

src/app/auth/auth.component.html

@@ -25,5 +25,6 @@
                 <button class="btn btn-primary" type="submit" [disabled]="!authForm.valid">{{'Login'}}</button>
             </div>
         </form>
+        <a class="btn btn-secondary mt-4" href="{{getKombitLoginUrl()}}">{{'AUTH.KOMBIT-BUTTON' | translate}}</a>
     </div>
 </div>

src/app/auth/auth.component.ts

@@ -3,6 +3,7 @@ import { NgForm } from '@angular/forms';
 import { AuthService } from './auth.service';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { environment } from '@environments/environment';
 
 @Component({
   selector: 'app-auth',
@@ -21,9 +22,15 @@ export class AuthComponent implements OnInit {
   constructor(
     private authService: AuthService,
     private router: Router,
-    public translate: TranslateService,) { }
+    public translate: TranslateService
+  ) {}
 
-  ngOnInit(): void { }
+  ngOnInit(): void {}
+
+  getKombitLoginUrl() {
+    const frontpage = encodeURI(window.location.origin + '/dashboard');
+    return `${environment.baseUrl}auth/kombit/login?redirect=${frontpage}`;
+  }
 
   onSwitchMode() {
     this.isLoginMode = !this.isLoginMode;

src/app/auth/auth.service.ts

@@ -49,7 +49,7 @@ export class AuthService {
     return this.restService.get('auth/me');
   }
 
-  private setSession(jwt: string) {
+  setSession(jwt: string) {
     localStorage.setItem('id_token', jwt);
   }
 

src/app/dashboard/dashboard.component.ts

@@ -1,15 +1,27 @@
 import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { AuthService } from '@auth/auth.service';
 
 @Component({
   selector: 'app-dashboard',
   templateUrl: './dashboard.component.html',
-  styleUrls: ['./dashboard.component.scss']
+  styleUrls: ['./dashboard.component.scss'],
 })
 export class DashboardComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit(): void {
+  constructor(
+    private route: ActivatedRoute,
+    private authService: AuthService,
+    private router: Router
+  ) {
+    this.route.queryParams.subscribe((params) => {
+      const jwt = params['jwt'];
+      if (jwt) {
+        this.authService.setSession(jwt);
+        // Clear the URL from the parameter
+        this.router.navigate(['/dashboard']);
+      }
+    });
   }
 
+  ngOnInit(): void {}
 }

src/app/shared/helpers/auth-jwt.interceptor.ts

@@ -4,11 +4,9 @@ import {
     HttpRequest,
     HttpHandler,
     HttpInterceptor,
-    HttpErrorResponse,
 } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { retry, catchError } from 'rxjs/operators';
-import { environment } from '../../../environments/environment.prod';
+import { Observable } from 'rxjs';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class AuthJwtInterceptor implements HttpInterceptor {
@@ -18,6 +16,7 @@ export class AuthJwtInterceptor implements HttpInterceptor {
     ): Observable<HttpEvent<any>> {
         // If we're not calling the baseurl skip this. Is there a better way?
         if (req.url.indexOf(environment.baseUrl) != 0) {
+            console.warn("Skip adding Bearer since we're not calling baseUrl ...");
             return next.handle(req);
         }
 

src/assets/i18n/da.json

@@ -639,7 +639,8 @@
   },
   "AUTH": {
     "EMAIL": "Email",
-    "PASSWORD": "Adgangskode"
+    "PASSWORD": "Adgangskode",
+    "KOMBIT-BUTTON": "Login med KOMBIT Adgangsstyring"
   },
   "DASHBOARD": {
     "WELCOME": "Velkommen til OS2IoT",