From 99b882f867065614d590c9331899e85f00b3dd38 Mon Sep 17 00:00:00 2001 From: Martin Rojas Miguel Angel Date: Mon, 14 May 2018 17:27:06 +0200 Subject: [PATCH] TSK-177 Add authentication and login page for taskana spring rest example --- rest/pom.xml | 29 ++++---- rest/taskana-rest-spring-example/pom.xml | 13 +++- .../rest/controllers/ViewController.java | 12 ++++ .../java/pro/taskana/rest/models/User.java | 25 +++++++ .../rest/security/SampleLoginModule.java | 4 +- .../rest/security/WebSecurityConfig.java | 46 +++++++++---- .../src/main/resources/application.properties | 1 + .../main/resources/templates/customlogin.html | 27 ++++++++ .../rest/ClassificationControllerIntTest.java | 2 +- .../taskana/rest/TaskControllerIntTest.java | 2 +- .../rest/TaskanaEngineControllerIntTest.java | 2 +- .../rest/WorkbasketControllerIntTest.java | 2 +- web/package-lock.json | 32 ++++++++- .../administration-routing.module.ts | 2 +- .../administration/administration.module.ts | 4 +- .../classification-categories.service.ts | 12 ++-- .../classification-definition.service.ts | 17 ++--- .../classification-types.service.ts | 11 +-- .../classifications.service.ts | 19 ++---- .../workbasket-definition.service.ts | 46 ++++++------- .../services/workbasket/workbasket.service.ts | 32 ++++----- .../details/workbasket-details.component.html | 2 +- .../workbasket-details.component.spec.ts | 12 +--- .../details/workbasket-details.component.ts | 11 --- web/src/app/app-routing.module.ts | 4 ++ web/src/app/app.module.ts | 31 +++++---- .../components/nav-bar/nav-bar.component.html | 18 ++--- .../components/nav-bar/nav-bar.component.scss | 8 ++- .../nav-bar/nav-bar.component.spec.ts | 27 +++++++- .../components/nav-bar/nav-bar.component.ts | 25 ++++++- .../user-information.component.html | 16 +++++ .../user-information.component.scss | 68 +++++++++++++++++++ .../user-information.component.spec.ts | 37 ++++++++++ .../user-information.component.ts | 40 +++++++++++ web/src/app/guards/admin-guard.ts | 37 ++++++++++ web/src/app/guards/business-admin-guard.ts | 38 +++++++++++ web/src/app/guards/monitor-guard.ts | 38 +++++++++++ web/src/app/models/user-info.ts | 8 +++ .../restConnector/rest-connector.service.ts | 15 ++-- web/src/app/services/domain/domain.service.ts | 8 +-- .../permission/permission.service.spec.ts | 15 ---- .../services/permission/permission.service.ts | 18 ----- .../startup-service/startup.service.ts | 7 +- .../taskana-engine/taskana-engine.service.ts | 32 +++++++++ web/src/app/services/window/window.service.ts | 18 +++++ .../http-client-interceptor.service.spec.ts | 3 +- .../http-client-interceptor.service.ts | 13 ++-- web/src/app/shared/shared.module.ts | 12 +++- .../custom-http-interceptor.service.ts | 19 ++++++ .../app/workplace/services/task.service.ts | 18 ++--- .../workplace/services/workbasket.service.ts | 20 ++---- web/src/app/workplace/workplace.module.ts | 15 +++- web/src/assets/_colors.scss | 3 +- web/src/assets/_site.scss | 17 ++++- 54 files changed, 721 insertions(+), 272 deletions(-) create mode 100644 rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/controllers/ViewController.java create mode 100644 rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/models/User.java create mode 100644 rest/taskana-rest-spring-example/src/main/resources/templates/customlogin.html create mode 100644 web/src/app/components/user-information/user-information.component.html create mode 100644 web/src/app/components/user-information/user-information.component.scss create mode 100644 web/src/app/components/user-information/user-information.component.spec.ts create mode 100644 web/src/app/components/user-information/user-information.component.ts create mode 100644 web/src/app/guards/admin-guard.ts create mode 100644 web/src/app/guards/business-admin-guard.ts create mode 100644 web/src/app/guards/monitor-guard.ts create mode 100644 web/src/app/models/user-info.ts delete mode 100644 web/src/app/services/permission/permission.service.spec.ts delete mode 100644 web/src/app/services/permission/permission.service.ts create mode 100644 web/src/app/services/taskana-engine/taskana-engine.service.ts create mode 100644 web/src/app/services/window/window.service.ts rename web/src/app/{ => shared}/services/httpClientInterceptor/http-client-interceptor.service.spec.ts (79%) rename web/src/app/{ => shared}/services/httpClientInterceptor/http-client-interceptor.service.ts (74%) create mode 100644 web/src/app/workplace/services/custom-http-interceptor/custom-http-interceptor.service.ts diff --git a/rest/pom.xml b/rest/pom.xml index bcde72aaa..c56bb565b 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -1,19 +1,20 @@ - 4.0.0 - pro.taskana - taskana-rest-parent - 0.1.4-SNAPSHOT - pom + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + pro.taskana + taskana-rest-parent + 0.1.4-SNAPSHOT + pom - This pom is parent to all taskana rest modules and serves the common build. + This pom is parent to all taskana rest modules and serves the common build. - - 1.8 - + + 1.8 + - - taskana-rest-spring - taskana-rest-spring-example - + + taskana-rest-spring + ../web + taskana-rest-spring-example + diff --git a/rest/taskana-rest-spring-example/pom.xml b/rest/taskana-rest-spring-example/pom.xml index 5a97c9e33..9f77a3502 100644 --- a/rest/taskana-rest-spring-example/pom.xml +++ b/rest/taskana-rest-spring-example/pom.xml @@ -52,7 +52,16 @@ h2 1.4.197 - + + + pro.taskana + taskana-web + ${project.version} + org.springframework.boot @@ -60,7 +69,6 @@ test - @@ -69,4 +77,5 @@ + diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/controllers/ViewController.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/controllers/ViewController.java new file mode 100644 index 000000000..fec77dea9 --- /dev/null +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/controllers/ViewController.java @@ -0,0 +1,12 @@ +package pro.taskana.rest.controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +public class ViewController { + @RequestMapping({ "/administration*/**", "/workplace*/**", "/monitor*/**" }) + public String index() { + return "forward:/index.html"; + } +} diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/models/User.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/models/User.java new file mode 100644 index 000000000..8faf5081a --- /dev/null +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/models/User.java @@ -0,0 +1,25 @@ +package pro.taskana.rest.models; + +public class User { + + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + +} diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/SampleLoginModule.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/SampleLoginModule.java index 039901085..ada436e6f 100644 --- a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/SampleLoginModule.java +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/SampleLoginModule.java @@ -10,13 +10,14 @@ import javax.security.auth.callback.PasswordCallback; import javax.security.auth.login.LoginException; import javax.security.auth.spi.LoginModule; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import pro.taskana.security.GroupPrincipal; import pro.taskana.security.UserPrincipal; /** * TODO. */ -public class SampleLoginModule implements LoginModule { +public class SampleLoginModule extends UsernamePasswordAuthenticationFilter implements LoginModule { private NameCallback nameCallback; @@ -24,6 +25,7 @@ public class SampleLoginModule implements LoginModule { private Subject subject; + @Override public boolean abort() throws LoginException { return true; diff --git a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java index bc81494a9..0d6e7893b 100644 --- a/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java +++ b/rest/taskana-rest-spring-example/src/main/java/pro/taskana/rest/security/WebSecurityConfig.java @@ -1,5 +1,6 @@ package pro.taskana.rest.security; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -11,13 +12,16 @@ import org.springframework.security.authentication.jaas.JaasAuthenticationProvid import org.springframework.security.authentication.jaas.JaasNameCallbackHandler; import org.springframework.security.authentication.jaas.JaasPasswordCallbackHandler; import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.builders.WebSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.jaasapi.JaasApiIntegrationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @@ -28,26 +32,43 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @EnableWebSecurity public class WebSecurityConfig extends WebSecurityConfigurerAdapter { + @Value("${devMode}") + private boolean devMode; + @Override protected void configure(HttpSecurity http) throws Exception { + http.csrf() - .disable() - .authenticationProvider(jaasAuthProvider()) - .authorizeRequests() - .antMatchers(HttpMethod.GET, "/**") - .authenticated() - .and() - .httpBasic() - .and() - .addFilter(new JaasApiIntegrationFilter()); + .disable() + .authenticationProvider(jaasAuthProvider()) + .authorizeRequests() + .antMatchers(HttpMethod.GET, "/**") + .authenticated() + .and() + .httpBasic() + .and() + .addFilter(new JaasApiIntegrationFilter()); + + if (devMode) { + return; + } + http + .authorizeRequests() + .anyRequest().authenticated() + .and() + .formLogin() + .permitAll() + .and() + .logout() + .permitAll(); } @Bean public JaasAuthenticationProvider jaasAuthProvider() { JaasAuthenticationProvider authenticationProvider = new JaasAuthenticationProvider(); - authenticationProvider.setAuthorityGranters(new AuthorityGranter[] {new SampleRoleGranter()}); - authenticationProvider.setCallbackHandlers(new JaasAuthenticationCallbackHandler[] { - new JaasNameCallbackHandler(), new JaasPasswordCallbackHandler()}); + authenticationProvider.setAuthorityGranters(new AuthorityGranter[]{new SampleRoleGranter()}); + authenticationProvider.setCallbackHandlers(new JaasAuthenticationCallbackHandler[]{ + new JaasNameCallbackHandler(), new JaasPasswordCallbackHandler()}); authenticationProvider.setLoginContextName("taskana"); authenticationProvider.setLoginConfig(new ClassPathResource("pss_jaas.config")); return authenticationProvider; @@ -72,6 +93,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { config.addAllowedOrigin("*"); config.addAllowedHeader("*"); config.addAllowedMethod("*"); + config.addAllowedMethod("POST"); source.registerCorsConfiguration("/**", config); FilterRegistrationBean bean = new FilterRegistrationBean(new CorsFilter(source)); bean.setOrder(0); diff --git a/rest/taskana-rest-spring-example/src/main/resources/application.properties b/rest/taskana-rest-spring-example/src/main/resources/application.properties index fac752926..79b9d9cd7 100644 --- a/rest/taskana-rest-spring-example/src/main/resources/application.properties +++ b/rest/taskana-rest-spring-example/src/main/resources/application.properties @@ -4,3 +4,4 @@ datasource.url=jdbc:h2:mem:taskana;IGNORECASE=TRUE;LOCK_MODE=0;INIT=CREATE SCHEM datasource.driverClassName=org.h2.Driver datasource.username=sa datasource.password=sa +devMode=false \ No newline at end of file diff --git a/rest/taskana-rest-spring-example/src/main/resources/templates/customlogin.html b/rest/taskana-rest-spring-example/src/main/resources/templates/customlogin.html new file mode 100644 index 000000000..93fe839e4 --- /dev/null +++ b/rest/taskana-rest-spring-example/src/main/resources/templates/customlogin.html @@ -0,0 +1,27 @@ + + + Custom Login Page + + +
+
+
+ Please Login +
+ Invalid username and password. +
+
+ You have been logged out. +
+ + + + +
+ +
+
+
+
+ + \ No newline at end of file diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java index f7dee0ac1..3cacfb5c6 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/ClassificationControllerIntTest.java @@ -39,7 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import pro.taskana.rest.resource.ClassificationSummaryResource; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"devMode=true"}) @Import(RestConfiguration.class) public class ClassificationControllerIntTest { diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java index fca416a2a..e15cfcc54 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskControllerIntTest.java @@ -43,7 +43,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import pro.taskana.rest.resource.TaskSummaryResource; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"devMode=true"}) @Import(RestConfiguration.class) public class TaskControllerIntTest { diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java index e2d3695d1..fafae2556 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/TaskanaEngineControllerIntTest.java @@ -32,7 +32,7 @@ import pro.taskana.TaskanaRole; import pro.taskana.rest.resource.TaskanaUserInfoResource; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"devMode=true"}) @Import(RestConfiguration.class) public class TaskanaEngineControllerIntTest { diff --git a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java index 9b4064f1c..2daa41590 100644 --- a/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java +++ b/rest/taskana-rest-spring-example/src/test/java/pro/taskana/rest/WorkbasketControllerIntTest.java @@ -40,7 +40,7 @@ import pro.taskana.rest.resource.DistributionTargetResource; import pro.taskana.rest.resource.WorkbasketSummaryResource; @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"devMode=true"}) @Import(RestConfiguration.class) public class WorkbasketControllerIntTest { diff --git a/web/package-lock.json b/web/package-lock.json index 64ae6775b..27da3c403 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1221,7 +1221,17 @@ "boom": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=" + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + }, + "dependencies": { + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + } + } }, "bootstrap": { "version": "3.3.7", @@ -5168,7 +5178,15 @@ "requires": { "boom": "2.10.1", "cryptiles": "2.0.5", + "hoek": "2.16.3", "sntp": "1.0.9" + }, + "dependencies": { + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + } } }, "he": { @@ -10004,7 +10022,17 @@ "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=" + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + }, + "dependencies": { + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + } + } }, "socket.io": { "version": "2.0.4", diff --git a/web/src/app/administration/administration-routing.module.ts b/web/src/app/administration/administration-routing.module.ts index 5268f4cf2..dcd809a91 100644 --- a/web/src/app/administration/administration-routing.module.ts +++ b/web/src/app/administration/administration-routing.module.ts @@ -41,7 +41,7 @@ const routes: Routes = [ { path: 'classifications', component: MasterAndDetailComponent, - canActivate: [DomainGuard], + canActivate: [DomainGuard], children: [ { path: '', diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index d347cfdc9..7abeb9776 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Ng2AutoCompleteModule } from 'ng2-auto-complete'; -import { HttpClientModule } from '@angular/common/http'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { AlertModule } from 'ngx-bootstrap'; import { SharedModule } from 'app/shared/shared.module'; @@ -45,11 +44,10 @@ const MODULES = [ CommonModule, FormsModule, Ng2AutoCompleteModule, - HttpClientModule, AngularSvgIconModule, AlertModule, SharedModule, - AdministrationRoutingModule, + AdministrationRoutingModule ]; const DECLARATIONS = [ diff --git a/web/src/app/administration/services/classification-categories-service/classification-categories.service.ts b/web/src/app/administration/services/classification-categories-service/classification-categories.service.ts index ce3e40c6e..7fc7cb886 100644 --- a/web/src/app/administration/services/classification-categories-service/classification-categories.service.ts +++ b/web/src/app/administration/services/classification-categories-service/classification-categories.service.ts @@ -4,23 +4,19 @@ import { Injectable } from '@angular/core'; import { environment } from 'environments/environment'; import { Observable } from 'rxjs/Observable'; import { ReplaySubject } from 'rxjs/ReplaySubject'; + @Injectable() export class ClassificationCategoriesService { private url = environment.taskanaRestUrl + '/v1/classification-categories'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; private dataObs$ = new ReplaySubject>(1); - constructor(private httpClient: HttpClient) { } + constructor( + private httpClient: HttpClient) { } getCategories(forceRefresh = false): Observable> { if (!this.dataObs$.observers.length || forceRefresh) { - this.httpClient.get>(this.url, this.httpOptions).subscribe( + this.httpClient.get>(this.url).subscribe( data => this.dataObs$.next(data), error => { this.dataObs$.error(error); diff --git a/web/src/app/administration/services/classification-definition/classification-definition.service.ts b/web/src/app/administration/services/classification-definition/classification-definition.service.ts index 41dc28d9b..0f8bc9b17 100644 --- a/web/src/app/administration/services/classification-definition/classification-definition.service.ts +++ b/web/src/app/administration/services/classification-definition/classification-definition.service.ts @@ -11,21 +11,16 @@ import { TaskanaDate } from 'app/shared/util/taskana.date'; export class ClassificationDefinitionService { url = environment.taskanaRestUrl + '/v1/classificationdefinitions'; - - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; - - constructor(private httpClient: HttpClient, private alertService: AlertService) { + constructor( + private httpClient: HttpClient, + private alertService: AlertService + ) { } // GET exportClassifications(domain: string) { domain = (domain === '' ? '' : '?domain=' + domain); - this.httpClient.get(this.url + domain, this.httpOptions) + this.httpClient.get(this.url + domain) .subscribe( response => saveAs(new Blob([JSON.stringify(response)], { type: 'text/plain;charset=utf-8' }), 'Classifications_' + TaskanaDate.getDate() + '.json') @@ -36,7 +31,7 @@ export class ClassificationDefinitionService { // TODO handle error importClassifications(classifications: any) { this.httpClient.post(this.url + '/import', - JSON.parse(classifications), this.httpOptions).subscribe( + JSON.parse(classifications)).subscribe( classificationsUpdated => this.alertService.triggerAlert(new AlertModel(AlertType.SUCCESS, 'Import was successful')), error => this.alertService.triggerAlert(new AlertModel(AlertType.DANGER, 'Import was not successful')) ); diff --git a/web/src/app/administration/services/classification-types/classification-types.service.ts b/web/src/app/administration/services/classification-types/classification-types.service.ts index 8b4b8beb7..d4ba39341 100644 --- a/web/src/app/administration/services/classification-types/classification-types.service.ts +++ b/web/src/app/administration/services/classification-types/classification-types.service.ts @@ -9,22 +9,17 @@ import { ReplaySubject } from 'rxjs/ReplaySubject'; @Injectable() export class ClassificationTypesService { private url = environment.taskanaRestUrl + '/v1/classification-types'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; private classificationTypeSelectedValue = 'TASK'; private classificationTypeSelected = new BehaviorSubject(this.classificationTypeSelectedValue); private dataObs$ = new ReplaySubject>(1); - constructor(private httpClient: HttpClient) { } + constructor(private httpClient: HttpClient + ) { } getClassificationTypes(forceRefresh = false): Observable> { if (!this.dataObs$.observers.length || forceRefresh) { - this.httpClient.get>(this.url, this.httpOptions).subscribe( + this.httpClient.get>(this.url).subscribe( data => this.dataObs$.next(data), error => { this.dataObs$.error(error); diff --git a/web/src/app/administration/services/classifications/classifications.service.ts b/web/src/app/administration/services/classifications/classifications.service.ts index cd944ad04..a48e0d246 100644 --- a/web/src/app/administration/services/classifications/classifications.service.ts +++ b/web/src/app/administration/services/classifications/classifications.service.ts @@ -22,13 +22,6 @@ export class ClassificationsService { private classificationSelected = new Subject(); private classificationSaved = new Subject(); - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; - private classificationTypes: Array; constructor( @@ -42,8 +35,7 @@ export class ClassificationsService { return this.domainService.getSelectedDomain().mergeMap(domain => { const classificationTypes = this.classificationTypeService.getSelectedClassificationType(); return this.getClassificationObservable(this.httpClient.get( - `${environment.taskanaRestUrl}/v1/classifications/?domain=${domain}`, - this.httpOptions)); + `${environment.taskanaRestUrl}/v1/classifications/?domain=${domain}`)); }).do(() => { this.domainService.domainChangedComplete(); @@ -52,7 +44,7 @@ export class ClassificationsService { // GET getClassification(id: string): Observable { - return this.httpClient.get(`${environment.taskanaRestUrl}/v1/classifications/${id}`, this.httpOptions) + return this.httpClient.get(`${environment.taskanaRestUrl}/v1/classifications/${id}`) .do((classification: ClassificationDefinition) => { if (classification) { this.classificationTypeService.selectClassificationType(classification.type); @@ -63,18 +55,17 @@ export class ClassificationsService { // POST postClassification(classification: Classification): Observable { - return this.httpClient.post(`${environment.taskanaRestUrl}/v1/classifications`, classification, - this.httpOptions); + return this.httpClient.post(`${environment.taskanaRestUrl}/v1/classifications`, classification); } // PUT putClassification(url: string, classification: Classification): Observable { - return this.httpClient.put(url, classification, this.httpOptions); + return this.httpClient.put(url, classification); } // DELETE deleteClassification(url: string): Observable { - return this.httpClient.delete(url, this.httpOptions); + return this.httpClient.delete(url); } // #region "Service extras" diff --git a/web/src/app/administration/services/workbasket-definition/workbasket-definition.service.ts b/web/src/app/administration/services/workbasket-definition/workbasket-definition.service.ts index e52845455..11fe5ea55 100644 --- a/web/src/app/administration/services/workbasket-definition/workbasket-definition.service.ts +++ b/web/src/app/administration/services/workbasket-definition/workbasket-definition.service.ts @@ -1,37 +1,29 @@ -import {Injectable} from '@angular/core'; -import {HttpClient, HttpHeaders} from '@angular/common/http'; -import {environment} from 'app/../environments/environment'; -import {saveAs} from 'file-saver/FileSaver'; -import {AlertService} from 'app/services/alert/alert.service'; -import {WorkbasketDefinition} from 'app/models/workbasket-definition'; -import {AlertModel, AlertType} from 'app/models/alert'; -import {TaskanaDate} from 'app/shared/util/taskana.date'; -import {ErrorModel} from 'app/models/modal-error'; -import {ErrorModalService} from 'app/services/errorModal/error-modal.service'; +import { Injectable } from '@angular/core'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { environment } from 'app/../environments/environment'; +import { saveAs } from 'file-saver/FileSaver'; +import { AlertService } from 'app/services/alert/alert.service'; +import { WorkbasketDefinition } from 'app/models/workbasket-definition'; +import { AlertModel, AlertType } from 'app/models/alert'; +import { TaskanaDate } from 'app/shared/util/taskana.date'; +import { ErrorModel } from 'app/models/modal-error'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; @Injectable() export class WorkbasketDefinitionService { url: string = environment.taskanaRestUrl + '/v1/workbasketdefinitions'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; - - constructor(private httpClient: HttpClient, private alertService: AlertService, - private errorModalService: ErrorModalService) { - } + private errorModalService: ErrorModalService) { + } // GET exportWorkbaskets(domain: string) { domain = (domain === '' ? '' : '?domain=' + domain); - this.httpClient.get(this.url + domain, this.httpOptions).subscribe( + this.httpClient.get(this.url + domain).subscribe( response => { - saveAs(new Blob([JSON.stringify(response)], {type: 'text/plain;charset=utf-8'}), + saveAs(new Blob([JSON.stringify(response)], { type: 'text/plain;charset=utf-8' }), 'Workbaskets_' + TaskanaDate.getDate() + '.json'); } ); @@ -40,10 +32,10 @@ export class WorkbasketDefinitionService { // POST importWorkbasketDefinitions(workbasketDefinitions: any) { this.httpClient.post(environment.taskanaRestUrl + '/v1/workbasketdefinitions/import', - JSON.parse(workbasketDefinitions), this.httpOptions).subscribe( - workbasketsUpdated => this.alertService.triggerAlert(new AlertModel(AlertType.SUCCESS, 'Import was successful')), - error => this.errorModalService.triggerError(new ErrorModel( - `There was an error importing workbaskets`, error.message)) - ); + JSON.parse(workbasketDefinitions)).subscribe( + workbasketsUpdated => this.alertService.triggerAlert(new AlertModel(AlertType.SUCCESS, 'Import was successful')), + error => this.errorModalService.triggerError(new ErrorModel( + `There was an error importing workbaskets`, error.message)) + ); } } diff --git a/web/src/app/administration/services/workbasket/workbasket.service.ts b/web/src/app/administration/services/workbasket/workbasket.service.ts index 8b6c9b6cf..ce5bc11b6 100644 --- a/web/src/app/administration/services/workbasket/workbasket.service.ts +++ b/web/src/app/administration/services/workbasket/workbasket.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; import { Subject } from 'rxjs/Subject'; import { environment } from 'app/../environments/environment'; @@ -43,12 +43,6 @@ export class WorkbasketService { // Domain readonly DOMAIN = 'domain'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; page = 1; pageSize = 9; @@ -86,7 +80,7 @@ export class WorkbasketService { `${environment.taskanaRestUrl}/v1/workbaskets/${this.getWorkbasketSummaryQueryParameters( sortBy, order, name, nameLike, descLike, owner, ownerLike, type, key, keyLike, requiredPermission, - !allPages ? this.page : undefined, !allPages ? this.pageSize : undefined, domain)}`, this.httpOptions) + !allPages ? this.page : undefined, !allPages ? this.pageSize : undefined, domain)}`) .do(workbaskets => { return workbaskets; }); @@ -96,51 +90,50 @@ export class WorkbasketService { } // GET getWorkBasket(id: string): Observable { - return this.httpClient.get(`${environment.taskanaRestUrl}/v1/workbaskets/${id}`, this.httpOptions); + return this.httpClient.get(`${environment.taskanaRestUrl}/v1/workbaskets/${id}`); } // POST createWorkbasket(workbasket: Workbasket): Observable { return this.httpClient - .post(`${environment.taskanaRestUrl}/v1/workbaskets`, workbasket, this.httpOptions); + .post(`${environment.taskanaRestUrl}/v1/workbaskets`, workbasket); } // PUT updateWorkbasket(url: string, workbasket: Workbasket): Observable { return this.httpClient - .put(url, workbasket, this.httpOptions) + .put(url, workbasket) .catch(this.handleError); } // DELETE deleteWorkbasket(url: string) { - return this.httpClient.delete(url, this.httpOptions); + return this.httpClient.delete(url); } // GET getWorkBasketAccessItems(url: string): Observable { - return this.httpClient.get(url, this.httpOptions); + return this.httpClient.get(url); } // POST createWorkBasketAccessItem(url: string, workbasketAccessItem: WorkbasketAccessItems): Observable { - return this.httpClient.post(url, workbasketAccessItem, this.httpOptions); + return this.httpClient.post(url, workbasketAccessItem); } // PUT updateWorkBasketAccessItem(url: string, workbasketAccessItem: Array): Observable { return this.httpClient.put(url, - workbasketAccessItem, - this.httpOptions); + workbasketAccessItem); } // GET getWorkBasketsDistributionTargets(url: string): Observable { - return this.httpClient.get(url, this.httpOptions); + return this.httpClient.get(url); } // PUT updateWorkBasketsDistributionTargets(url: string, distributionTargetsIds: Array): Observable { - return this.httpClient.put(url, distributionTargetsIds, this.httpOptions); + return this.httpClient.put(url, distributionTargetsIds); } // DELETE removeDistributionTarget(url: string) { - return this.httpClient.delete(url, this.httpOptions); + return this.httpClient.delete(url); } @@ -214,5 +207,6 @@ export class WorkbasketService { return Observable.throw(errMsg); } + // #endregion } diff --git a/web/src/app/administration/workbasket/details/workbasket-details.component.html b/web/src/app/administration/workbasket/details/workbasket-details.component.html index c83676a5e..747b75d2f 100644 --- a/web/src/app/administration/workbasket/details/workbasket-details.component.html +++ b/web/src/app/administration/workbasket/details/workbasket-details.component.html @@ -1,6 +1,6 @@
- +
-
+
-
+ +
Administration
Workbaskets
- Classifications + Classifications
-
+
Monitor
diff --git a/web/src/app/components/nav-bar/nav-bar.component.scss b/web/src/app/components/nav-bar/nav-bar.component.scss index 762be0b88..d4fe1c452 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.scss +++ b/web/src/app/components/nav-bar/nav-bar.component.scss @@ -10,6 +10,10 @@ $selected-border-color: #22a39f; .navbar-toggle{ margin-right: 0px; + +} +button.navbar-toggle:hover > span{ + color:$selected-border-color; } ul.nav > p { white-space: nowrap; @@ -29,7 +33,6 @@ svg-icon.logo { padding: 6px 5px 5px 5px; } - h2.navbar-brand{ vertical-align: middle; text-decoration: none; @@ -67,8 +70,7 @@ h2.navbar-brand{ .nav-content{ - margin-top: 25px; - margin-left: 8px; + margin-top: 5px; } /* diff --git a/web/src/app/components/nav-bar/nav-bar.component.spec.ts b/web/src/app/components/nav-bar/nav-bar.component.spec.ts index e277b03fe..5a9b830fd 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.spec.ts +++ b/web/src/app/components/nav-bar/nav-bar.component.spec.ts @@ -3,16 +3,28 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { HttpClientModule } from '@angular/common/http'; +import { SharedModule } from 'app/shared/shared.module'; +import { Observable } from 'rxjs/Observable'; + import { NavBarComponent } from './nav-bar.component'; +import { UserInformationComponent } from 'app/components/user-information/user-information.component'; import { SelectedRouteService } from 'app/services/selected-route/selected-route'; import { DomainService } from 'app/services/domain/domain.service'; import { DomainServiceMock } from 'app/services/domain/domain.service.mock'; +import { BusinessAdminGuard } from 'app/guards/business-admin-guard'; +import { MonitorGuard } from 'app/guards/monitor-guard'; +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { WindowRefService } from 'app/services/window/window.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; + +import { UserInfoModel } from 'app/models/user-info'; describe('NavBarComponent', () => { let component: NavBarComponent; let fixture: ComponentFixture; - let debugElement, navBar; + let debugElement, navBar, taskanaEngineService; const routes: Routes = [ { path: 'classifications', component: NavBarComponent } @@ -20,16 +32,23 @@ describe('NavBarComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [NavBarComponent], + declarations: [NavBarComponent, UserInformationComponent], imports: [ AngularSvgIconModule, HttpClientModule, RouterTestingModule.withRoutes(routes), + SharedModule ], providers: [SelectedRouteService, { provide: DomainService, useClass: DomainServiceMock - }] + }, + BusinessAdminGuard, + MonitorGuard, + TaskanaEngineService, + WindowRefService, + ErrorModalService, + RequestInProgressService] }) .compileComponents(); })); @@ -39,6 +58,8 @@ describe('NavBarComponent', () => { component = fixture.componentInstance; debugElement = fixture.debugElement.nativeElement; navBar = fixture.debugElement.componentInstance; + taskanaEngineService = TestBed.get(TaskanaEngineService); + spyOn(taskanaEngineService, 'getUserInformation').and.returnValue(Observable.of(new UserInfoModel)); fixture.detectChanges(); }); diff --git a/web/src/app/components/nav-bar/nav-bar.component.ts b/web/src/app/components/nav-bar/nav-bar.component.ts index 7c41774e4..6da709ca2 100644 --- a/web/src/app/components/nav-bar/nav-bar.component.ts +++ b/web/src/app/components/nav-bar/nav-bar.component.ts @@ -4,7 +4,9 @@ import { SelectedRouteService } from 'app/services/selected-route/selected-route import { Subscription } from 'rxjs/Subscription'; import { trigger, state, style, transition, keyframes, animate } from '@angular/animations'; import { DomainService } from 'app/services/domain/domain.service'; - +import { BusinessAdminGuard } from 'app/guards/business-admin-guard'; +import { MonitorGuard } from 'app/guards/monitor-guard'; +import { WindowRefService } from 'app/services/window/window.service'; @Component({ selector: 'taskana-nav-bar', templateUrl: './nav-bar.component.html', @@ -38,11 +40,17 @@ export class NavBarComponent implements OnInit, OnDestroy { monitorUrl = './monitor'; workplaceUrl = './workplace'; + administrationAccess = false; + monitorAccess = false; + selectedRouteSubscription: Subscription; constructor( private selectedRouteService: SelectedRouteService, - private domainService: DomainService) { } + private domainService: DomainService, + private businessAdminGuard: BusinessAdminGuard, + private monitorGuard: MonitorGuard, + private window: WindowRefService) { } ngOnInit() { this.selectedRouteSubscription = this.selectedRouteService.getSelectedRoute().subscribe((value: string) => { @@ -56,6 +64,13 @@ export class NavBarComponent implements OnInit, OnDestroy { this.domainService.getSelectedDomain().subscribe(domain => { this.selectedDomain = domain; }); + + this.businessAdminGuard.canActivate().subscribe(hasAccess => { + this.administrationAccess = hasAccess + }); + this.monitorGuard.canActivate().subscribe(hasAccess => { + this.monitorAccess = hasAccess + }); } switchDomain(domain) { @@ -65,6 +80,12 @@ export class NavBarComponent implements OnInit, OnDestroy { toogleNavBar() { this.showNavbar = !this.showNavbar; } + + + logout() { + this.window.nativeWindow.location.href = environment.taskanaRestUrl + '/login?logout'; + } + private setTitle(value: string = 'workbaskets') { if (value.indexOf('workbaskets') === 0 || value.indexOf('classifications') === 0) { this.title = this.titleAdministration; diff --git a/web/src/app/components/user-information/user-information.component.html b/web/src/app/components/user-information/user-information.component.html new file mode 100644 index 000000000..334d18327 --- /dev/null +++ b/web/src/app/components/user-information/user-information.component.html @@ -0,0 +1,16 @@ +
+
+
+ +
+
+ +
+ {{roles}} +
+
\ No newline at end of file diff --git a/web/src/app/components/user-information/user-information.component.scss b/web/src/app/components/user-information/user-information.component.scss new file mode 100644 index 000000000..db9208a1f --- /dev/null +++ b/web/src/app/components/user-information/user-information.component.scss @@ -0,0 +1,68 @@ +.big { + width: 64px; + height: 64px; +} + +.user-info { + margin-top:85px; + > span { + margin: 0 15px 0 15px; + font-size: 20px; + font-family: inherit; + font-weight: 500; + line-height: 1.1; + } + +} + +.icon, { + width: 100%; + position: relative; + & > .icon-wrap { + border-radius: 50%; + border: solid 3px #22a39f; + width: 74px; + height: 74px; + overflow: hidden; + background-color: #175263; + position: absolute; + -webkit-box-shadow: 0px 3px 3px #416b6a; + -moz-box-shadow: 0px 3px 3px #416b6a; + box-shadow: 0px 3px 3px #416b6a; + + &> svg-icon { + border-radius: 50%; + overflow: hidden; + background-color: white; + position: absolute; + margin:2px + } + } +} + +.icon:before { content: ''; + position: absolute; + border-bottom: solid 3px #22a39f; + width: 100%; + height: 60px; + transform: translateY(-33%); + -webkit-box-shadow: 0px 3px 3px #416b6a; + -moz-box-shadow: 0px 3px 3px #416b6a; + box-shadow: 0px 3px 3px #416b6a; +} + +button.transparent, { + border: none; + background-color: transparent; + &:hover{ + border: none; + background-color: transparent; + color:#22a39f + } + &:focus{ + border: none; + background-color: transparent; + outline: none; + color:white + } +} diff --git a/web/src/app/components/user-information/user-information.component.spec.ts b/web/src/app/components/user-information/user-information.component.spec.ts new file mode 100644 index 000000000..077405e3a --- /dev/null +++ b/web/src/app/components/user-information/user-information.component.spec.ts @@ -0,0 +1,37 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { AngularSvgIconModule } from 'angular-svg-icon'; +import { HttpClientModule } from '@angular/common/http'; +import { Observable } from 'rxjs/Observable'; +import { HttpModule } from '@angular/http'; + +import { UserInformationComponent } from './user-information.component'; + +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { UserInfoModel } from 'app/models/user-info'; + +describe('UserInformationComponent', () => { + let component: UserInformationComponent; + let fixture: ComponentFixture; + let taskanaEngineService; + beforeEach(async(() => { + TestBed.configureTestingModule({ + imports: [AngularSvgIconModule, + HttpClientModule, HttpModule], + declarations: [UserInformationComponent], + providers: [TaskanaEngineService] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(UserInformationComponent); + component = fixture.componentInstance; + taskanaEngineService = TestBed.get(TaskanaEngineService); + spyOn(taskanaEngineService, 'getUserInformation').and.returnValue(Observable.of(new UserInfoModel)); + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/components/user-information/user-information.component.ts b/web/src/app/components/user-information/user-information.component.ts new file mode 100644 index 000000000..e8aacea77 --- /dev/null +++ b/web/src/app/components/user-information/user-information.component.ts @@ -0,0 +1,40 @@ +import { Component, OnInit } from '@angular/core'; +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; +import { UserInfoModel } from 'app/models/user-info'; +import { trigger, transition, animate, keyframes, style } from '@angular/animations'; + +@Component({ + selector: 'taskana-user-information', + templateUrl: './user-information.component.html', + styleUrls: ['./user-information.component.scss'], + animations: [ + trigger('toggle', [ + transition('void => *', animate('300ms ease-in', keyframes([ + style({ opacity: 0, height: '0px' }), + style({ opacity: 1, height: '10px' }), + style({ opacity: 1, height: '*' })]))), + transition('* => void', animate('300ms ease-out', keyframes([ + style({ opacity: 1, height: '*' }), + style({ opacity: 0, height: '10px' }), + style({ opacity: 0, height: '0px' })]))) + ] + )], +}) +export class UserInformationComponent implements OnInit { + + userInformation: UserInfoModel; + roles = ''; + showRoles = false; + constructor(private taskanaEngineService: TaskanaEngineService) { } + + ngOnInit() { + this.taskanaEngineService.getUserInformation().subscribe(userInfo => { + this.userInformation = userInfo; + this.roles = '[' + userInfo.roles.join(',') + ']'; + }) + } + + toogleRoles() { + this.showRoles = !this.showRoles; + } +} diff --git a/web/src/app/guards/admin-guard.ts b/web/src/app/guards/admin-guard.ts new file mode 100644 index 000000000..d21a9513e --- /dev/null +++ b/web/src/app/guards/admin-guard.ts @@ -0,0 +1,37 @@ +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { CanActivate, Router } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { DomainService } from 'app/services/domain/domain.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { ErrorModel } from 'app/models/modal-error'; +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; + +@Injectable() +export class AdminGuard implements CanActivate { + constructor(private taskanaEngineService: TaskanaEngineService, public router: Router) { } + + canActivate() { + return this.taskanaEngineService.getUserInformation().map(userInfo => { + if (userInfo.roles.length === 0) { + return this.navigateToWorplace(); + } + const adminRole = userInfo.roles.find(role => { + if (role === 'ADMIN') { + return true; + } + }); + if (adminRole) { + return true; + } + return this.navigateToWorplace(); + }).catch(() => { + return Observable.of(this.navigateToWorplace()) + }); + } + + navigateToWorplace(): boolean { + this.router.navigate(['workplace']); + return false + } +} diff --git a/web/src/app/guards/business-admin-guard.ts b/web/src/app/guards/business-admin-guard.ts new file mode 100644 index 000000000..b1fd56379 --- /dev/null +++ b/web/src/app/guards/business-admin-guard.ts @@ -0,0 +1,38 @@ +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { CanActivate, Router } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { DomainService } from 'app/services/domain/domain.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { ErrorModel } from 'app/models/modal-error'; +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; + +@Injectable() +export class BusinessAdminGuard implements CanActivate { + constructor(private taskanaEngineService: TaskanaEngineService, public router: Router) { } + + canActivate() { + return this.taskanaEngineService.getUserInformation().map(userInfo => { + if (userInfo.roles.length === 0) { + return this.navigateToWorplace(); + } + const adminRole = userInfo.roles.find(role => { + if (role === 'BUSINESS_ADMIN' || role === 'ADMIN' ) { + return true; + } + }); + if (adminRole) { + return true; + } + return this.navigateToWorplace(); + }).catch(() => { + + return Observable.of(this.navigateToWorplace()) + }); + } + + navigateToWorplace(): boolean { + this.router.navigate(['workplace']); + return false + } +} diff --git a/web/src/app/guards/monitor-guard.ts b/web/src/app/guards/monitor-guard.ts new file mode 100644 index 000000000..37f3eaf51 --- /dev/null +++ b/web/src/app/guards/monitor-guard.ts @@ -0,0 +1,38 @@ +import { Observable } from 'rxjs/Observable'; +import { HttpClient } from '@angular/common/http'; +import { CanActivate, Router } from '@angular/router'; +import { Injectable } from '@angular/core'; +import { DomainService } from 'app/services/domain/domain.service'; +import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; +import { ErrorModel } from 'app/models/modal-error'; +import { TaskanaEngineService } from 'app/services/taskana-engine/taskana-engine.service'; + +@Injectable() +export class MonitorGuard implements CanActivate { + constructor(private taskanaEngineService: TaskanaEngineService, public router: Router) { } + + canActivate() { + return this.taskanaEngineService.getUserInformation().map(userInfo => { + if (userInfo.roles.length === 0) { + return this.navigateToWorplace(); + } + const adminRole = userInfo.roles.find(role => { + if (role === 'MONITOR' || role === 'ADMIN' ) { + return true; + } + }); + if (adminRole) { + return true; + } + return this.navigateToWorplace(); + }).catch(() => { + + return Observable.of(this.navigateToWorplace()) + }); + } + + navigateToWorplace(): boolean { + this.router.navigate(['workplace']); + return false + } +} diff --git a/web/src/app/models/user-info.ts b/web/src/app/models/user-info.ts new file mode 100644 index 000000000..c0dfeaeae --- /dev/null +++ b/web/src/app/models/user-info.ts @@ -0,0 +1,8 @@ + +export class UserInfoModel { + constructor( + public userId: string = undefined, + public groupIds: Array = [], + public roles: Array = []) { }; + +} diff --git a/web/src/app/monitor/services/restConnector/rest-connector.service.ts b/web/src/app/monitor/services/restConnector/rest-connector.service.ts index 9267454c3..813ef2ef6 100644 --- a/web/src/app/monitor/services/restConnector/rest-connector.service.ts +++ b/web/src/app/monitor/services/restConnector/rest-connector.service.ts @@ -7,29 +7,22 @@ import { WorkbasketCounter } from 'app/monitor/models/workbasket-counter'; @Injectable() export class RestConnectorService { - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/hal+json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; + constructor(private httpClient: HttpClient) { } getTaskStatistics(): Observable { - return this.httpClient.get>(environment.taskanaRestUrl + '/v1/monitor/countByState?states=READY,CLAIMED,COMPLETED', - this.httpOptions) + return this.httpClient.get>(environment.taskanaRestUrl + '/v1/monitor/countByState?states=READY,CLAIMED,COMPLETED') } getWorkbasketStatistics(): Observable { return this.httpClient.get(environment.taskanaRestUrl - + '/v1/monitor/taskcountByWorkbasketDaysAndState?daysInPast=5&states=READY,CLAIMED,COMPLETED', - this.httpOptions) + + '/v1/monitor/taskcountByWorkbasketDaysAndState?daysInPast=5&states=READY,CLAIMED,COMPLETED') } getTaskStatusReport(): Observable { - return this.httpClient.get(environment.taskanaRestUrl + '/v1/monitor/taskStatusReport', this.httpOptions) + return this.httpClient.get(environment.taskanaRestUrl + '/v1/monitor/taskStatusReport') } } diff --git a/web/src/app/services/domain/domain.service.ts b/web/src/app/services/domain/domain.service.ts index f4ff73586..24d7ab654 100644 --- a/web/src/app/services/domain/domain.service.ts +++ b/web/src/app/services/domain/domain.service.ts @@ -13,12 +13,6 @@ export class DomainService { url = environment.taskanaRestUrl + '/v1/domains'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; private domainSelectedValue; private domainSelected = new BehaviorSubject(''); private domainSwitched = new Subject(); @@ -33,7 +27,7 @@ export class DomainService { // GET getDomains(forceRefresh = false): Observable { if (!this.dataObs$.observers.length || forceRefresh) { - this.httpClient.get(this.url, this.httpOptions).subscribe( + this.httpClient.get(this.url).subscribe( domains => { this.dataObs$.next(domains); if (!this.domainSelectedValue && domains && domains.length > 0) { diff --git a/web/src/app/services/permission/permission.service.spec.ts b/web/src/app/services/permission/permission.service.spec.ts deleted file mode 100644 index 10cd9fdcb..000000000 --- a/web/src/app/services/permission/permission.service.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { TestBed, inject } from '@angular/core/testing'; - -import { PermissionService } from './permission.service'; - -describe('PermissionService', () => { - beforeEach(() => { - TestBed.configureTestingModule({ - providers: [PermissionService] - }); - }); - - it('should be created', inject([PermissionService], (service: PermissionService) => { - expect(service).toBeTruthy(); - })); -}); diff --git a/web/src/app/services/permission/permission.service.ts b/web/src/app/services/permission/permission.service.ts deleted file mode 100644 index 3a6ec72f0..000000000 --- a/web/src/app/services/permission/permission.service.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs/Observable'; -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; - -@Injectable() -export class PermissionService { - - private permission = new BehaviorSubject(true); - - - setPermission(permission: boolean) { - this.permission.next(permission); - } - - hasPermission(): Observable { - return this.permission.asObservable(); - } -} diff --git a/web/src/app/services/startup-service/startup.service.ts b/web/src/app/services/startup-service/startup.service.ts index f46ed7afb..7cfa57b18 100644 --- a/web/src/app/services/startup-service/startup.service.ts +++ b/web/src/app/services/startup-service/startup.service.ts @@ -2,20 +2,23 @@ import { Observable } from 'rxjs/Observable'; import { HttpClient } from '@angular/common/http'; import { CanActivate } from '@angular/router'; import { environment } from 'app/../environments/environment'; -import { Injectable } from '@angular/core'; +import { Injectable, Inject } from '@angular/core'; import { TitlesService } from 'app/services/titles/titles.service'; import { CustomFieldsService } from 'app/services/custom-fields/custom-fields.service'; - @Injectable() export class StartupService { + + constructor( private httpClient: HttpClient, private titlesService: TitlesService, private customFieldsService: CustomFieldsService) { } + load(): Promise { return this.loadEnvironment(); } + private loadEnvironment() { return this.httpClient.get('environments/data-sources/environment-information.json').map(jsonFile => { if (jsonFile) { diff --git a/web/src/app/services/taskana-engine/taskana-engine.service.ts b/web/src/app/services/taskana-engine/taskana-engine.service.ts new file mode 100644 index 000000000..ee85735ab --- /dev/null +++ b/web/src/app/services/taskana-engine/taskana-engine.service.ts @@ -0,0 +1,32 @@ +import { Injectable } from '@angular/core'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { Observable } from 'rxjs/Observable'; +import { environment } from 'environments/environment'; +import { UserInfoModel } from 'app/models/user-info'; +import { ReplaySubject } from 'rxjs/ReplaySubject'; + + +@Injectable() +export class TaskanaEngineService { + + private dataObs$ = new ReplaySubject(1); + + constructor( + private httpClient: HttpClient + ) { } + + // GET + getUserInformation(forceRefresh = false): Observable { + if (!this.dataObs$.observers.length || forceRefresh) { + this.httpClient.get(`${environment.taskanaRestUrl}/v1/current-user-info`).subscribe( + data => this.dataObs$.next(data), + error => { + this.dataObs$.error(error); + this.dataObs$ = new ReplaySubject(1); + } + ); + } + return this.dataObs$; + } + +} diff --git a/web/src/app/services/window/window.service.ts b/web/src/app/services/window/window.service.ts new file mode 100644 index 000000000..5d4c14a4d --- /dev/null +++ b/web/src/app/services/window/window.service.ts @@ -0,0 +1,18 @@ +import { Injectable } from '@angular/core'; + +// This interface is optional, showing how you can add strong typings for custom globals. +// Just use "Window" as the type if you don't have custom global stuff +export interface IWindowService extends Window { + __custom_global_stuff: string; +} + +function getWindow (): any { + return window; +} + +@Injectable() +export class WindowRefService { + get nativeWindow (): IWindowService { + return getWindow(); + } +} diff --git a/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts b/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts similarity index 79% rename from web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts rename to web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts index b7fd58cbb..d5dc6b0fe 100644 --- a/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.spec.ts +++ b/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.spec.ts @@ -3,7 +3,6 @@ import { HttpClientModule } from '@angular/common/http'; import { HttpModule } from '@angular/http'; import { HttpClientInterceptor } from './http-client-interceptor.service'; -import { PermissionService } from 'app/services/permission/permission.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; @@ -11,7 +10,7 @@ describe('HttpExtensionService', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [HttpClientModule, HttpModule], - providers: [HttpClientInterceptor, PermissionService, ErrorModalService, RequestInProgressService] + providers: [HttpClientInterceptor, ErrorModalService, RequestInProgressService] }); }); diff --git a/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts b/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts similarity index 74% rename from web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts rename to web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts index 910b51f2b..dbc6caeeb 100644 --- a/web/src/app/services/httpClientInterceptor/http-client-interceptor.service.ts +++ b/web/src/app/shared/services/httpClientInterceptor/http-client-interceptor.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse } from '@angular/common/http'; +import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpErrorResponse, HttpHeaders } from '@angular/common/http'; import { Observable } from 'rxjs/Observable'; import 'rxjs/add/operator/catch'; import 'rxjs/add/observable/throw'; @@ -7,28 +7,31 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { ErrorModel } from 'app/models/modal-error'; -import { PermissionService } from 'app/services/permission/permission.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; +import { environment } from 'environments/environment'; @Injectable() export class HttpClientInterceptor implements HttpInterceptor { constructor( - private permissionService: PermissionService, private errorModalService: ErrorModalService, private requestInProgressService: RequestInProgressService) { } intercept(req: HttpRequest, next: HttpHandler): Observable> { + req = req.clone({ headers: req.headers.set('Content-Type', 'application/hal+json') }); + if (!environment.production) { + req = req.clone({ headers: req.headers.set('Authorization', 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x') }); + } return next.handle(req).do(event => { - this.permissionService.setPermission(true); }, err => { this.requestInProgressService.setRequestInProgress(false); if (err instanceof HttpErrorResponse && (err.status === 401 || err.status === 403)) { - this.permissionService.setPermission(false) + this.errorModalService.triggerError( + new ErrorModel('You have no access to this resource ', err)); } else if (err instanceof HttpErrorResponse && (err.status === 404) && err.url.indexOf('environment-information.json')) { // ignore this error message } else { diff --git a/web/src/app/shared/shared.module.ts b/web/src/app/shared/shared.module.ts index 14ec5a26e..048b542c7 100644 --- a/web/src/app/shared/shared.module.ts +++ b/web/src/app/shared/shared.module.ts @@ -1,7 +1,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { HttpClientModule } from '@angular/common/http'; +import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { AlertModule } from 'ngx-bootstrap'; import { RouterModule } from '@angular/router'; @@ -22,6 +22,7 @@ import { SelectWorkBasketPipe } from './pipes/selectedWorkbasket/seleted-workbas import { SpreadNumberPipe } from './pipes/spreadNumber/spread-number'; import { OrderBy } from './pipes/orderBy/orderBy'; import { MapToIterable } from './pipes/mapToIterable/mapToIterable'; +import { HttpClientInterceptor } from './services/httpClientInterceptor/http-client-interceptor.service'; const MODULES = [ @@ -51,7 +52,14 @@ const DECLARATIONS = [ @NgModule({ declarations: DECLARATIONS, imports: MODULES, - exports: DECLARATIONS + exports: DECLARATIONS, + providers: [ + { + provide: HTTP_INTERCEPTORS, + useClass: HttpClientInterceptor, + multi: true + } + ] }) export class SharedModule { } diff --git a/web/src/app/workplace/services/custom-http-interceptor/custom-http-interceptor.service.ts b/web/src/app/workplace/services/custom-http-interceptor/custom-http-interceptor.service.ts new file mode 100644 index 000000000..a0f21e270 --- /dev/null +++ b/web/src/app/workplace/services/custom-http-interceptor/custom-http-interceptor.service.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { HttpEvent, HttpInterceptor, HttpHandler, HttpRequest, HttpHeaders } from '@angular/common/http'; +import { Observable } from 'rxjs/Observable'; + +import { environment } from 'environments/environment'; + +@Injectable() +export class CustomHttpClientInterceptor implements HttpInterceptor { + + constructor() { + } + + intercept(req: HttpRequest, next: HttpHandler): Observable> { + if (!environment.production) { + req = req.clone({ headers: req.headers.set('Authorization', 'Basic YWRtaW46YWRtaW4=') }); + } + return next.handle(req); + } +} diff --git a/web/src/app/workplace/services/task.service.ts b/web/src/app/workplace/services/task.service.ts index 6caca48ad..03f3a69a6 100644 --- a/web/src/app/workplace/services/task.service.ts +++ b/web/src/app/workplace/services/task.service.ts @@ -8,35 +8,27 @@ import { environment } from 'app/../environments/environment'; export class TaskService { url = environment.taskanaRestUrl + '/v1/tasks'; - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/hal+json', - 'Authorization': 'Basic YWRtaW46YWRtaW4=', - 'user': 'user_1_1' - }) - }; - constructor(private httpClient: HttpClient) { } findTaskWithWorkbaskets(basketKey: string): Observable { - return this.httpClient.get(this.url + '?workbasketId=' + basketKey, this.httpOptions); + return this.httpClient.get(this.url + '?workbasketId=' + basketKey); } getTask(id: string): Observable { - return this.httpClient.get(this.url + '/' + id, this.httpOptions); + return this.httpClient.get(this.url + '/' + id); } completeTask(id: string): Observable { - return this.httpClient.post(this.url + '/' + id + '/complete', '', this.httpOptions); + return this.httpClient.post(this.url + '/' + id + '/complete', ''); } claimTask(id: string): Observable { - return this.httpClient.post(this.url + '/' + id + '/claim', 'test', this.httpOptions); + return this.httpClient.post(this.url + '/' + id + '/claim', 'test'); } transferTask(taskId: string, workbasketKey: string): Observable { return this.httpClient.post(this.url + '/' + taskId - + '/transfer/' + workbasketKey, '', this.httpOptions); + + '/transfer/' + workbasketKey, ''); } } diff --git a/web/src/app/workplace/services/workbasket.service.ts b/web/src/app/workplace/services/workbasket.service.ts index 94b701507..2a05fbcff 100644 --- a/web/src/app/workplace/services/workbasket.service.ts +++ b/web/src/app/workplace/services/workbasket.service.ts @@ -1,25 +1,17 @@ -import {Injectable} from '@angular/core'; +import { Injectable } from '@angular/core'; -import {Workbasket} from 'app/models/workbasket'; -import {environment} from 'app/../environments/environment'; -import {Observable} from 'rxjs/Observable'; -import {HttpClient, HttpHeaders} from '@angular/common/http'; +import { Workbasket } from 'app/models/workbasket'; +import { environment } from 'app/../environments/environment'; +import { Observable } from 'rxjs/Observable'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; @Injectable() export class WorkbasketService { url = environment.taskanaRestUrl + '/v1/workbaskets'; - - httpOptions = { - headers: new HttpHeaders({ - 'Content-Type': 'application/hal+json', - 'Authorization': 'Basic VEVBTUxFQURfMTpURUFNTEVBRF8x' - }) - }; - constructor(private httpClient: HttpClient) { } getAllWorkBaskets(): Observable { - return this.httpClient.get(this.url + '?required-permission=OPEN', this.httpOptions); + return this.httpClient.get(this.url + '?required-permission=OPEN'); } } diff --git a/web/src/app/workplace/workplace.module.ts b/web/src/app/workplace/workplace.module.ts index cfcaab66f..764443e75 100644 --- a/web/src/app/workplace/workplace.module.ts +++ b/web/src/app/workplace/workplace.module.ts @@ -2,10 +2,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { Ng2AutoCompleteModule } from 'ng2-auto-complete'; -import { HttpClientModule } from '@angular/common/http'; +import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { AngularSvgIconModule } from 'angular-svg-icon'; import { WorkplaceRoutingModule } from './workplace-routing.module'; import { AlertModule } from 'ngx-bootstrap'; +import { SharedModule } from 'app/shared/shared.module'; import { WorkplaceComponent } from './workplace.component'; import { SelectorComponent } from './workbasket-selector/workbasket-selector.component'; @@ -19,6 +20,8 @@ import { OrderTasksByPipe } from './util/orderTasksBy.pipe'; import { DataService } from './services/data.service'; import { TaskService } from './services/task.service'; import { WorkbasketService } from './services/workbasket.service'; +import { CustomHttpClientInterceptor } from './services/custom-http-interceptor/custom-http-interceptor.service'; + const MODULES = [ CommonModule, @@ -27,7 +30,8 @@ const MODULES = [ HttpClientModule, AngularSvgIconModule, WorkplaceRoutingModule, - AlertModule + AlertModule, + SharedModule ]; const DECLARATIONS = [ @@ -46,7 +50,12 @@ const DECLARATIONS = [ providers: [ DataService, TaskService, - WorkbasketService + WorkbasketService, + { + provide: HTTP_INTERCEPTORS, + useClass: CustomHttpClientInterceptor, + multi: true + }, ] }) export class WorkplaceModule { diff --git a/web/src/assets/_colors.scss b/web/src/assets/_colors.scss index d049716c7..7e5df78fa 100644 --- a/web/src/assets/_colors.scss +++ b/web/src/assets/_colors.scss @@ -3,4 +3,5 @@ $blue: #2e9eca; $green: #246972; $grey: grey; $brown: #f0ad4e; -$invalid: #a94442; \ No newline at end of file +$invalid: #a94442; +$aquamarine: #22a39f; diff --git a/web/src/assets/_site.scss b/web/src/assets/_site.scss index 882a0de35..cf311d4a1 100644 --- a/web/src/assets/_site.scss +++ b/web/src/assets/_site.scss @@ -77,6 +77,13 @@ } } +.blue-green{ + color: $blue-green; + & svg { + fill: $blue-green; + } +} + .green { color: $green; & svg { @@ -112,6 +119,13 @@ } } +.aquamarine { + color: $aquamarine; + & svg { + fill: $aquamarine; + } +} + svg-icon.fa-fw > svg { text-align: center; width: 1.25em; @@ -282,4 +296,5 @@ li.list-group-item:hover, { color: #555; text-decoration: none; background-color: #f5f5f5; -} \ No newline at end of file +} +