Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/app-upgraded-providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {kommonitorDiagramHelperService} from 'util/genericServices/kommonitorDia
import {kommonitorFilterHelperService} from 'util/genericServices/kommonitorFilterHelperService/kommonitor-filter-helper-service.module';
import {kommonitorImporterHelperService} from 'util/genericServices/kommonitorImporterHelperService/kommonitor-importer-helper-service.module';
import {kommonitorKeycloackHelperService} from 'util/genericServices/kommonitorKeycloakHelperService/kommonitor-keycloak-helper-service.module'
import { KeycloakHelperService } from './services/auth/keycloak-helper.service';
import {kommonitorMultistepFormHelperService} from 'util/genericServices/kommonitorMultiStepFormHelperService/kommonitor-multi-step-form-helper-service.module'
import {kommonitorScriptHelperService} from'util/genericServices/kommonitorScriptHelperService/kommonitor-script-helper-service.module';
import {kommonitorShareHelperService} from 'util/genericServices/kommonitorShareHelperService/kommonitor-share-helper-service.module'
Expand Down Expand Up @@ -102,6 +103,17 @@ export const ajskommonitorKeycloackHelperServiceProvider: any = {
useFactory:kommonitorKeycloackHelperServiceFactory,
};

// Angular Keycloak Helper Service
export function keycloakHelperServiceFactory(injector: any) {
return injector.get(KeycloakHelperService);
}

export const keycloakHelperServiceProvider: any = {
deps: ['$injector'],
provide: 'kommonitorKeycloakHelperService',
useFactory: keycloakHelperServiceFactory,
};

//multistep form
export function kommonitorMultiStepFormHelperServiceFactory (injector:any){
return injector.get('kommonitorMultiStepFormHelperService')
Expand Down
9 changes: 7 additions & 2 deletions app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { DoBootstrap, NgModule, Version, inject, Input, Inject, CUSTOM_ELEMENTS_
import { BrowserModule } from '@angular/platform-browser';
import { UpgradeModule } from '@angular/upgrade/static';
import { downgradeComponent } from '@angular/upgrade/static';
import { KeycloakAngularModule } from 'keycloak-angular';

import $ from 'jquery';
import Keycloak from 'keycloak-js';
Expand All @@ -21,6 +22,7 @@ import {
ajskommonitorDiagramHelperServiceProvider,
ajskommonitorFilterHelperServiceProvider,
ajskommonitorKeycloackHelperServiceProvider,
keycloakHelperServiceProvider,
ajskommonitorMultiStepFormHelperServiceProvider,
ajskommonitorSingleFeatureMapServiceProvider,
ajskommonitorElementVisibilityHelperServiceProvider,
Expand Down Expand Up @@ -59,6 +61,7 @@ import { SelectedIndicatorFilter } from 'pipes/selected-indicator-filter.pipe';
import { BaseIndicatorOfComputedIndicatorFilter } from 'pipes/base-indicator-of-computed-indicator-filter.pipe';
import { BaseIndicatorOfHeadlineIndicatorFilter } from 'pipes/base-indicator-of-headline-indicator-filter.pipe';
import { AuthService } from 'services/auth-service/auth.service';
import { KeycloakHelperService } from './services/auth/keycloak-helper.service';
import { KommonitorReachabilityComponent } from './components/ngComponents/userInterface/sidebar/kommonitorReachability/kommonitor-reachability.component';

import { AdminTopicsManagementComponent } from './components/ngComponents/admin/adminTopicsManagement/admin-topics-management.component';
Expand Down Expand Up @@ -90,6 +93,7 @@ declare var MathJax;
FormsModule,
ReactiveFormsModule,
HttpClientModule,
KeycloakAngularModule,
JsonPipe,
NouisliderModule,
NgbCollapseModule,
Expand All @@ -100,7 +104,7 @@ declare var MathJax;
ajskommonitorCacheHelperServiceProvider,
ajskommonitorBatchUpdateHelperServiceProvider,
ajskommonitorConfigStorageServiceProvider,
ajskommonitorKeycloackHelperServiceProvider,
keycloakHelperServiceProvider,
ajskommonitorMultiStepFormHelperServiceProvider,
ajskommonitorDataExchangeServiceeProvider,
ajskommonitorDataGridHelperServiceProvider,
Expand All @@ -125,7 +129,8 @@ declare var MathJax;
useClass: AuthInterceptor,
multi: true
},
AuthService
AuthService,
KeycloakHelperService
],
declarations: [
KommonitorLegendComponent,
Expand Down
2 changes: 2 additions & 0 deletions app/services/auth/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { KeycloakHelperService } from './keycloak-helper.service';
export * from './keycloak-config.interface';
74 changes: 74 additions & 0 deletions app/services/auth/keycloak-config.interface.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
export interface KeycloakConfig {
'auth-server-url': string;
realm: string;
resource: string;
}

export interface KeycloakRole {
id: string;
name: string;
description?: string;
composite?: boolean;
clientRole?: boolean;
containerId?: string;
attributes?: { [key: string]: string[] };
}

export interface KeycloakGroup {
id: string;
name: string;
path?: string;
subGroupCount?: number;
subGroups?: KeycloakGroup[];
attributes?: { [key: string]: string[] };
}

export interface OrganizationalUnit {
organizationalUnitId: string;
name: string;
mandant: string;
parentId?: string;
keycloakId?: string;
}

export interface RoleBody {
name: string;
description?: string;
composite?: boolean;
composites?: KeycloakRole[];
attributes?: { [key: string]: string[] };
}

export interface GroupBody {
id?: string;
name: string;
attributes?: { [key: string]: string[] };
}

export interface FineGrainedPermissionResource {
enabled: boolean;
resource: string;
scopePermissions: { [key: string]: string };
}

export interface PolicyBody {
name: string;
description: string;
roles: Array<{
id: string;
required: boolean;
}>;
logic: 'POSITIVE' | 'NEGATIVE';
}

export interface ScopePermissionBody {
id: string;
name: string;
type: string;
logic: 'POSITIVE' | 'NEGATIVE';
decisionStrategy: 'UNANIMOUS' | 'AFFIRMATIVE' | 'CONSENSUS';
resources: string[];
policies: string[];
scopes: string[];
description: string;
}
Loading