inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the adf-logout latest version (#1953)

Browse Source 
* Use the adf-logout

* Use latest adf and js api

* Add npm ci to be removed once the travis cache works

* Fix deps
This commit is contained in:
Maurizio Vitale
2021-02-01 15:01:20 +00:00
committed by GitHub
parent 112baf3072
commit e98df9a974
5 changed files with 29 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
package-lock.json generated
View File

@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@alfresco/adf-cli": {
"version": "4.3.0-beta8",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-beta8.tgz",
"integrity": "sha512-aSPpWdSpveoaP2D7uGUg4BdBYcNf+mXdif954F6Sx2lgDk+7lzK26nPHKhZa9lCVtwiYR3KOTBC2aFEGMyb7lQ==",
"version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz",
"integrity": "sha512-eULIVGauVs7mDE/1fpqgzWrFTsopHNwztvxN6w1OYkF8ecCt6QiDPOPZHFR7tvr4gb5Prf+etw4TPQP9xlQbkQ==",
"dev": true,
"requires": {
"@alfresco/js-api": "4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779",
@@ -41,42 +41,42 @@
}
},
"@alfresco/adf-content-services": {
"version": "4.3.0-beta8",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-beta8.tgz",
"integrity": "sha512-jWWi2I7sxJea226TJzUCvJC78osuEOvAI5zmXV34o9n85/Zy1gIp0F51UQ2duWrH+TR5RaLeszH27vcdW46SEg==",
"version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz",
"integrity": "sha512-LkOitq6pe/dNtEtoiTugNTG0sUvmeJZ7I+zDOo7SRDb85URa9LhO1T1lG0HKHuwMkR8mp6vO8V+0r0aTj+m8qQ==",
"requires": {
"tslib": "^2.0.0"
}
},
"@alfresco/adf-core": {
"version": "4.3.0-beta8",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-beta8.tgz",
"integrity": "sha512-q/oCusIQl7jANXGbHq7FUbt1hlMgKughUEDDy1VAo4Za66UOjcx4iy7mUr1nOalSIQtKve//Qnk8O+SzxchW3Q==",
"version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz",
"integrity": "sha512-MKkdcG7K+9IsQmBp3JjnI9n58F+dNg8FWPjFp5FkDbN7jkDqIloEd2+XiLXT0KXN2Kxi5FeO8YhFQVcA1QDGmA==",
"requires": {
"tslib": "^2.0.0"
}
},
"@alfresco/adf-extensions": {
"version": "4.3.0-beta8",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-beta8.tgz",
"integrity": "sha512-uYIg0sm60ymvjNYtfUk1XvJItMFFw/binlMV5/1fXWTBFp7y57eNpTBAgKUekhfXfpn0xTD6LewBOQoA80SV9Q==",
"version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz",
"integrity": "sha512-xgWkuGATkSFEDlxL3wbptN+3qGXSQ/AaQYKv6TAmw8d5V4H7iBz07u4GagTEc1sLKcqbUEZhhbpoyThfPk8HVQ==",
"requires": {
"tslib": "^2.0.0"
}
},
"@alfresco/adf-testing": {
"version": "4.3.0-beta8",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-beta8.tgz",
"integrity": "sha512-ltY1Sup9ddRAqGIywB1/h+ptdLGWO7IhdDNRmIatnS/2K76qy22hFVdfBGovaQsq5syUHKeGUaAjoS9mnCh+dA==",
"version": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc.tgz",
"integrity": "sha512-afjQbuAQYWeqym2SK+3Eqwt7mJAG1ygYypVqKUgesubZIsJ2/vOsYX6dx46ErmmabvD3EJuIoZ2xFAwNhJuoag==",
"dev": true,
"requires": {
"tslib": "^2.0.0"
}
},
"@alfresco/js-api": {
"version": "4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779.tgz",
"integrity": "sha512-8ZTFW3VNmbd4TG5Anm/IvoLI/ps97hJkXcna55bP05kCcHNrigpxksnrOiW+faNZANAdmjfA0Wzgx08e33wNpQ==",
"version": "4.3.0-2e84309af123ae96cc85bd9683cb1ab9a7119c33",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.3.0-2e84309af123ae96cc85bd9683cb1ab9a7119c33.tgz",
"integrity": "sha512-D655f7pIzecQ+dN2hN8g/MrI0ToRuqO2EddOSs5g6d1fRwA4I32rpH62R2+5oXsdvgkLCuPJ8xoLamz3QVcajQ==",
"requires": {
"event-emitter": "^0.3.5",
"minimatch": "3.0.4",

12
package.json
View File

@@ -24,10 +24,10 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "4.3.0-beta8",
"@alfresco/adf-core": "4.3.0-beta8",
"@alfresco/adf-extensions": "4.3.0-beta8",
"@alfresco/js-api": "4.3.0-40a8eba34d66a609cc7796be237eaed9d0cd4779",
"@alfresco/adf-content-services": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"@alfresco/adf-core": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"@alfresco/adf-extensions": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"@alfresco/js-api": "4.3.0-2e84309af123ae96cc85bd9683cb1ab9a7119c33",
"@angular/animations": "10.0.4",
"@angular/cdk": "^10.0.2",
"@angular/common": "10.0.4",
@@ -56,8 +56,8 @@
"zone.js": "~0.10.2"
},
"devDependencies": {
"@alfresco/adf-cli": "4.3.0-beta8",
"@alfresco/adf-testing": "4.3.0-beta8",
"@alfresco/adf-cli": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"@alfresco/adf-testing": "4.3.0-5600ef1718212039c21a1b15e91f51e2a650becc",
"@angular-custom-builders/lite-serve": "^0.2.2",
"@angular-devkit/build-angular": "^0.1002.0",
"@angular-devkit/build-ng-packagr": "^0.1002.0",

3
scripts/ci/job_hooks/before_e2e.sh
View File

@@ -4,6 +4,9 @@ FROM=$1;
TO=$2;
PARAMS=$3;
echo "====== install to be removed once travis cache is working again ====="
npm ci
echo "====== Scan environment ====="
./node_modules/@alfresco/adf-cli/bin/adf-cli scan-env --host "$API_CONTENT_HOST" -u "$ADMIN_EMAIL" -p "$ADMIN_PASSWORD"

20
src/app/components/common/logout/logout.component.spec.ts
View File

@@ -28,14 +28,11 @@ import { AppTestingModule } from '../../../testing/app-testing.module';
import { LogoutComponent } from './logout.component';
import { Store } from '@ngrx/store';
import { SetSelectedNodesAction } from '@alfresco/aca-shared/store';
import { AppConfigService, AuthenticationService } from '@alfresco/adf-core';
describe('LogoutComponent', () => {
let fixture: ComponentFixture<LogoutComponent>;
let component: LogoutComponent;
let store;
let authService: AuthenticationService;
let appConfig: AppConfigService;
beforeEach(() => {
TestBed.configureTestingModule({
@@ -53,8 +50,6 @@ describe('LogoutComponent', () => {
store = TestBed.inject(Store);
fixture = TestBed.createComponent(LogoutComponent);
appConfig = TestBed.inject(AppConfigService);
authService = TestBed.inject(AuthenticationService);
component = fixture.componentInstance;
fixture.detectChanges();
});
@@ -64,19 +59,4 @@ describe('LogoutComponent', () => {
expect(store.dispatch).toHaveBeenCalledWith(new SetSelectedNodesAction([]));
});
it('should return the login route in case of basic auth', () => {
spyOn(authService, 'isOauth').and.returnValue(false);
const redirectLogout = component.getLogoutRedirectUri();
expect(redirectLogout).toEqual('/login');
});
it('should return the value of redirectUriLogout as route in case of SSO auth', () => {
spyOn(authService, 'isOauth').and.returnValue(true);
appConfig.config['oauth2.redirectUriLogout'] = 'fake-logout';
const redirectLogout = component.getLogoutRedirectUri();
expect(redirectLogout).toEqual('fake-logout');
});
});

13
src/app/components/common/logout/logout.component.ts
View File

@@ -26,27 +26,18 @@
import { Component } from '@angular/core';
import { Store } from '@ngrx/store';
import { AppStore, SetSelectedNodesAction } from '@alfresco/aca-shared/store';
import { AppConfigService, AuthenticationService } from '@alfresco/adf-core';
@Component({
selector: 'aca-logout',
template: `
<button mat-menu-item (click)="onLogoutEvent()" adf-logout [redirectUri]="getLogoutRedirectUri()">
<button mat-menu-item (click)="onLogoutEvent()" adf-logout>
<mat-icon>exit_to_app</mat-icon>
<span>{{ 'APP.SIGN_OUT' | translate }}</span>
</button>
`
})
export class LogoutComponent {
constructor(private store: Store<AppStore>, private appConfig: AppConfigService, private auth: AuthenticationService) {}
getLogoutRedirectUri() {
if (this.auth.isOauth()) {
const logoutRedirect = this.appConfig.get<string>('oauth2.redirectUriLogout');
return logoutRedirect;
}
return '/login';
}
constructor(private store: Store<AppStore>) {}
onLogoutEvent() {
this.store.dispatch(new SetSelectedNodesAction([]));