Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[link-adf:dev-eromano-AAE-12501-2][affected:*][ci:force] #3401

Closed
wants to merge 7 commits into from
5 changes: 3 additions & 2 deletions app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';

import { TRANSLATION_PROVIDER, AppConfigService, DebugAppConfigService, CoreModule, AuthGuard } from '@alfresco/adf-core';
import { TRANSLATION_PROVIDER, AppConfigService, DebugAppConfigService, CoreModule, AuthGuard, AuthModule } from '@alfresco/adf-core';
import { AppService } from '@alfresco/aca-shared';

import { AppExtensionsModule } from './extensions.module';
Expand Down Expand Up @@ -102,7 +102,8 @@ registerLocaleData(localeSv);
ShellModule.withRoutes({
shellChildren: [CONTENT_LAYOUT_ROUTES]
}),
ContentServiceExtensionModule
ContentServiceExtensionModule,
AuthModule.forRoot({ useHash: true })
],
providers: [
{ provide: AppService, useClass: AppService },
Expand Down
3 changes: 2 additions & 1 deletion e2e/playwright/authentication/exclude.tests.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"C213097" : "https://alfresco.atlassian.net/browse/ACS-5479"
"C213097" : "https://alfresco.atlassian.net/browse/ACS-5479",
"C286473": "https://alfresco.atlassian.net/browse/ACS-5996"
}
52 changes: 26 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "6.3.0-6123510771",
"@alfresco/adf-core": "6.3.0-6123510771",
"@alfresco/adf-extensions": "6.3.0-6123510771",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-6123510771",
"@alfresco/adf-content-services": "6.3.0-6122593902",
"@alfresco/adf-core": "6.3.0-6122593902",
"@alfresco/adf-extensions": "6.3.0-6122593902",
"@alfresco/eslint-plugin-eslint-angular": "6.3.0-6122593902",
"@alfresco/js-api": "6.3.0-1280",
"@angular/animations": "14.1.3",
"@angular/cdk": "14.1.3",
Expand Down Expand Up @@ -69,8 +69,8 @@
"zone.js": "0.11.8"
},
"devDependencies": {
"@alfresco/adf-cli": "6.3.0-6123510771",
"@alfresco/adf-testing": "6.3.0-6123510771",
"@alfresco/adf-cli": "6.3.0-6122593902",
"@alfresco/adf-testing": "6.3.0-6122593902",
"@angular-devkit/build-angular": "14.2.11",
"@angular-devkit/core": "14.1.2",
"@angular-devkit/schematics": "14.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@

import { TestBed } from '@angular/core/testing';
import { AosEditOnlineService } from './aos-extension.service';
import { AppConfigService, AuthenticationService, LogService, NotificationService } from '@alfresco/adf-core';
import { AppConfigService, AuthenticationService, LogService, NotificationService, RedirectAuthService } from '@alfresco/adf-core';
import { LibTestingModule } from '@alfresco/aca-shared';
import { MatSnackBarModule } from '@angular/material/snack-bar';
import { EMPTY } from 'rxjs';

describe('AosEditOnlineService', () => {
let aosEditOnlineService: AosEditOnlineService;
Expand All @@ -38,7 +39,10 @@ describe('AosEditOnlineService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [LibTestingModule, MatSnackBarModule],
providers: [{ provide: LogService, useValue: { error() {} } }]
providers: [
{ provide: LogService, useValue: { error() {} } },
{ provide: RedirectAuthService, useValue: { onLogin: EMPTY } }
]
});

aosEditOnlineService = TestBed.inject(AosEditOnlineService);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 { CoreModule, UserPreferencesService } from '@alfresco/adf-core';
import { AuthenticationService, CoreModule, UserPreferencesService } from '@alfresco/adf-core';
import { ContextMenuService } from './context-menu.service';
import { TranslateModule } from '@ngx-translate/core';
import { ContextMenuComponent } from './context-menu.component';
Expand All @@ -52,7 +52,12 @@ describe('ContextMenuService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [TranslateModule.forRoot(), CoreModule.forRoot(), ContextMenuComponent],
providers: [Overlay, { provide: Store, useValue: { select: () => of() } }, UserPreferencesService]
providers: [
Overlay,
{ provide: Store, useValue: { select: () => of() } },
{ provide: AuthenticationService, useValue: { getToken: () => 'fake token' } },
UserPreferencesService
]
});

injector = TestBed.inject(Injector);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { Store, StoreModule } from '@ngrx/store';
import { Component, Injectable } from '@angular/core';
import { DiscoveryApiService, DocumentListComponent } from '@alfresco/adf-content-services';
import { MockStore, provideMockStore } from '@ngrx/store/testing';
import { MaterialModule, PipeModule } from '@alfresco/adf-core';
import { AuthenticationService, MaterialModule, PipeModule } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http';
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing';
Expand Down Expand Up @@ -151,6 +151,7 @@ describe('PageComponent', () => {
)
}
},
{ provide: AuthenticationService, useValue: { getToken: () => 'fake token' } },
AppExtensionService
]
});
Expand Down Expand Up @@ -315,6 +316,7 @@ describe('Info Drawer state', () => {
)
}
},
{ provide: AuthenticationService, useValue: { getToken: () => 'fake token' } },
provideMockStore({
initialState: { app: appState }
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
ExtensionConfig,
NavBarGroupRef
} from '@alfresco/adf-extensions';
import { AppConfigService, LogService } from '@alfresco/adf-core';
import { AppConfigService, AuthenticationService, LogService } from '@alfresco/adf-core';
import { provideMockStore } from '@ngrx/store/testing';
import { hasQuickShareEnabled } from '@alfresco/aca-shared/rules';
import { MatIconRegistry } from '@angular/material/icon';
Expand All @@ -56,7 +56,7 @@ describe('AppExtensionService', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [LibTestingModule],
providers: [provideMockStore({ initialState })]
providers: [{ provide: AuthenticationService, useValue: { getToken: () => 'fake token' } }, provideMockStore({ initialState })]
});

iconRegistry = TestBed.inject(MatIconRegistry);
Expand Down