mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-09-17 14:21:29 +00:00
Initial auth module library
This commit is contained in:
@@ -204,6 +204,14 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"canary": {
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "demo-shell/src/environments/environment.ts",
|
||||
"with": "demo-shell/src/environments/environment.canary.ts"
|
||||
}
|
||||
]
|
||||
},
|
||||
"e2e": {
|
||||
"budgets": [
|
||||
{
|
||||
|
@@ -15,6 +15,16 @@
|
||||
"upload": {
|
||||
"threads": 1
|
||||
},
|
||||
"authentication": {
|
||||
"issuer": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
|
||||
"loginUrl": "{protocol}//{hostname}{:port}/auth/realms/alfresco/protocol/openid-connect/auth",
|
||||
"silentRefreshRedirectUri": "{protocol}//{hostname}{:port}/assets/silent-refresh.html",
|
||||
"redirectUri": "/",
|
||||
"postLogoutRedirectUri": "#/logout",
|
||||
"clientId": "alfresco",
|
||||
"scope": "openid profile email",
|
||||
"responseType": "code"
|
||||
},
|
||||
"oauth2": {
|
||||
"host": "{protocol}//{hostname}{:port}/auth/realms/alfresco",
|
||||
"clientId": "alfresco",
|
||||
|
@@ -29,7 +29,8 @@ import {
|
||||
DebugAppConfigService,
|
||||
CoreModule,
|
||||
CoreAutomationService,
|
||||
AuthBearerInterceptor
|
||||
AuthBearerInterceptor,
|
||||
AppConfigModule
|
||||
} from '@alfresco/adf-core';
|
||||
import { ExtensionsModule } from '@alfresco/adf-extensions';
|
||||
import { AppComponent } from './app.component';
|
||||
@@ -115,6 +116,7 @@ import localeSv from '@angular/common/locales/sv';
|
||||
import { setupAppNotifications } from './services/app-notifications-factory';
|
||||
import { AppNotificationsService } from './services/app-notifications.service';
|
||||
import { SearchFilterChipsComponent } from './components/search/search-filter-chips.component';
|
||||
import { AuthModule } from '@alfresco/adf-core/auth';
|
||||
|
||||
registerLocaleData(localeFr);
|
||||
registerLocaleData(localeDe);
|
||||
@@ -133,18 +135,42 @@ registerLocaleData(localeFi);
|
||||
registerLocaleData(localeDa);
|
||||
registerLocaleData(localeSv);
|
||||
|
||||
debugger;
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
BrowserModule,
|
||||
environment.e2e ? NoopAnimationsModule : BrowserAnimationsModule,
|
||||
ReactiveFormsModule,
|
||||
...(environment.oidc ?
|
||||
[
|
||||
// Initial navigation must be disabled when we use the OIDC package with HashLocationStrategy, check its documentation
|
||||
RouterModule.forRoot(appRoutes, { useHash: true, relativeLinkResolution: 'legacy', initialNavigation: 'disabled' }),
|
||||
|
||||
// With this, we bypass the legacy behaviour, and won't load the app config and don't initialize the JS API
|
||||
CoreModule.forRoot({ authByJsApi: false }),
|
||||
|
||||
// So, instead, we need to load the app config. hence the forRoot() method:
|
||||
AppConfigModule.forRoot(),
|
||||
|
||||
// and here we need to initialize the auth module
|
||||
AuthModule
|
||||
|
||||
// And finally, we can initialize the api services to wotk with the new authentication
|
||||
// TODO: new form of AlfrescoApiService, which is compatible with the new authentication
|
||||
]:
|
||||
// CANARY: remove this when we can use the new authentication
|
||||
// ------------------------------------------------------------------
|
||||
[
|
||||
RouterModule.forRoot(appRoutes, { useHash: true, relativeLinkResolution: 'legacy' }),
|
||||
CoreModule.forRoot({ authByJsApi: true })
|
||||
]
|
||||
),
|
||||
ReactiveFormsModule,
|
||||
FormsModule,
|
||||
HttpClientModule,
|
||||
MaterialModule,
|
||||
FlexLayoutModule,
|
||||
TranslateModule.forRoot(),
|
||||
CoreModule.forRoot(),
|
||||
ContentModule.forRoot(),
|
||||
InsightsModule.forRoot(),
|
||||
ProcessModule.forRoot(),
|
||||
|
27
demo-shell/src/environments/environment.canary.ts
Normal file
27
demo-shell/src/environments/environment.canary.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
// The file contents for the current environment will overwrite these during build.
|
||||
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
|
||||
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
|
||||
// The list of which env maps to which file can be found in `.angular-cli.json`.
|
||||
|
||||
export const environment = {
|
||||
production: false,
|
||||
e2e: false,
|
||||
oidc: true
|
||||
};
|
@@ -17,5 +17,6 @@
|
||||
|
||||
export const environment = {
|
||||
production: false,
|
||||
e2e: true
|
||||
e2e: true,
|
||||
oidc: false
|
||||
};
|
||||
|
@@ -17,5 +17,6 @@
|
||||
|
||||
export const environment = {
|
||||
production: true,
|
||||
e2e: false
|
||||
e2e: false,
|
||||
oidc: false
|
||||
};
|
||||
|
@@ -22,5 +22,6 @@
|
||||
|
||||
export const environment = {
|
||||
production: false,
|
||||
e2e: false
|
||||
e2e: false,
|
||||
oidc: false
|
||||
};
|
||||
|
@@ -15,5 +15,6 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
export * from './authentication';
|
||||
export * from './authentication-interceptor/authentication.interceptor';
|
||||
export * from './lib/authentication';
|
||||
export * from './lib/authentication-interceptor/authentication.interceptor';
|
||||
export * from './lib/auth.module';
|
||||
|
48
lib/core/auth/src/lib/auth.module.ts
Normal file
48
lib/core/auth/src/lib/auth.module.ts
Normal file
@@ -0,0 +1,48 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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 { HttpClientModule } from '@angular/common/http';
|
||||
import { APP_INITIALIZER, NgModule } from '@angular/core';
|
||||
import { OAuthModule } from 'angular-oauth2-oidc';
|
||||
// import { AuthenticationService } from '@alfresco/adf-core';
|
||||
import { AuthGuard } from './guards/oidc-auth.guard';
|
||||
import { AuthConfigService, configureAuth } from './services/auth-config.service';
|
||||
// import { AuthService } from './services/oidc-authentication.service';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
HttpClientModule,
|
||||
OAuthModule.forRoot()
|
||||
],
|
||||
providers: [
|
||||
AuthGuard,
|
||||
AuthConfigService,
|
||||
// AuthService,
|
||||
{
|
||||
provide: APP_INITIALIZER,
|
||||
useFactory: configureAuth,
|
||||
deps: [ AuthConfigService ]
|
||||
},
|
||||
// TODO: CANARY: This is temporary, we are reproviding ADF's AuthenticationService with our own implementation to work with the new auth library
|
||||
// TODO: But we need definitely need a cleaner solution for this. Which means, first we need to make the apis capable of handling multiple http clients
|
||||
// {
|
||||
// provide: AuthenticationService,
|
||||
// useExisting: AuthService
|
||||
// }
|
||||
]
|
||||
})
|
||||
export class AuthModule {}
|
47
lib/core/auth/src/lib/guards/oidc-auth.guard.ts
Normal file
47
lib/core/auth/src/lib/guards/oidc-auth.guard.ts
Normal file
@@ -0,0 +1,47 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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 { Injectable } from '@angular/core';
|
||||
import { CanActivate, CanActivateChild } from '@angular/router';
|
||||
import { OAuthService } from 'angular-oauth2-oidc';
|
||||
import { AuthConfigService } from '../services/auth-config.service';
|
||||
|
||||
@Injectable()
|
||||
export class AuthGuard implements CanActivate, CanActivateChild {
|
||||
|
||||
constructor(
|
||||
private authConfigService: AuthConfigService,
|
||||
private oauthService: OAuthService
|
||||
) {}
|
||||
|
||||
canActivate(): boolean {
|
||||
if (!this.oauthService.hasValidAccessToken()) {
|
||||
if (this.authConfigService.isCodeFlow()) {
|
||||
this.oauthService.initCodeFlow();
|
||||
} else {
|
||||
this.oauthService.initLoginFlow();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
canActivateChild(): boolean {
|
||||
return this.canActivate();
|
||||
}
|
||||
}
|
81
lib/core/auth/src/lib/services/auth-config.service.ts
Normal file
81
lib/core/auth/src/lib/services/auth-config.service.ts
Normal file
@@ -0,0 +1,81 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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 { Injectable } from '@angular/core';
|
||||
import { AuthConfig, OAuthService } from 'angular-oauth2-oidc';
|
||||
import { JwksValidationHandler } from 'angular-oauth2-oidc-jwks';
|
||||
import { take } from 'rxjs/operators';
|
||||
import { Router } from '@angular/router';
|
||||
import { StorageService } from '@alfresco/adf-core/common';
|
||||
import { AppConfigService, AppConfigValues } from '@alfresco/adf-core/config';
|
||||
|
||||
export const configureAuth = (oidcAuthentication: AuthConfigService) => () => oidcAuthentication.init();
|
||||
|
||||
@Injectable()
|
||||
export class AuthConfigService {
|
||||
|
||||
_authConfig: AuthConfig;
|
||||
|
||||
constructor(
|
||||
private appConfigService: AppConfigService,
|
||||
private storageService: StorageService,
|
||||
private oauthService: OAuthService,
|
||||
private router: Router
|
||||
) {}
|
||||
|
||||
public init() {
|
||||
debugger;
|
||||
this.appConfigService.onLoad
|
||||
.pipe(take(1))
|
||||
.toPromise()
|
||||
.then(this.configure.bind(this));
|
||||
}
|
||||
|
||||
private configure() {
|
||||
this._authConfig = this.appConfigService.get<AuthConfig>(AppConfigValues.AUTH_CONFIG, null);
|
||||
// TODO: add the authenticaion object's schema to the app.config.schema.json
|
||||
this.oauthService.configure(this._authConfig);
|
||||
this.oauthService.tokenValidationHandler = new JwksValidationHandler();
|
||||
this.oauthService.setStorage(this.storageService);
|
||||
this.oauthService.setupAutomaticSilentRefresh();
|
||||
|
||||
// This is what deald with the responded code and does the magic
|
||||
this.oauthService.loadDiscoveryDocumentAndTryLogin().then(() => {
|
||||
// initialNavigation: false needs because of the OIDC package!!!
|
||||
// https://manfredsteyer.github.io/angular-oauth2-oidc/docs/additional-documentation/routing-with-the-hashstrategy.html
|
||||
this.router.navigate(['/']);
|
||||
});
|
||||
}
|
||||
|
||||
isCodeFlow(): boolean {
|
||||
return this._authConfig.responseType === 'code';
|
||||
}
|
||||
|
||||
// private getAuthConfig(codeFlow = false): AuthConfig {
|
||||
// const oauth2: OauthConfigModel = Object.assign({});
|
||||
// return {
|
||||
// issuer: oauth2.host,
|
||||
// loginUrl: `${oauth2.host}/protocol/openid-connect/auth`,
|
||||
// silentRefreshRedirectUri: oauth2.redirectSilentIframeUri,
|
||||
// redirectUri: window.location.origin + oauth2.redirectUri,
|
||||
// postLogoutRedirectUri: window.location.origin + oauth2.redirectUriLogout,
|
||||
// clientId: oauth2.clientId,
|
||||
// scope: oauth2.scope,
|
||||
// ...(codeFlow ? { responseType: 'code' } : {})
|
||||
// };
|
||||
// }
|
||||
}
|
203
lib/core/auth/src/lib/services/oidc-authentication.service.ts
Normal file
203
lib/core/auth/src/lib/services/oidc-authentication.service.ts
Normal file
@@ -0,0 +1,203 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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 { Injectable } from '@angular/core';
|
||||
import { Observable, from, throwError, ReplaySubject, of } from 'rxjs';
|
||||
import { LogService } from '../../../../src/lib/common/services/log.service';
|
||||
import { RedirectionModel } from '../../models/redirection.model';
|
||||
import { AppConfigService, AppConfigValues } from '@alfresco/adf-core';
|
||||
import { PeopleApi, UserProfileApi, UserRepresentation } from '@alfresco/js-api';
|
||||
import { JwtHelperService } from '../../services/jwt-helper.service';
|
||||
import { StorageService } from '../../../../src/lib/common/services/storage.service';
|
||||
import { OauthConfigModel } from '../../models/oauth-config.model';
|
||||
import { BaseAuthenticationService } from '../base-authentication.service';
|
||||
import { ADFAuthenticationService } from '../authentication.interface';
|
||||
import { AlfrescoApiClientFactory } from '../../alfresco-api';
|
||||
import { OAuthService } from 'angular-oauth2-oidc';
|
||||
import minimatch from 'minimatch';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
})
|
||||
export class AuthService extends BaseAuthenticationService implements ADFAuthenticationService {
|
||||
onLogin: ReplaySubject<any> = new ReplaySubject<any>(1);
|
||||
onLogout: ReplaySubject<any> = new ReplaySubject<any>(1);
|
||||
|
||||
get peopleApi(): PeopleApi {
|
||||
return this.alfrescoApiClientFactory.getPeopleApi();
|
||||
}
|
||||
get profileApi(): UserProfileApi {
|
||||
return this.alfrescoApiClientFactory.getProfileApi();
|
||||
}
|
||||
|
||||
constructor(
|
||||
private alfrescoApiClientFactory: AlfrescoApiClientFactory,
|
||||
private appConfig: AppConfigService,
|
||||
private storageService: StorageService,
|
||||
private oauthService: OAuthService,
|
||||
private logService: LogService) {
|
||||
super();
|
||||
// this.alfrescoApi.alfrescoApiInitialized.subscribe(() => {
|
||||
// this.alfrescoApi.getInstance().reply('logged-in', () => {
|
||||
// this.onLogin.next();
|
||||
// });
|
||||
|
||||
// if (this.isKerberosEnabled()) {
|
||||
// this.loadUserDetails();
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
// private loadUserDetails() {
|
||||
// const ecmUser$ = from(this.peopleApi.getPerson('-me-'));
|
||||
// const bpmUser$ = this.getBpmLoggedUser();
|
||||
|
||||
// if (this.isALLProvider()) {
|
||||
// forkJoin([ecmUser$, bpmUser$]).subscribe(() => this.onLogin.next());
|
||||
// } else if (this.isECMProvider()) {
|
||||
// ecmUser$.subscribe(() => this.onLogin.next());
|
||||
// } else {
|
||||
// bpmUser$.subscribe(() => this.onLogin.next());
|
||||
// }
|
||||
// }
|
||||
|
||||
isLoggedIn(): boolean {
|
||||
return this.oauthService.hasValidAccessToken() && this.oauthService.hasValidIdToken();
|
||||
}
|
||||
|
||||
isLoggedInWith(provider?: string): boolean {
|
||||
console.log(provider);
|
||||
return this.isLoggedIn();
|
||||
}
|
||||
|
||||
isKerberosEnabled(): boolean {
|
||||
return this.appConfig.get<boolean>(AppConfigValues.AUTH_WITH_CREDENTIALS, false);
|
||||
}
|
||||
|
||||
isOauth(): boolean {
|
||||
return this.appConfig.get(AppConfigValues.AUTHTYPE) === 'OAUTH';
|
||||
}
|
||||
|
||||
oidcHandlerEnabled(): boolean {
|
||||
const oauth2: OauthConfigModel = Object.assign({}, this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null));
|
||||
return oauth2?.handler === 'oidc';
|
||||
}
|
||||
|
||||
isImplicitFlow() {
|
||||
const oauth2: OauthConfigModel = Object.assign({}, this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null));
|
||||
return !!oauth2?.implicitFlow;
|
||||
}
|
||||
|
||||
isAuthCodeFlow() {
|
||||
const oauth2: OauthConfigModel = Object.assign({}, this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null));
|
||||
return !!oauth2?.codeFlow;
|
||||
}
|
||||
|
||||
isPublicUrl(): boolean {
|
||||
const oauth2: OauthConfigModel = Object.assign({}, this.appConfig.get<OauthConfigModel>(AppConfigValues.OAUTHCONFIG, null));
|
||||
const publicUrls = oauth2.publicUrls || [];
|
||||
|
||||
if (Array.isArray(publicUrls)) {
|
||||
return publicUrls.length > 0 &&
|
||||
publicUrls.some((urlPattern: string) => minimatch(window.location.href, urlPattern));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
isECMProvider(): boolean {
|
||||
return this.appConfig.get<string>(AppConfigValues.PROVIDERS).toUpperCase() === 'ECM';
|
||||
}
|
||||
isBPMProvider(): boolean {
|
||||
return this.appConfig.get<string>(AppConfigValues.PROVIDERS).toUpperCase() === 'BPM';
|
||||
}
|
||||
|
||||
isALLProvider(): boolean {
|
||||
return this.appConfig.get<string>(AppConfigValues.PROVIDERS).toUpperCase() === 'ALL';
|
||||
}
|
||||
|
||||
login(): Observable<{ type: string; ticket: any }> {
|
||||
return of();
|
||||
}
|
||||
|
||||
ssoImplicitLogin() {
|
||||
this.oauthService.initLoginFlow();
|
||||
}
|
||||
|
||||
ssoCodeFlowLogin() {
|
||||
this.oauthService.initCodeFlow();
|
||||
}
|
||||
|
||||
isRememberMeSet(): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
logout() {
|
||||
this.oauthService.logOut();
|
||||
return of();
|
||||
}
|
||||
|
||||
getTicketEcm(): string | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
getTicketBpm(): string | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
getTicketEcmBase64(): string | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
isEcmLoggedIn(): boolean {
|
||||
return this.isLoggedIn();
|
||||
}
|
||||
|
||||
isBpmLoggedIn(): boolean {
|
||||
return this.isLoggedIn();
|
||||
}
|
||||
|
||||
getEcmUsername(): string {
|
||||
return 'To Be Implemented';
|
||||
}
|
||||
|
||||
getBpmUsername(): string {
|
||||
return 'To Be Implemented';
|
||||
}
|
||||
|
||||
setRedirect(url?: RedirectionModel) {
|
||||
console.log(url);
|
||||
// noop
|
||||
}
|
||||
|
||||
getRedirect(): string {
|
||||
// noop
|
||||
return 'noop';
|
||||
}
|
||||
|
||||
getBpmLoggedUser(): Observable<UserRepresentation> {
|
||||
return from(this.profileApi.getProfile());
|
||||
}
|
||||
|
||||
handleError(error: any): Observable<any> {
|
||||
this.logService.error('Error when logging in', error);
|
||||
return throwError(error || 'Server error');
|
||||
}
|
||||
|
||||
getToken(): string {
|
||||
return this.storageService.getItem(JwtHelperService.USER_ACCESS_TOKEN);
|
||||
}
|
||||
}
|
25
lib/core/src/lib/app-config/app-config.loader.ts
Normal file
25
lib/core/src/lib/app-config/app-config.loader.ts
Normal file
@@ -0,0 +1,25 @@
|
||||
/*!
|
||||
* @license
|
||||
* Copyright 2019 Alfresco Software, Ltd.
|
||||
*
|
||||
* 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 { StorageService } from '../common';
|
||||
import { AppConfigService, AppConfigValues } from './app-config.service';
|
||||
|
||||
export function loadAppConfig(appConfigService: AppConfigService, storageService: StorageService) {
|
||||
return () => appConfigService.load().then(() => {
|
||||
storageService.prefix = appConfigService.get<string>(AppConfigValues.STORAGE_PREFIX, '');
|
||||
});
|
||||
}
|
@@ -16,8 +16,19 @@
|
||||
*/
|
||||
|
||||
import { HttpClientModule } from '@angular/common/http';
|
||||
import { NgModule } from '@angular/core';
|
||||
import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
|
||||
import { StorageService } from '../common';
|
||||
import { loadAppConfig } from './app-config.loader';
|
||||
import { AppConfigPipe } from './app-config.pipe';
|
||||
import { AppConfigService } from './app-config.service';
|
||||
|
||||
interface AppConfigModuleConfig {
|
||||
loadConfig: boolean;
|
||||
}
|
||||
|
||||
const defaultConfig: AppConfigModuleConfig = {
|
||||
loadConfig: true
|
||||
};
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
@@ -31,4 +42,18 @@ import { AppConfigPipe } from './app-config.pipe';
|
||||
]
|
||||
})
|
||||
export class AppConfigModule {
|
||||
static forRoot(config: AppConfigModuleConfig = defaultConfig): ModuleWithProviders<AppConfigModule> {
|
||||
return {
|
||||
ngModule: AppConfigModule,
|
||||
providers: [
|
||||
...(config.loadConfig ?
|
||||
[{
|
||||
provide: APP_INITIALIZER,
|
||||
useFactory: loadAppConfig,
|
||||
deps: [ AppConfigService, StorageService ], multi: true }
|
||||
] : []
|
||||
)
|
||||
]
|
||||
};
|
||||
}
|
||||
}
|
||||
|
@@ -28,6 +28,7 @@ import { OpenidConfiguration } from '../auth/interfaces/openid-configuration.int
|
||||
export enum AppConfigValues {
|
||||
APP_CONFIG_LANGUAGES_KEY = 'languages',
|
||||
PROVIDERS = 'providers',
|
||||
AUTH_CONFIG = 'authentication',
|
||||
OAUTHCONFIG = 'oauth2',
|
||||
ECMHOST = 'ecmHost',
|
||||
BASESHAREURL = 'baseShareUrl',
|
||||
|
@@ -64,6 +64,14 @@ import { HttpClientModule, HttpClientXsrfModule, HTTP_INTERCEPTORS } from '@angu
|
||||
import { AuthenticationService } from './auth/services/authentication.service';
|
||||
import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
|
||||
|
||||
interface LegacyMonolithCoreModuleConfig {
|
||||
authByJsApi: boolean;
|
||||
}
|
||||
|
||||
const defaultConfig: LegacyMonolithCoreModuleConfig = {
|
||||
authByJsApi: true
|
||||
};
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
TranslateModule,
|
||||
@@ -142,21 +150,20 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
|
||||
]
|
||||
})
|
||||
export class CoreModule {
|
||||
static forRoot(): ModuleWithProviders<CoreModule> {
|
||||
static forRoot(config: LegacyMonolithCoreModuleConfig = defaultConfig): ModuleWithProviders<CoreModule> {
|
||||
debugger;
|
||||
return {
|
||||
ngModule: CoreModule,
|
||||
providers: [
|
||||
TranslateStore,
|
||||
TranslateService,
|
||||
{ provide: TranslateLoader, useClass: TranslateLoaderService },
|
||||
{
|
||||
...(config.authByJsApi ?
|
||||
[{
|
||||
provide: APP_INITIALIZER,
|
||||
useFactory: startupServiceFactory,
|
||||
deps: [
|
||||
AlfrescoApiService
|
||||
],
|
||||
multi: true
|
||||
},
|
||||
deps: [ AlfrescoApiService ], multi: true
|
||||
}] : []),
|
||||
{
|
||||
provide: APP_INITIALIZER,
|
||||
useFactory: directionalityConfigFactory,
|
||||
|
14
package-lock.json
generated
14
package-lock.json
generated
@@ -26984,6 +26984,15 @@
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"angular-oauth2-oidc-jwks": {
|
||||
"version": "15.0.1",
|
||||
"resolved": "https://registry.npmjs.org/angular-oauth2-oidc-jwks/-/angular-oauth2-oidc-jwks-15.0.1.tgz",
|
||||
"integrity": "sha512-70IEHYqh+tnsGJ56HKKghzEV597G1EgCZ5k2spp/GosBBPMi/PhCriVHgnsDWwS+ayE7HL9IU2+mc6oCh/t4mA==",
|
||||
"requires": {
|
||||
"jsrsasign": "^10.3.0",
|
||||
"tslib": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"ansi-align": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz",
|
||||
@@ -36811,6 +36820,11 @@
|
||||
"verror": "1.10.0"
|
||||
}
|
||||
},
|
||||
"jsrsasign": {
|
||||
"version": "10.6.1",
|
||||
"resolved": "https://registry.npmjs.org/jsrsasign/-/jsrsasign-10.6.1.tgz",
|
||||
"integrity": "sha512-emiQ05haY9CRj1Ho/LiuCqr/+8RgJuWdiHYNglIg2Qjfz0n+pnUq9I2QHplXuOMO2EnAW1oCGC1++aU5VoWSlw=="
|
||||
},
|
||||
"jszip": {
|
||||
"version": "3.10.0",
|
||||
"resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz",
|
||||
|
@@ -76,6 +76,7 @@
|
||||
"@ngx-translate/core": "^14.0.0",
|
||||
"@storybook/core-server": "6.4.22",
|
||||
"angular-oauth2-oidc": "^14.0.1",
|
||||
"angular-oauth2-oidc-jwks": "^15.0.1",
|
||||
"apollo-angular": "^4.0.1",
|
||||
"chart.js": "2.9.4",
|
||||
"cropperjs": "1.5.13",
|
||||
|
53
tsconfig.base.json
Normal file
53
tsconfig.base.json
Normal file
@@ -0,0 +1,53 @@
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"downlevelIteration": true,
|
||||
"module": "esnext",
|
||||
"rootDir": ".",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"baseUrl": ".",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"skipLibCheck": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noImplicitReturns": true,
|
||||
"target": "es2015",
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"resolveJsonModule": true,
|
||||
"typeRoots": ["node_modules/@types"],
|
||||
"types": ["jasmine", "node", "jasminewd2"],
|
||||
"lib": ["es2018", "esnext.array", "esnext.asynciterable", "dom"],
|
||||
"paths": {
|
||||
"@alfresco/adf-content-services": ["lib/content-services"],
|
||||
"@alfresco/adf-core": ["lib/core"],
|
||||
"@alfresco/adf-core/auth": ["lib/core/auth/src/index.ts"],
|
||||
"@alfresco/adf-core/shell": ["lib/core/shell/src/index.ts"],
|
||||
"@alfresco/adf-core/common": ["lib/core/src/lib/common/index.ts"],
|
||||
"@alfresco/adf-core/config": ["lib/core/src/lib/app-config/index.ts"],
|
||||
"@alfresco/adf-core/*": ["lib/core/*/public-api.ts"],
|
||||
"@alfresco/adf-extensions": ["lib/extensions"],
|
||||
"@alfresco/adf-insights": ["lib/insights"],
|
||||
"@alfresco/adf-process-services": ["lib/process-services"],
|
||||
"@alfresco/adf-process-services-cloud": ["lib/process-services-cloud"],
|
||||
"@alfresco/adf-testing": ["lib/testing"],
|
||||
"@alfresco/js-api": ["node_modules/@alfresco/js-api"]
|
||||
}
|
||||
},
|
||||
"exclude": [
|
||||
"lib/config",
|
||||
"integration",
|
||||
"scripts",
|
||||
"assets",
|
||||
"tools",
|
||||
"node_modules"
|
||||
],
|
||||
"angularCompilerOptions": {
|
||||
"fullTemplateTypeCheck": true,
|
||||
"strictInjectionParameters": true,
|
||||
"strictTemplates": true
|
||||
}
|
||||
}
|
@@ -1,51 +1,3 @@
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"downlevelIteration": true,
|
||||
"module": "esnext",
|
||||
"rootDir": ".",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"baseUrl": ".",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"skipLibCheck": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noImplicitReturns": true,
|
||||
"target": "es2015",
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"resolveJsonModule": true,
|
||||
"typeRoots": ["node_modules/@types"],
|
||||
"types": ["jasmine", "node", "jasminewd2"],
|
||||
"lib": ["es2018", "esnext.array", "esnext.asynciterable", "dom"],
|
||||
"paths": {
|
||||
"@alfresco/adf-content-services": ["lib/content-services"],
|
||||
"@alfresco/adf-core": ["lib/core"],
|
||||
"@alfresco/adf-core/*": ["lib/core/*/public-api.ts"],
|
||||
"@alfresco/adf-core/auth": ["lib/core/auth/src/index.ts"],
|
||||
"@alfresco/adf-core/shell": ["lib/core/shell/src/index.ts"],
|
||||
"@alfresco/adf-extensions": ["lib/extensions"],
|
||||
"@alfresco/adf-insights": ["lib/insights"],
|
||||
"@alfresco/adf-process-services": ["lib/process-services"],
|
||||
"@alfresco/adf-process-services-cloud": ["lib/process-services-cloud"],
|
||||
"@alfresco/adf-testing": ["lib/testing"],
|
||||
"@alfresco/js-api": ["node_modules/@alfresco/js-api"]
|
||||
}
|
||||
},
|
||||
"exclude": [
|
||||
"lib/config",
|
||||
"integration",
|
||||
"scripts",
|
||||
"assets",
|
||||
"tools",
|
||||
"node_modules"
|
||||
],
|
||||
"angularCompilerOptions": {
|
||||
"fullTemplateTypeCheck": true,
|
||||
"strictInjectionParameters": true,
|
||||
"strictTemplates": true
|
||||
}
|
||||
"extends": "./tsconfig.base.json"
|
||||
}
|
||||
|
Reference in New Issue
Block a user