mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +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 b79c5d37d6
\#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:
@@ -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();
|
||||
|
@@ -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,
|
||||
|
@@ -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());
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -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>
|
||||
|
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user