Fix login in Safari (#90)

* refactor: Remove console.logs * fix(authentication): Implement jwt interceptors * chore: Update knora-ui packages
dasch-swiss · Sep 27, 2019 · 6f2e474 · 6f2e474
1 parent f8bac52
commit 6f2e474
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,11 +1,11 @@
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { HttpClient, HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
 import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { KuiActionModule } from '@knora/action';
-import { KuiAuthenticationModule } from '@knora/authentication';
+import { KuiAuthenticationModule, JwtInterceptor, WithCredentialsInterceptor } from '@knora/authentication';
 import { KuiCoreConfigToken, KuiCoreModule } from '@knora/core';
 import { KuiSearchModule } from '@knora/search';
 import { KuiViewerModule } from '@knora/viewer';
@@ -179,7 +179,9 @@ export function initializeApp(appInitService: AppInitService) {
         {
             provide: KuiCoreConfigToken,
             useFactory: () => AppInitService.coreConfig
-        }
+        },
+        { provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true },
+        { provide: HTTP_INTERCEPTORS, useClass: WithCredentialsInterceptor, multi: true }
     ],
     bootstrap: [AppComponent]
 })

diff --git a/src/app/main/header/header.component.ts b/src/app/main/header/header.component.ts
@@ -43,7 +43,7 @@ export class HeaderComponent {
      * Navigate to the login page
      */
     goToLogin() {
-        console.log(decodeURI(this._router.url));
+        // console.log(decodeURI(this._router.url));
         this._router.navigate(['login'], {
             queryParams: {
                 returnUrl: decodeURI(this._router.url)

diff --git a/src/app/project/list/list-info-form/list-info-form.component.ts b/src/app/project/list/list-info-form/list-info-form.component.ts
@@ -215,7 +215,7 @@ export class ListInfoFormComponent implements OnInit {
                     // console.log(result);
                     // this.closeDialog.emit(result);
                     this.newList = result;
-                    console.log(this.newList)
+
                     this.updateParent.emit(result.listinfo.labels[0].value + ' (' + result.listinfo.labels[0].language + ')');
                     this.loading = false;
                     // setTimeout(() => {