12 Commits
Author SHA1 Message Date
vladp d97b7e679f fix type GF_AUTH
Test Workflow / test (push) Successful in 2s
2025-12-08 13:09:31 +07:00
vladp 530477fb75 add healt chekc status
Test Workflow / test (push) Successful in 2s
2025-12-08 12:38:56 +07:00
vladp 6a78475844 Merge remote-tracking branch 'origin/dev' into dev
Test Workflow / test (push) Successful in 1m26s
2025-12-01 11:39:27 +07:00
vladp 8a4b8e49f1 add test workflow 2025-12-01 11:39:15 +07:00
backdev 235ea7143a Удалить .gitea 2025-12-01 12:37:06 +08:00
backdev 520d2df3a9 Добавить .gitea 2025-12-01 12:34:24 +08:00
backdev 3b0803bef3 Удалить job.yaml 2025-12-01 12:33:50 +08:00
backdev 7d17b8d617 Обновить job.yaml 2025-12-01 12:32:06 +08:00
backdev c51608276d Добавить job 2025-12-01 12:31:34 +08:00
backdev f8c6c83c96 Merge pull request 'NCP-2 add logout' (#4) from NCP-2 into dev
Reviewed-on: #4
2025-11-26 12:52:54 +08:00
backdev 27ce3cc9ed Merge pull request 'INFRA-1 add grafana,loki,prometheus' (#3) from INFRA-1 into dev
Reviewed-on: #3
2025-11-26 12:51:30 +08:00
vladp adec554122 NCP-2 add logout 2025-11-25 14:20:28 +07:00
6 changed files with 50 additions and 5 deletions
+17
View File
@@ -0,0 +1,17 @@
name: Test Workflow
on:
push:
jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Print environment variables
run: |
echo "GITHUB_REPOSITORY: $GITHUB_REPOSITORY"
echo "GITHUB_SHA: $GITHUB_SHA"
echo "GITHUB_REF: $GITHUB_REF"
echo "GITHUB_ACTOR: $GITHUB_ACTOR"
echo "PATH: $PATH"
+1 -1
View File
@@ -44,7 +44,7 @@ services:
alloy: alloy:
condition: service_started condition: service_started
environment: environment:
GF_AUTH_ANONYMOUS_ENABLED: true GF_AUTH_ANONYMOUS_ENABLED: "true"
GF_SECURITY_ADMIN_USER: admin GF_SECURITY_ADMIN_USER: admin
GF_SECURITY_ADMIN_PASSWORD: admin GF_SECURITY_ADMIN_PASSWORD: admin
GF_METRICS_ENABLED: "true" GF_METRICS_ENABLED: "true"
@@ -3,10 +3,7 @@ package ru.soune.no_copy.controller;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ru.soune.no_copy.dto.AuthResponse; import ru.soune.no_copy.dto.AuthResponse;
import ru.soune.no_copy.dto.LoginRequest; import ru.soune.no_copy.dto.LoginRequest;
import ru.soune.no_copy.dto.LoginResponse; import ru.soune.no_copy.dto.LoginResponse;
@@ -14,6 +11,8 @@ import ru.soune.no_copy.dto.RegisterRequest;
import ru.soune.no_copy.entity.AuthToken; import ru.soune.no_copy.entity.AuthToken;
import ru.soune.no_copy.service.AuthService; import ru.soune.no_copy.service.AuthService;
import java.util.Map;
@RestController @RestController
@RequestMapping("/api/auth") @RequestMapping("/api/auth")
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -36,4 +35,13 @@ public class AuthController {
return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(), return ResponseEntity.ok(new LoginResponse(true, login.getUser().getEmail(),
login.getToken(),login.getExpiresAt().toString())); login.getToken(),login.getExpiresAt().toString()));
} }
@PostMapping("/logout")
public ResponseEntity<?> logout(@RequestHeader("Authorization") String tokenHeader) {
String token = tokenHeader.replace("Bearer ", "");
authService.logout(token);
return ResponseEntity.ok(Map.of("success", true));
}
} }
@@ -0,0 +1,15 @@
package ru.soune.no_copy.controller;
import org.apache.coyote.Response;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api")
public class HealtCheckController {
@GetMapping("/healt")
public HttpStatus healtCheck() {
return HttpStatus.OK;
}
}
@@ -10,4 +10,5 @@ import java.util.Optional;
@Repository @Repository
public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> { public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter); Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
Optional<AuthToken> findByToken(String token);
} }
@@ -78,6 +78,10 @@ public class AuthService {
return authTokenRepository.save(authToken); return authTokenRepository.save(authToken);
} }
public void logout(String token) {
authTokenRepository.findByToken(token)
.ifPresent(authTokenRepository::delete);
}
private String generateAuthToken() { private String generateAuthToken() {
byte[] bytes = new byte[32]; byte[] bytes = new byte[32];