Improved solutio for token with no need to set it explicitly

Alfresco · Oct 15, 2024 · 57eb75d · 57eb75d
1 parent 24b4006
commit 57eb75d
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 53 deletions.
diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts
@@ -25,7 +25,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { AuthGuard, AuthModule, CoreModule, JWT_STORAGE_SERVICE, StorageService, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
+import { AuthGuard, AuthModule, CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core';
 import { AppService } from '@alfresco/aca-shared';
 
 import { AppExtensionsModule } from './extensions.module';
@@ -111,8 +111,7 @@ registerLocaleData(localeSv);
         name: 'app',
         source: 'assets'
       }
-    },
-    { provide: JWT_STORAGE_SERVICE, useClass: StorageService }
+    }
   ],
   declarations: [AppComponent],
   bootstrap: [AppComponent]

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,11 +30,11 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "7.0.0-alpha.4-11336342104",
-    "@alfresco/adf-core": "7.0.0-alpha.4-11336342104",
-    "@alfresco/adf-extensions": "7.0.0-alpha.4-11336342104",
-    "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.4-11336342104",
-    "@alfresco/js-api": ">=8.0.0-alpha.4-11336342104",
+    "@alfresco/adf-content-services": "7.0.0-alpha.4-11348846149",
+    "@alfresco/adf-core": "7.0.0-alpha.4-11348846149",
+    "@alfresco/adf-extensions": "7.0.0-alpha.4-11348846149",
+    "@alfresco/eslint-plugin-eslint-angular": "7.0.0-alpha.4-11348846149",
+    "@alfresco/js-api": ">=8.0.0-alpha.4-11348846149",
     "@angular/animations": "16.2.9",
     "@angular/cdk": "16.2.9",
     "@angular/common": "16.2.9",
@@ -62,7 +62,7 @@
     "zone.js": "0.13.3"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "7.0.0-alpha.4-11336342104",
+    "@alfresco/adf-cli": "7.0.0-alpha.4-11348846149",
     "@angular-devkit/build-angular": "16.2.9",
     "@angular-devkit/core": "16.2.9",
     "@angular-devkit/schematics": "16.2.9",

diff --git a/projects/aca-content/src/lib/components/context-menu/context-menu.service.spec.ts b/projects/aca-content/src/lib/components/context-menu/context-menu.service.spec.ts
@@ -27,7 +27,7 @@ import { Overlay } from '@angular/cdk/overlay';
 import { Injector } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { of } from 'rxjs';
-import { AuthModule, CoreModule, JWT_STORAGE_SERVICE, StorageService, UserPreferencesService } from '@alfresco/adf-core';
+import { AuthModule, CoreModule, UserPreferencesService } from '@alfresco/adf-core';
 import { ContextMenuService } from './context-menu.service';
 import { TranslateModule } from '@ngx-translate/core';
 import { ContextMenuComponent } from './context-menu.component';
@@ -52,12 +52,7 @@ describe('ContextMenuService', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), CoreModule.forRoot(), ContextMenuComponent, AuthModule.forRoot()],
-      providers: [
-        Overlay,
-        { provide: Store, useValue: { select: () => of() } },
-        UserPreferencesService,
-        { provide: JWT_STORAGE_SERVICE, useClass: StorageService }
-      ]
+      providers: [Overlay, { provide: Store, useValue: { select: () => of() } }, UserPreferencesService]
     });
 
     injector = TestBed.inject(Injector);

diff --git a/...onents/dl-custom-components/datatable-cell-badges/datatable-cell-badges.component.spec.ts b/...onents/dl-custom-components/datatable-cell-badges/datatable-cell-badges.component.spec.ts
@@ -26,7 +26,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { DatatableCellBadgesComponent } from './datatable-cell-badges.component';
 import { AppExtensionService } from '@alfresco/aca-shared';
 import { TranslateModule } from '@ngx-translate/core';
-import { AuthModule, JWT_STORAGE_SERVICE, StorageService } from '@alfresco/adf-core';
+import { AuthModule } from '@alfresco/adf-core';
 import { Actions } from '@ngrx/effects';
 import { NodeEntry } from '@alfresco/js-api';
 import { of } from 'rxjs';
@@ -76,7 +76,7 @@ describe('DatatableCellBadgesComponent', () => {
           }
         )
       ],
-      providers: [Actions, { provide: JWT_STORAGE_SERVICE, useClass: StorageService }]
+      providers: [Actions]
     });
 
     fixture = TestBed.createComponent(DatatableCellBadgesComponent);

diff --git a/...content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts b/...content/src/lib/components/dl-custom-components/name-column/name-column.component.spec.ts
@@ -29,7 +29,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { HttpClientModule } from '@angular/common/http';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { AuthModule, JWT_STORAGE_SERVICE, StorageService } from '@alfresco/adf-core';
+import { AuthModule } from '@alfresco/adf-core';
 import { Component, Input } from '@angular/core';
 import { NodeEntry } from '@alfresco/js-api';
 
@@ -70,7 +70,7 @@ describe('CustomNameColumnComponent', () => {
           }
         )
       ],
-      providers: [Actions, { provide: JWT_STORAGE_SERVICE, useClass: StorageService }]
+      providers: [Actions]
     });
 
     fixture = TestBed.createComponent(CustomNameColumnComponent);

diff --git a/projects/aca-shared/src/lib/testing/lib-testing-module.ts b/projects/aca-shared/src/lib/testing/lib-testing-module.ts
@@ -25,7 +25,7 @@
 import { Injectable, NgModule } from '@angular/core';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { JWT_STORAGE_SERVICE, StorageService, TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
+import { TranslateLoaderService, TranslationMock, TranslationService } from '@alfresco/adf-core';
 import { AlfrescoApiService, AlfrescoApiServiceMock } from '@alfresco/adf-content-services';
 import { HttpClientModule } from '@angular/common/http';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -122,8 +122,7 @@ export class DocumentBasePageServiceMock extends DocumentBasePageService {
   exports: [TranslateModule],
   providers: [
     { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
-    { provide: TranslationService, useClass: TranslationMock },
-    { provide: JWT_STORAGE_SERVICE, useClass: StorageService }
+    { provide: TranslationService, useClass: TranslationMock }
   ]
 })
 export class LibTestingModule {}