mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
[ADF-5366] initialize discovery and version compatibility service for oauth based session (#6864)
* [ADF-5366] initialize discovery and version compatibility service for oauth based session * better error message * * fix spaces * * revert the search service * * fix build * * check properties after type update * * check properties after type update * * check properties after type update * * fix infinite loop * * fix test without title * * wait for options * * wait for session * Update metadata-content-type.e2e.ts * Update metadata-content-type.e2e.ts * Update protractor.excludes.json * Update protractor.excludes.json
This commit is contained in:
Dharan
GitHub
@@ -17,64 +17,64 @@
|
||||
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
|
||||
import { AppConfigService } from '../app-config/app-config.service';
|
||||
import { DiscoveryApiService } from './discovery-api.service';
|
||||
import { AlfrescoApiService } from './alfresco-api.service';
|
||||
import { AuthenticationService } from './authentication.service';
|
||||
import { setupTestBed } from '../testing/setup-test-bed';
|
||||
import { CoreTestingModule } from '../testing/core.testing.module';
|
||||
import { SystemPropertiesRepresentation } from '@alfresco/js-api';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
|
||||
declare let jasmine: any;
|
||||
import { of, throwError } from 'rxjs';
|
||||
|
||||
const fakeEcmDiscoveryResponse: any = {
|
||||
'entry': {
|
||||
'repository': {
|
||||
'edition': 'FAKE',
|
||||
'version': {
|
||||
'major': '5',
|
||||
'minor': '2',
|
||||
'patch': '0',
|
||||
'hotfix': '0',
|
||||
'schema': 999999,
|
||||
'label': 'r134899-b26',
|
||||
'display': '5.2.0.0 (r134899-b26) schema 10005'
|
||||
entry: {
|
||||
repository: {
|
||||
edition: 'FAKE',
|
||||
version: {
|
||||
major: '5',
|
||||
minor: '2',
|
||||
patch: '0',
|
||||
hotfix: '0',
|
||||
schema: 999999,
|
||||
label: 'r134899-b26',
|
||||
display: '5.2.0.0 (r134899-b26) schema 10005'
|
||||
},
|
||||
'license': {
|
||||
'issuedAt': '2017-06-22T10:56:45.796+0000',
|
||||
'expiresAt': '2017-07-22T00:00:00.000+0000',
|
||||
'remainingDays': 4,
|
||||
'holder': 'Trial User',
|
||||
'mode': 'ENTERPRISE',
|
||||
'entitlements': {
|
||||
'isClusterEnabled': false,
|
||||
'isCryptodocEnabled': false
|
||||
license: {
|
||||
issuedAt: '2017-06-22T10:56:45.796+0000',
|
||||
expiresAt: '2017-07-22T00:00:00.000+0000',
|
||||
remainingDays: 4,
|
||||
holder: 'Trial User',
|
||||
mode: 'ENTERPRISE',
|
||||
entitlements: {
|
||||
isClusterEnabled: false,
|
||||
isCryptodocEnabled: false
|
||||
}
|
||||
},
|
||||
'status': {
|
||||
'isReadOnly': false,
|
||||
'isAuditEnabled': true,
|
||||
'isQuickShareEnabled': true,
|
||||
'isThumbnailGenerationEnabled': true
|
||||
status: {
|
||||
isReadOnly: false,
|
||||
isAuditEnabled: true,
|
||||
isQuickShareEnabled: true,
|
||||
isThumbnailGenerationEnabled: true
|
||||
},
|
||||
'modules': [
|
||||
modules: [
|
||||
{
|
||||
'id': 'alfresco-fake-services',
|
||||
'title': 'Alfresco Share Services AMP',
|
||||
'description': 'Module to be applied to alfresco.war, containing APIs for Alfresco Share',
|
||||
'version': '5.2.0',
|
||||
'installDate': '2017-03-07T08:48:14.161+0000',
|
||||
'installState': 'INSTALLED',
|
||||
'versionMin': '5.1',
|
||||
'versionMax': '999'
|
||||
id: 'alfresco-fake-services',
|
||||
title: 'Alfresco Share Services AMP',
|
||||
description: 'Module to be applied to alfresco.war, containing APIs for Alfresco Share',
|
||||
version: '5.2.0',
|
||||
installDate: '2017-03-07T08:48:14.161+0000',
|
||||
installState: 'INSTALLED',
|
||||
versionMin: '5.1',
|
||||
versionMax: '999'
|
||||
},
|
||||
{
|
||||
'id': 'alfresco-trashcan-fake',
|
||||
'title': 'alfresco-trashcan-cleaner project',
|
||||
'description': 'The Alfresco Trash Can Cleaner (Alfresco Module)',
|
||||
'version': '2.2',
|
||||
'installState': 'UNKNOWN',
|
||||
'versionMin': '0',
|
||||
'versionMax': '999'
|
||||
id: 'alfresco-trashcan-fake',
|
||||
title: 'alfresco-trashcan-cleaner project',
|
||||
description: 'The Alfresco Trash Can Cleaner (Alfresco Module)',
|
||||
version: '2.2',
|
||||
installState: 'UNKNOWN',
|
||||
versionMin: '0',
|
||||
versionMax: '999'
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -82,149 +82,177 @@ const fakeEcmDiscoveryResponse: any = {
|
||||
};
|
||||
|
||||
const fakeBPMDiscoveryResponse: any = {
|
||||
'revisionVersion': '2',
|
||||
'edition': 'SUPER FAKE EDITION',
|
||||
'type': 'bpmSuite',
|
||||
'majorVersion': '1',
|
||||
'minorVersion': '6'
|
||||
};
|
||||
revisionVersion: '2',
|
||||
edition: 'SUPER FAKE EDITION',
|
||||
type: 'bpmSuite',
|
||||
majorVersion: '1',
|
||||
minorVersion: '6'
|
||||
};
|
||||
|
||||
const fakeBPMDiscoverySystemPropertyResponse: any = {
|
||||
'allowInvolveByEmail': true,
|
||||
'disableJavaScriptEventsInFormEditor': false,
|
||||
'logoutDisabled': false,
|
||||
'authConfiguration': {
|
||||
'authUrl': 'fakeAuthUrl',
|
||||
'realm': 'fakeRealm',
|
||||
'clientId': 'fakeClient',
|
||||
'useBrowserLogout': true
|
||||
allowInvolveByEmail: true,
|
||||
disableJavaScriptEventsInFormEditor: false,
|
||||
logoutDisabled: false,
|
||||
authConfiguration: {
|
||||
authUrl: 'fakeAuthUrl',
|
||||
realm: 'fakeRealm',
|
||||
clientId: 'fakeClient',
|
||||
useBrowserLogout: true
|
||||
}
|
||||
};
|
||||
|
||||
describe('Discovery Api Service', () => {
|
||||
|
||||
let service: DiscoveryApiService;
|
||||
let apiService: AlfrescoApiService;
|
||||
let authenticationService: AuthenticationService;
|
||||
|
||||
setupTestBed({
|
||||
imports: [
|
||||
TranslateModule.forRoot(),
|
||||
CoreTestingModule
|
||||
]
|
||||
});
|
||||
describe('Basic auth', () => {
|
||||
setupTestBed({
|
||||
imports: [TranslateModule.forRoot(), CoreTestingModule]
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
const appConfig: AppConfigService = TestBed.inject(AppConfigService);
|
||||
appConfig.config = {
|
||||
ecmHost: 'http://localhost:9876/ecm'
|
||||
};
|
||||
service = TestBed.inject(DiscoveryApiService);
|
||||
jasmine.Ajax.install();
|
||||
});
|
||||
beforeEach(() => {
|
||||
service = TestBed.inject(DiscoveryApiService);
|
||||
apiService = TestBed.inject(AlfrescoApiService);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
jasmine.Ajax.uninstall();
|
||||
});
|
||||
describe('For ECM', () => {
|
||||
it('Should retrieve the info about the product for ECM', done => {
|
||||
spyOn(apiService.getInstance().discovery.discoveryApi, 'getRepositoryInformation')
|
||||
.and.returnValue(of(fakeEcmDiscoveryResponse));
|
||||
|
||||
describe('For ECM', () => {
|
||||
it('Should retrieve the info about the product for ECM', (done) => {
|
||||
service.getEcmProductInfo().subscribe((data: EcmProductVersionModel) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.edition).toBe('FAKE');
|
||||
expect(data.version.schema).toBe(999999);
|
||||
expect(data.license.isClusterEnabled).toBeFalsy();
|
||||
expect(data.status.isQuickShareEnabled).toBeTruthy();
|
||||
expect(data.modules.length).toBe(2);
|
||||
expect(data.modules[0].id).toBe('alfresco-fake-services');
|
||||
expect(data.modules[1].id).toBe('alfresco-trashcan-fake');
|
||||
done();
|
||||
service.getEcmProductInfo()
|
||||
.subscribe((data: EcmProductVersionModel) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.edition).toBe('FAKE');
|
||||
expect(data.version.schema).toBe(999999);
|
||||
expect(data.license.isClusterEnabled).toBeFalsy();
|
||||
expect(data.status.isQuickShareEnabled).toBeTruthy();
|
||||
expect(data.modules.length).toBe(2);
|
||||
expect(data.modules[0].id).toBe('alfresco-fake-services');
|
||||
expect(data.modules[1].id).toBe('alfresco-trashcan-fake');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 200,
|
||||
contentType: 'json',
|
||||
responseText: fakeEcmDiscoveryResponse
|
||||
it('getEcmProductInfo catch errors call', done => {
|
||||
spyOn(apiService.getInstance().discovery.discoveryApi, 'getRepositoryInformation')
|
||||
.and.returnValue(throwError({ status: 403 }));
|
||||
|
||||
service.getEcmProductInfo().subscribe(
|
||||
() => {},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
it('getEcmProductInfo catch errors call', (done) => {
|
||||
service.getEcmProductInfo().subscribe(
|
||||
() => {
|
||||
},
|
||||
() => {
|
||||
describe('For BPM', () => {
|
||||
it('Should retrieve the info about the product for BPM', done => {
|
||||
spyOn(apiService.getInstance().activiti.aboutApi, 'getAppVersion')
|
||||
.and.returnValue(of(fakeBPMDiscoveryResponse));
|
||||
|
||||
service.getBpmProductInfo().subscribe((data: BpmProductVersionModel) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.edition).toBe('SUPER FAKE EDITION');
|
||||
expect(data.revisionVersion).toBe('2');
|
||||
expect(data.type).toBe('bpmSuite');
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('getBpmProductInfo catch errors call', done => {
|
||||
spyOn(apiService.getInstance().activiti.aboutApi, 'getAppVersion')
|
||||
.and.returnValue(throwError({ status: 403 }));
|
||||
|
||||
service.getBpmProductInfo().subscribe(
|
||||
() => {},
|
||||
() => {
|
||||
done();
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
it('Should retrieve the system properties for BPM', done => {
|
||||
spyOn(apiService.getInstance().activiti.systemPropertiesApi, 'getProperties')
|
||||
.and.returnValue(of(fakeBPMDiscoverySystemPropertyResponse));
|
||||
|
||||
service.getBPMSystemProperties().subscribe((data: SystemPropertiesRepresentation) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.allowInvolveByEmail).toBe(true);
|
||||
expect(data.disableJavaScriptEventsInFormEditor).toBe(false);
|
||||
expect(data.logoutDisabled).toBe(false);
|
||||
expect(data.authConfiguration.authUrl).toBe('fakeAuthUrl');
|
||||
expect(data.authConfiguration.realm).toBe('fakeRealm');
|
||||
expect(data.authConfiguration.clientId).toBe('fakeClient');
|
||||
expect(data.authConfiguration.useBrowserLogout).toBe(true);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('Should retrieve the system properties for BPM', done => {
|
||||
spyOn(
|
||||
apiService.getInstance().activiti.systemPropertiesApi,
|
||||
'getProperties'
|
||||
).and.returnValue(
|
||||
throwError({
|
||||
error: {
|
||||
response: {
|
||||
statusCode: 404,
|
||||
statusText: 'Not Found'
|
||||
}
|
||||
}
|
||||
})
|
||||
);
|
||||
|
||||
service.getBPMSystemProperties().subscribe(
|
||||
() => {
|
||||
fail('expected an error, bpm not running');
|
||||
},
|
||||
error => {
|
||||
expect(error.response.statusCode).toEqual(404);
|
||||
expect(error.response.statusText).toEqual('Not Found');
|
||||
done();
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('Oauth', () => {
|
||||
setupTestBed({
|
||||
imports: [
|
||||
TranslateModule.forRoot(),
|
||||
CoreTestingModule
|
||||
]
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
service = TestBed.inject(DiscoveryApiService);
|
||||
apiService = TestBed.inject(AlfrescoApiService);
|
||||
authenticationService = TestBed.inject(AuthenticationService);
|
||||
});
|
||||
|
||||
it('Should retrieve the info about the product for Oauth', done => {
|
||||
spyOn(apiService.getInstance(), 'isEcmLoggedIn').and.returnValue(true);
|
||||
spyOn(service, 'getEcmProductInfo').and.returnValue(of(new EcmProductVersionModel(fakeEcmDiscoveryResponse)));
|
||||
|
||||
const subscription = service.ecmProductInfo$.subscribe(
|
||||
(data: EcmProductVersionModel) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.edition).toBe('FAKE');
|
||||
expect(data.version.schema).toBe(999999);
|
||||
expect(data.license.isClusterEnabled).toBeFalsy();
|
||||
expect(data.status.isQuickShareEnabled).toBeTruthy();
|
||||
expect(data.modules.length).toBe(2);
|
||||
expect(data.modules[0].id).toBe('alfresco-fake-services');
|
||||
expect(data.modules[1].id).toBe('alfresco-trashcan-fake');
|
||||
subscription.unsubscribe();
|
||||
done();
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 403
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('For BPM', () => {
|
||||
it('Should retrieve the info about the product for BPM', (done) => {
|
||||
service.getBpmProductInfo().subscribe((data: BpmProductVersionModel) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.edition).toBe('SUPER FAKE EDITION');
|
||||
expect(data.revisionVersion).toBe('2');
|
||||
expect(data.type).toBe('bpmSuite');
|
||||
done();
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 200,
|
||||
contentType: 'json',
|
||||
responseText: fakeBPMDiscoveryResponse
|
||||
});
|
||||
});
|
||||
|
||||
it('getBpmProductInfo catch errors call', (done) => {
|
||||
service.getBpmProductInfo().subscribe(
|
||||
() => {
|
||||
},
|
||||
() => {
|
||||
done();
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 403
|
||||
});
|
||||
});
|
||||
|
||||
it('Should retrieve the system properties for BPM', (done) => {
|
||||
service.getBPMSystemProperties().subscribe((data: SystemPropertiesRepresentation) => {
|
||||
expect(data).not.toBeNull();
|
||||
expect(data.allowInvolveByEmail).toBe(true);
|
||||
expect(data.disableJavaScriptEventsInFormEditor).toBe(false);
|
||||
expect(data.logoutDisabled).toBe(false);
|
||||
expect(data.authConfiguration.authUrl).toBe('fakeAuthUrl');
|
||||
expect(data.authConfiguration.realm).toBe('fakeRealm');
|
||||
expect(data.authConfiguration.clientId).toBe('fakeClient');
|
||||
expect(data.authConfiguration.useBrowserLogout).toBe(true);
|
||||
done();
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 200,
|
||||
contentType: 'json',
|
||||
responseText: fakeBPMDiscoverySystemPropertyResponse
|
||||
});
|
||||
});
|
||||
|
||||
it('Should retrieve the system properties for BPM', (done) => {
|
||||
service.getBPMSystemProperties().subscribe(
|
||||
() => {
|
||||
fail('expected an error, bpm not running');
|
||||
},
|
||||
(error) => {
|
||||
expect(error.response.statusCode).toEqual(404);
|
||||
expect(error.response.statusText).toEqual('Not Found');
|
||||
done();
|
||||
});
|
||||
|
||||
jasmine.Ajax.requests.mostRecent().respondWith({
|
||||
status: 404,
|
||||
statusText: 'Not Found'
|
||||
});
|
||||
}
|
||||
);
|
||||
authenticationService.onTokenExchange.next('<token>');
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user