mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[AAE-12501] move auth in ADF (#8689)
* remove unneeded JS-API dep move auth in the right place * [AAE-12501] Replace alfresco api client with AdfHttpClient * [AAE-12501] Restore get username methods * [AAE-12501] Get username with authentication service * [AAE-12501] Create a request options interface with the needed props, remove the import from js-api, return the body from request * add emitters * [AAE-12501] Replace Math.random() to fix hospot security issue, fix lint issues * [AAE-12501] Comment temporary setCsrfToken because is not possible to import app config service from core due to circular dependencies * [AAE-12501] Get disableCsrf from app config serviice when app configuration is loaded * [AAE-12501] Remove wrong character * Pass down the requestUrl for request interception bring back check from js-api fixing isLogin issues part1 some fix around emit Narrow access for methods fix sso username issue Switch to dynamic service injection add emitters move auth inside ADF * clean * fix unit test * fix lint * Fix exports * Fix process-services unit tests * Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests Fix core unit tests * Fix content-services unit tests: getEcmUsername from authentication service Fix content-services unit tests: alfresco api service has been replaced by authentication service * Fix circular dependecies issue importing AppConfigService outside the api entrypoint dir * Import AuthModule even in not only canary mode to let the e2es run * Fix authentication unit tests * Fix unit test '[ECM] should return a ticket undefined after logout' * Remove AlfrescoApiService is not used anymore * Fix unit test '[BPM] should return an BPM ticket after the login done': add Basic suffix to basicAuth * Fix unit tests core * Fix login errors with the BASIC authentication * Fix missing onLogin event * Temporary skip unit tests to check e2es * Fix login component doesn't add the authorization header * Fix prefix is undefined * Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket() * Fix C280012: set app prefix before calling content api * Revert "Fix image is not showed by the alfresco file viewer because alf_ticket is not added to the content url query params, pass ticketEcm to the alfrescoApi configuration used by alfrescoApiClient.ts getAlfTicket()" This reverts commit afbf086b98d72835aab8b15d4af433efeaac2d3b. * try to change adf core autoamtion service init * go back * grant type password login * fix * remove automatic login in reset try * fix not silent login * lint happy * fix * Update alfresco-api-v2-loader.service.ts * fixint * Revert "Temporary skip unit tests to check e2es" This reverts commit a0adc7e58a001a54442c82952761bff891caa5cd. * fix modules * fix app config stream in storing service fix app config stream for sub property * fix identity test to use the real service * fix unit * fix unit * fix unit * remove test that are probably have never been green * fix * fix PC * fix localstorage * fix * fix * fix * fix * fix storybook move e2e in content for versioning fix lint * fix * fix size * enable log * some fix for usernames * remove log * fix rebase * [AAE-12502] Restore isKerberosEnabled into authentication service * subject onLogin * fix unit * Fix lint issue * fix * Update error message * Revert change did by https://github.com/Alfresco/alfresco-ng2-components/pull/8689/commits/b79c5d37d69b2d76b33e5561eab2bf5b80c81b9e\#diff-ad85723e21276e05e577bab652c6ab0d243bd0ad54d4cc70ef6e60dc5e635c33L38 * Refresh the browser to wait for the user to click process cloud page * Remove e2e, the application list is already tested by the app-list-cloud.component.spec.ts https://github.com/Alfresco/alfresco-ng2-components/blob/dev-eromano-AAE-12501-2/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts\#L147 * [12502] Add getUsername method to the AuthenticationService * [12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type * Revert "[12501] restore mutlipart/form-data header needed by angular http-client to to fix 415 unsupported media type" This reverts commit d8c584b94f649b57859d74157ec0861f2ebddebb. * [12501] fix unsupported upload file on admin-apa, append json content type only calling alfresco api * [12501] fix unsupported upload file on admin-apa [12501] fix unsupported upload file on admin-apa * Revert "[12501] fix unsupported upload file on admin-apa" This reverts commit 53cda21d795588d87244c78c5a5347afd04ea2b1. * Improve getHeaders * Revert change * Set application/json content type if request body is not a FormData * Logout by the authenticationService * Update returned error message * Fix lint issues after rebasing * [12502] Add basic template with data-automation-ad selector to check when is attached to the Dom * Fix issues after rebase --------- Co-authored-by: Amedeo Lepore <amedeo.lepore@hyland.com> Co-authored-by: Andras Popovics <popovics@ndras.hu>
This commit is contained in:
co-authored by
Amedeo Lepore
Andras Popovics
parent
057e0bcd7c
commit
08da9ae2c3
@@ -25,7 +25,7 @@ import {
|
||||
FormModel,
|
||||
FormOutcomeEvent,
|
||||
FormOutcomeModel, FormRenderingService, FormService,
|
||||
UploadWidgetContentLinkModel, WidgetVisibilityService, provideTranslations
|
||||
UploadWidgetContentLinkModel, WidgetVisibilityService, provideTranslations, AuthModule
|
||||
} from '@alfresco/adf-core';
|
||||
import { Node } from '@alfresco/js-api';
|
||||
import { ESCAPE } from '@angular/cdk/keycodes';
|
||||
@@ -1151,6 +1151,7 @@ describe('Multilingual Form', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [
|
||||
AuthModule.forRoot({ useHash: true }),
|
||||
NoopAnimationsModule,
|
||||
TranslateModule.forRoot(),
|
||||
CoreModule.forRoot(),
|
||||
@@ -1226,6 +1227,7 @@ describe('retrieve metadata on submit', () => {
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [
|
||||
AuthModule.forRoot({ useHash: true }),
|
||||
NoopAnimationsModule,
|
||||
TranslateModule.forRoot(),
|
||||
CoreModule.forRoot(),
|
||||
|
||||
@@ -17,9 +17,7 @@
|
||||
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { JwtHelperService } from '@alfresco/adf-core';
|
||||
import { IdentityUserService } from './identity-user.service';
|
||||
import { mockToken } from '../mock/jwt-helper.service.spec';
|
||||
import { ProcessServiceCloudTestingModule } from '../../testing/process-service-cloud.testing.module';
|
||||
import {
|
||||
mockSearchUserByApp,
|
||||
@@ -52,37 +50,6 @@ describe('IdentityUserService', () => {
|
||||
requestSpy = spyOn(adfHttpClient, 'request');
|
||||
});
|
||||
|
||||
describe('Current user info (JWT token)', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
const store = {};
|
||||
|
||||
spyOn(localStorage, 'getItem').and.callFake((key: string): string => store[key] || null);
|
||||
spyOn(localStorage, 'setItem').and.callFake((key: string, value: string): string => store[key] = value);
|
||||
});
|
||||
|
||||
it('should fetch identity user info from Jwt id token', () => {
|
||||
localStorage.setItem(JwtHelperService.USER_ID_TOKEN, mockToken);
|
||||
const user = service.getCurrentUserInfo();
|
||||
expect(user).toBeDefined();
|
||||
expect(user.firstName).toEqual('John');
|
||||
expect(user.lastName).toEqual('Doe');
|
||||
expect(user.email).toEqual('johnDoe@gmail.com');
|
||||
expect(user.username).toEqual('johnDoe1');
|
||||
});
|
||||
|
||||
it('should fallback on Jwt access token for identity user info', () => {
|
||||
localStorage.setItem(JwtHelperService.USER_ACCESS_TOKEN, mockToken);
|
||||
const user = service.getCurrentUserInfo();
|
||||
expect(user).toBeDefined();
|
||||
expect(user.firstName).toEqual('John');
|
||||
expect(user.lastName).toEqual('Doe');
|
||||
expect(user.email).toEqual('johnDoe@gmail.com');
|
||||
expect(user.username).toEqual('johnDoe1');
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('Search', () => {
|
||||
|
||||
it('should fetch users', (done) => {
|
||||
|
||||
+5
-2
@@ -35,6 +35,7 @@ import { NotificationCloudService } from '../../../services/notification-cloud.s
|
||||
import { ProcessServiceCloudTestingModule } from '../../../testing/process-service-cloud.testing.module';
|
||||
import { IdentityUserService } from '../../../people/services/identity-user.service';
|
||||
import { ApolloModule } from 'apollo-angular';
|
||||
import { StorageService } from '@alfresco/adf-core';
|
||||
|
||||
describe('TaskFilterCloudService', () => {
|
||||
let service: TaskFilterCloudService;
|
||||
@@ -242,12 +243,13 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
|
||||
let preferenceCloudService: PreferenceCloudServiceInterface;
|
||||
let identityUserService: IdentityUserService;
|
||||
let getPreferencesSpy: jasmine.Spy;
|
||||
let storageService: StorageService;
|
||||
|
||||
const identityUserMock = { username: 'fakeusername', firstName: 'fake-identity-first-name', lastName: 'fake-identity-last-name', email: 'fakeIdentity@email.com' };
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [HttpClientTestingModule, ApolloModule],
|
||||
imports: [HttpClientTestingModule, ProcessServiceCloudTestingModule, ApolloModule],
|
||||
providers: [
|
||||
{ provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }
|
||||
]
|
||||
@@ -255,6 +257,7 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
|
||||
service = TestBed.inject(TaskFilterCloudService);
|
||||
preferenceCloudService = service.preferenceService;
|
||||
identityUserService = TestBed.inject(IdentityUserService);
|
||||
storageService = TestBed.inject(StorageService);
|
||||
getPreferencesSpy = spyOn(preferenceCloudService, 'getPreferences').and.returnValue(of([]));
|
||||
spyOn(identityUserService, 'getCurrentUserInfo').and.returnValue(identityUserMock);
|
||||
});
|
||||
@@ -285,7 +288,7 @@ describe('Inject [LocalPreferenceCloudService] into the TaskFilterCloudService',
|
||||
expect(res[2].status).toEqual('COMPLETED');
|
||||
expect(getPreferencesSpy).toHaveBeenCalled();
|
||||
|
||||
const localData = JSON.parse(localStorage.getItem(`task-filters-${appName}-${identityUserMock.username}`));
|
||||
const localData = JSON.parse(storageService.getItem(`task-filters-${appName}-${identityUserMock.username}`));
|
||||
expect(localData.length).toEqual(3);
|
||||
|
||||
expect(localData[0].name).toEqual('ADF_CLOUD_TASK_FILTERS.MY_TASKS');
|
||||
|
||||
@@ -25,7 +25,7 @@ import {
|
||||
AppConfigServiceMock,
|
||||
TranslationService,
|
||||
TranslationMock,
|
||||
CoreModule
|
||||
CoreModule, AuthModule
|
||||
} from '@alfresco/adf-core';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { ProcessServicesCloudModule } from '../process-services-cloud.module';
|
||||
@@ -33,6 +33,7 @@ import { RouterTestingModule } from '@angular/router/testing';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AuthModule.forRoot({ useHash: true }),
|
||||
HttpClientModule,
|
||||
NoopAnimationsModule,
|
||||
RouterTestingModule,
|
||||
|
||||
@@ -16,13 +16,14 @@
|
||||
*/
|
||||
|
||||
import { NgModule } from '@angular/core';
|
||||
import { CoreModule, provideTranslations } from '@alfresco/adf-core';
|
||||
import { AuthModule, CoreModule, provideTranslations } from '@alfresco/adf-core';
|
||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { ProcessServicesCloudModule } from '../process-services-cloud.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AuthModule.forRoot(),
|
||||
BrowserAnimationsModule,
|
||||
TranslateModule.forRoot(),
|
||||
CoreModule.forRoot(),
|
||||
|
||||
Reference in New Issue
Block a user