diff --git a/backend/src/main/java/ru/micord/ervu/controller/HealthController.java b/backend/src/main/java/ru/micord/ervu/controller/HealthController.java new file mode 100644 index 0000000..219ee4c --- /dev/null +++ b/backend/src/main/java/ru/micord/ervu/controller/HealthController.java @@ -0,0 +1,16 @@ +package ru.micord.ervu.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author gulnaz + */ +@RestController +public class HealthController { + + @GetMapping(value = "/health") + public String health() { + return "healthy"; + } +} diff --git a/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java b/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java index 43236f9..e2bc2b6 100644 --- a/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java +++ b/backend/src/main/java/ru/micord/ervu/security/SecurityConfig.java @@ -31,7 +31,7 @@ import static ru.micord.ervu.security.SecurityConstants.ESIA_LOGOUT; @EnableWebSecurity public class SecurityConfig { private static final String[] PERMIT_ALL = new String[] { - "/version", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout" + "/health", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout" }; @Autowired private JwtAuthenticationFilter jwtAuthenticationFilter; diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index 99cd7e7..a36a0d2 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -14,7 +14,6 @@ import { import {AppHeaderComponent} from "./component/app-header.component"; import {AppFooterComponent} from "./component/app-footer.component"; import {AccessDeniedComponent} from "./component/access-denied.component"; -import {ApplicationVersionComponent} from "./component/application-version.component"; import {RouterModule} from "@angular/router"; import {InternationalPhoneNumberModule} from "ngx-international-phone-number"; import {AppProgressIndicationComponent} from "./component/app-progress-indication.component"; @@ -31,7 +30,6 @@ registerLocaleData(localeRu); export const DIRECTIVES = [ forwardRef(() => AppHeaderComponent), forwardRef(() => AppFooterComponent), - forwardRef(() => ApplicationVersionComponent), forwardRef(() => LogOutComponent), forwardRef(() => AccessDeniedComponent), forwardRef(() => AppProgressIndicationComponent), diff --git a/frontend/src/ts/modules/app/component/application-version.component.ts b/frontend/src/ts/modules/app/component/application-version.component.ts deleted file mode 100644 index a10da22..0000000 --- a/frontend/src/ts/modules/app/component/application-version.component.ts +++ /dev/null @@ -1,24 +0,0 @@ -import {ChangeDetectionStrategy, ChangeDetectorRef, Component, Input} from "@angular/core"; -import {HttpClient} from "@angular/common/http"; - -@Component({ - moduleId: module.id, - selector: "application-version", - templateUrl: "../../../../../src/resources/template/app/component/application_version.html", - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class ApplicationVersionComponent { - @Input() - public applicationVersion: string; - - constructor(private httpClient: HttpClient, private cd: ChangeDetectorRef) { - this.loadAppVersion(); //TODO: check version url - } - - private loadAppVersion() { - this.httpClient.get("version").toPromise().then((version: any) => { - this.applicationVersion = version.number; - this.cd.markForCheck(); - }) - } -} diff --git a/frontend/src/ts/modules/security/authentication.service.ts b/frontend/src/ts/modules/security/authentication.service.ts index 650acd2..f13fe79 100644 --- a/frontend/src/ts/modules/security/authentication.service.ts +++ b/frontend/src/ts/modules/security/authentication.service.ts @@ -13,7 +13,7 @@ export class AuthenticationService { } checkAuthentication(): Promise{ - return this.appConfigService.load().then(() => this.http.get("version").toPromise()) + return this.appConfigService.load(); } logout(): Promise {