From cf29b7bfffb720a666e54cdede24dddbf45f96cd Mon Sep 17 00:00:00 2001
From: gulnaz <tarkhanova@micord.ru>
Date: Fri, 16 May 2025 12:12:01 +0300
Subject: [PATCH] Revert "SUPPORT-9170: remove version requests; add health
 endpoint"

This reverts commit 0e379b30
---
 .../ervu/controller/HealthController.java     | 16 -------------
 .../micord/ervu/security/SecurityConfig.java  |  2 +-
 frontend/src/ts/modules/app/app.module.ts     |  2 ++
 .../application-version.component.ts          | 24 +++++++++++++++++++
 .../security/authentication.service.ts        |  2 +-
 5 files changed, 28 insertions(+), 18 deletions(-)
 delete mode 100644 backend/src/main/java/ru/micord/ervu/controller/HealthController.java
 create mode 100644 frontend/src/ts/modules/app/component/application-version.component.ts

diff --git a/backend/src/main/java/ru/micord/ervu/controller/HealthController.java b/backend/src/main/java/ru/micord/ervu/controller/HealthController.java
deleted file mode 100644
index 219ee4c..0000000
--- a/backend/src/main/java/ru/micord/ervu/controller/HealthController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-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 e2bc2b6..43236f9 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[] {
-      "/health", "/esia/url", "/esia/auth", "esia/refresh", "/esia/logout"
+      "/version", "/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 a36a0d2..99cd7e7 100644
--- a/frontend/src/ts/modules/app/app.module.ts
+++ b/frontend/src/ts/modules/app/app.module.ts
@@ -14,6 +14,7 @@ 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";
@@ -30,6 +31,7 @@ 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
new file mode 100644
index 0000000..a10da22
--- /dev/null
+++ b/frontend/src/ts/modules/app/component/application-version.component.ts
@@ -0,0 +1,24 @@
+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 f13fe79..650acd2 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<any>{
-    return this.appConfigService.load();
+    return this.appConfigService.load().then(() => this.http.get<any>("version").toPromise())
   }
 
   logout(): Promise<string> {