[AAE-12501] move auth in ADF

.github/actions/e2e/action.yml

@@ -153,7 +153,7 @@ runs:
         echo $PROXY_HOST_BPM
         echo "GIT_HASH=$GIT_HASH" >> $GITHUB_ENV
 
-    - name: run test 
+    - name: run test
       id: e2e_run
       if: ${{ steps.determine-affected.outputs.isAffected == 'true' }}
       env:

.github/workflows/pull-request.yml

@@ -392,15 +392,6 @@ jobs:
             check-cs-env: "true"
             check-ps-cloud-env: "true"
             deps: "testing"
-          - description: "Process Cloud: People"
-            test-id: "process-services-cloud"
-            folder: "process-services-cloud/people"
-            provider: "ALL"
-            auth: "OAUTH"
-            apa-proxy: true
-            check-cs-env: "true"
-            check-ps-cloud-env: "true"
-            deps: "testing"
           - description: "Process Cloud: Process"
             test-id: "process-services-cloud"
             folder: "process-services-cloud/process"

.vscode/launch.json

@@ -10,7 +10,7 @@
           "name": "e2e",
           "program": "${workspaceFolder}/node_modules/protractor/bin/protractor",
           "args": [
-              "`${workspaceFolder}/.vscode/closest-config-finder.sh ${file} e2e/protractor.conf.js`",
+              "./e2e/protractor.conf.js",
               "--specs=${file}"
           ],
           "envFile": "${workspaceFolder}/.env",

cspell.json

@@ -141,7 +141,8 @@
     "webscript",
     "Whitespaces",
     "xdescribe",
-    "xsrf"
+    "xsrf",
+    "BPMECM"
   ],
   "dictionaries": [
     "html",

demo-shell/src/app/app.component.ts

@@ -18,11 +18,11 @@
 import { Component, ViewEncapsulation, OnInit } from '@angular/core';
 import {
     AuthenticationService,
-    AlfrescoApiService,
     PageTitleService
 } from '@alfresco/adf-core';
 import { Router } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';
+import { AdfHttpClient } from '@alfresco/adf-core/api';
 
 @Component({
     selector: 'app-root',
@@ -33,7 +33,7 @@ import { MatDialog } from '@angular/material/dialog';
 export class AppComponent implements OnInit {
 
     constructor(private pageTitleService: PageTitleService,
-                private alfrescoApiService: AlfrescoApiService,
+                private adfHttpClient: AdfHttpClient,
                 private authenticationService: AuthenticationService,
                 private router: Router,
                 private dialogRef: MatDialog) {
@@ -43,7 +43,7 @@ export class AppComponent implements OnInit {
     ngOnInit() {
         this.pageTitleService.setTitle('title');
 
-        this.alfrescoApiService.getInstance().on('error', (error) => {
+        this.adfHttpClient.on('error', (error) => {
             if (error.status === 401) {
                 if (!this.authenticationService.isLoggedIn()) {
                     this.dialogRef.closeAll();

demo-shell/src/app/app.module.ts

@@ -74,7 +74,7 @@ import { UserInfoComponent } from './components/app-layout/user-info/user-info.c
         environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
         ReactiveFormsModule,
         RouterModule.forRoot(appRoutes, { useHash: true, relativeLinkResolution: 'legacy' }),
-        ...(environment.oidc ? [AuthModule.forRoot({ useHash: true })] : []),
+        AuthModule.forRoot({ useHash: true }),
         FormsModule,
         HttpClientModule,
         MaterialModule,

demo-shell/src/app/components/app-layout/user-info/user-info.component.ts

@@ -17,7 +17,13 @@
 
 import { EcmUserModel, PeopleContentService } from '@alfresco/adf-content-services';
 import { BpmUserModel, PeopleProcessService } from '@alfresco/adf-process-services';
-import { AuthenticationService, IdentityUserModel, IdentityUserService, UserInfoMode } from '@alfresco/adf-core';
+import {
+    AuthenticationService,
+    BasicAlfrescoAuthService,
+    IdentityUserModel,
+    IdentityUserService,
+    UserInfoMode
+} from '@alfresco/adf-core';
 import { Component, OnInit, Input } from '@angular/core';
 import { MenuPositionX, MenuPositionY } from '@angular/material/menu';
 import { Observable, of } from 'rxjs';
@@ -46,6 +52,7 @@ export class UserInfoComponent implements OnInit {
     constructor(private peopleContentService: PeopleContentService,
                 private peopleProcessService: PeopleProcessService,
                 private identityUserService: IdentityUserService,
+                private basicAlfrescoAuthService: BasicAlfrescoAuthService,
                 private authService: AuthenticationService) {
     }
 
@@ -77,7 +84,7 @@ export class UserInfoComponent implements OnInit {
     }
 
     get isLoggedIn(): boolean {
-        if (this.authService.isKerberosEnabled()) {
+        if (this.basicAlfrescoAuthService.isKerberosEnabled()) {
             return true;
         }
         return this.authService.isLoggedIn();
@@ -96,15 +103,15 @@ export class UserInfoComponent implements OnInit {
     }
 
     private isAllLoggedIn() {
-        return (this.authService.isEcmLoggedIn() && this.authService.isBpmLoggedIn()) || (this.authService.isALLProvider() && this.authService.isKerberosEnabled());
+        return (this.authService.isEcmLoggedIn() && this.authService.isBpmLoggedIn()) || (this.authService.isALLProvider() && this.basicAlfrescoAuthService.isKerberosEnabled());
     }
 
     private isBpmLoggedIn() {
-        return this.authService.isBpmLoggedIn() || (this.authService.isECMProvider() && this.authService.isKerberosEnabled());
+        return this.authService.isBpmLoggedIn() || (this.authService.isECMProvider() && this.basicAlfrescoAuthService.isKerberosEnabled());
     }
 
     private isEcmLoggedIn() {
-        return this.authService.isEcmLoggedIn() || (this.authService.isECMProvider() && this.authService.isKerberosEnabled());
+        return this.authService.isEcmLoggedIn() || (this.authService.isECMProvider() && this.basicAlfrescoAuthService.isKerberosEnabled());
     }
 }
 

demo-shell/src/app/components/settings/host-settings.component.html

@@ -71,7 +71,7 @@
             <mat-slide-toggle class="adf-full-width" name="implicitFlow" formControlName="implicitFlow">
             </mat-slide-toggle>
 
-            <ng-container *ngIf="supportsCodeFlow">
+            <ng-container *ngIf="isOAUTH">
                 <mat-label>Code Flow</mat-label>
                 <mat-slide-toggle class="adf-full-width" name="codeFlow" formControlName="codeFlow">
                 </mat-slide-toggle>

demo-shell/src/app/components/settings/host-settings.component.ts

@@ -65,7 +65,7 @@ export class HostSettingsComponent implements OnInit {
         private storageService: StorageService,
         private alfrescoApiService: AlfrescoApiService,
         private appConfig: AppConfigService,
-        private auth: AuthenticationService
+        private authenticationService: AuthenticationService
     ) {}
 
     ngOnInit() {
@@ -191,8 +191,8 @@ export class HostSettingsComponent implements OnInit {
         this.storageService.setItem(AppConfigValues.AUTHTYPE, values.authType);
 
         this.alfrescoApiService.reset();
-        this.auth.reset();
-        this.alfrescoApiService.getInstance().invalidateSession();
+        this.authenticationService.reset();
+        this.authenticationService.logout();
         this.success.emit(true);
     }
 
@@ -235,10 +235,6 @@ export class HostSettingsComponent implements OnInit {
         return this.form.get('authType').value === 'OAUTH';
     }
 
-    get supportsCodeFlow(): boolean {
-        return this.auth.supportCodeFlow;
-    }
-
     get providersControl(): UntypedFormControl {
         return this.form.get('providersControl') as UntypedFormControl;
     }

e2e/core/viewer/viewer-content-services-component.e2e.ts → e2e/content-services/components/viewer-content-services-component.e2e.ts

@@ -21,7 +21,7 @@ import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { VersionManagePage } from '../pages/version-manager.page';
-import { MetadataViewPage } from '../pages/metadata-view.page';
+import { MetadataViewPage } from '../../core/pages/metadata-view.page';
 
 describe('Content Services Viewer', () => {
     const acsUser = new UserModel();

e2e/content-services/components/viewer-vesion.e2e.ts

@@ -0,0 +1,94 @@
+/*!
+ * @license
+ * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { browser } from 'protractor';
+import { createApiService, FileBrowserUtil, LoginPage, UploadActions, UserModel, UsersActions, ViewerPage } from '@alfresco/adf-testing';
+import { ContentServicesPage } from '../../core/pages/content-services.page';
+import { FileModel } from '../../models/ACS/file.model';
+import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
+import { VersionManagePage } from '../pages/version-manager.page';
+
+describe('Viewer', () => {
+
+    const navigationBarPage = new NavigationBarPage();
+    const viewerPage = new ViewerPage();
+    const loginPage = new LoginPage();
+    const contentServicesPage = new ContentServicesPage();
+
+    const apiService = createApiService();
+    const uploadActions = new UploadActions(apiService);
+    const usersActions = new UsersActions(apiService);
+
+    const versionManagePage = new VersionManagePage();
+    const acsUser = new UserModel();
+    let txtFileUploaded;
+
+    const txtFileInfo = new FileModel({
+        name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
+        location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_path
+    });
+
+    const fileModelVersionTwo = new FileModel({
+        name: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_name,
+        location: browser.params.resources.Files.ADF_DOCUMENTS.TXT.file_location
+    });
+
+    beforeAll(async () => {
+        await apiService.loginWithProfile('admin');
+        await usersActions.createUser(acsUser);
+
+        await apiService.login(acsUser.username, acsUser.password);
+
+        txtFileUploaded = await uploadActions.uploadFile(txtFileInfo.location, txtFileInfo.name, '-my-');
+
+        await loginPage.login(acsUser.username, acsUser.password);
+   });
+
+    afterAll(async () => {
+        await apiService.loginWithProfile('admin');
+        await uploadActions.deleteFileOrFolder(txtFileUploaded.entry.id);
+        await navigationBarPage.clickLogoutButton();
+   });
+
+    beforeEach(async () => {
+        await contentServicesPage.goToDocumentList();
+        await contentServicesPage.doubleClickRow(txtFileUploaded.entry.name);
+        await viewerPage.waitTillContentLoaded();
+    });
+
+    afterEach(async () => {
+        await viewerPage.clickCloseButton();
+    });
+
+    it('[C362242] Should the Viewer be able to view a previous version of a file', async () => {
+        await contentServicesPage.versionManagerContent(txtFileInfo.name);
+        await versionManagePage.showNewVersionButton.click();
+        await versionManagePage.uploadNewVersionFile(fileModelVersionTwo.location);
+        await versionManagePage.closeVersionDialog();
+        await contentServicesPage.doubleClickRow(txtFileUploaded.entry.name);
+        await viewerPage.waitTillContentLoaded();
+        await viewerPage.clickInfoButton();
+        await viewerPage.clickOnTab('Versions');
+        await versionManagePage.viewFileVersion('1.0');
+        await viewerPage.expectUrlToContain('1.0');
+    });
+
+    it('[C362265] Should the Viewer be able to download a previous version of a file', async () => {
+        await viewerPage.clickDownloadButton();
+        await FileBrowserUtil.isFileDownloaded(txtFileInfo.name);
+    });
+});

e2e/content-services/document-list/document-list-pagination.e2e.ts

@@ -31,7 +31,7 @@ import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { FolderModel } from '../../models/ACS/folder.model';
 import { browser } from 'protractor';
 import { FileModel } from '../../models/ACS/file.model';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 
 describe('Document List - Pagination', () => {
     const pagination = {

e2e/content-services/upload/cancel-upload.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
 import { FileModel } from '../../models/ACS/file.model';
 

e2e/content-services/upload/excluded-file.e2e.ts

@@ -24,7 +24,7 @@ import { createApiService,
     UsersActions
 } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

e2e/content-services/upload/upload-dialog.e2e.ts

@@ -17,11 +17,11 @@
 
 import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { browser } from 'protractor';
-import { VersionManagePage } from '../../core/pages/version-manager.page';
+import { VersionManagePage } from '../pages/version-manager.page';
 
 describe('Upload component', () => {
 

e2e/content-services/upload/uploader-component.e2e.ts

@@ -19,7 +19,7 @@ import { browser, by, element } from 'protractor';
 
 import { createApiService, DropActions, LoginPage, StringUtil, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { UploadTogglesPage } from '../../core/pages/dialog/upload-toggles.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';

e2e/content-services/upload/user-permission.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import { createApiService, LoginPage, SnackbarPage, StringUtil, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 import { FileModel } from '../../models/ACS/file.model';
 import CONSTANTS = require('../../util/constants');

e2e/content-services/upload/version-actions.e2e.ts

@@ -28,9 +28,9 @@ import { createApiService,
 import { browser, by, element } from 'protractor';
 import { FileModel } from '../../models/ACS/file.model';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
-import { VersionManagePage } from '../../core/pages/version-manager.page';
+import { VersionManagePage } from '../pages/version-manager.page';
 
 describe('Version component actions', () => {
 

e2e/content-services/upload/version-permissions.e2e.ts

@@ -26,8 +26,8 @@ import {
     UsersActions
 } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
-import { VersionManagePage } from '../../core/pages/version-manager.page';
-import { UploadDialogPage } from '../../core/pages/dialog/upload-dialog.page';
+import { VersionManagePage } from '../pages/version-manager.page';
+import { UploadDialogPage } from '../pages/upload-dialog.page';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
 import { FileModel } from '../../models/ACS/file.model';
 import CONSTANTS = require('../../util/constants');

e2e/content-services/upload/version-properties.e2e.ts

@@ -24,7 +24,7 @@ import { createApiService,
     UsersActions, ViewerPage
 } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { VersionManagePage } from '../../core/pages/version-manager.page';
+import { VersionManagePage } from '../pages/version-manager.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';
 

e2e/content-services/upload/version-smoke-tests.e2e.ts

@@ -18,7 +18,7 @@
 import { browser } from 'protractor';
 import { createApiService, LoginPage, UploadActions, UserModel, UsersActions } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../core/pages/content-services.page';
-import { VersionManagePage } from '../../core/pages/version-manager.page';
+import { VersionManagePage } from '../pages/version-manager.page';
 import { FileModel } from '../../models/ACS/file.model';
 import { NavigationBarPage } from '../../core/pages/navigation-bar.page';