+
+ );
+};
+
+export default AuthPage;
diff --git a/rough2.tsx b/rough2.tsx
new file mode 100644
index 0000000..48dcb11
--- /dev/null
+++ b/rough2.tsx
@@ -0,0 +1,121 @@
+import { useContext, useEffect } from "react";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { authClient } from "@/utils/http/clients/authClient.client";
+import AuthContext from "@/context/AuthContext";
+import cdacRoundLogo from '@/assets/cdacroundlogo.png';
+import { getPostLoginRedirect } from "@/utils/postLoginRedirect";
+
+const MAX_REFRESH_RETRIES = 3;
+const RETRY_DELAY_MS = 700;
+const OAUTH_CALLBACK_GUARD_KEY = "auth:oauth-callback-processed";
+
+const wait = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+const OAuthCallback = () => {
+ const navigate = useNavigate();
+ const [searchParams] = useSearchParams();
+ const { loginSuccess } = useContext(AuthContext);
+
+ useEffect(() => {
+ // React StrictMode runs effects twice in development.
+ // Guard prevents a second callback pass from overriding the first successful redirect.
+ if (sessionStorage.getItem(OAUTH_CALLBACK_GUARD_KEY) === "1") {
+ return;
+ }
+ sessionStorage.setItem(OAUTH_CALLBACK_GUARD_KEY, "1");
+
+ const navigateToLoginWithNext = () => {
+ sessionStorage.removeItem(OAUTH_CALLBACK_GUARD_KEY);
+ const next = getPostLoginRedirect();
+ if (next) {
+ navigate(`/login?next=${encodeURIComponent(next)}`, { replace: true });
+ } else {
+ navigate("/login", { replace: true });
+ }
+ };
+
+ const completeLogin = async () => {
+ try {
+ const status = searchParams.get("status");
+ const flow = searchParams.get("flow");
+
+ if (status === "pending" && flow === "admin_register") {
+ navigate("/login?admin_request=pending", { replace: true });
+ return;
+ }
+
+ if (status === "denied" && flow === "admin_login") {
+ navigate("/login?admin_access=denied", { replace: true });
+ return;
+ }
+
+ if (status && status !== "success") {
+ throw new Error(`OAuth callback returned unsupported status: ${status}`);
+ }
+
+ let accessToken: string | null = null;
+ let lastError: unknown = null;
+
+ for (let attempt = 1; attempt <= MAX_REFRESH_RETRIES; attempt++) {
+ try {
+ console.log(`OAuthCallback: refresh attempt ${attempt}/${MAX_REFRESH_RETRIES}`);
+ const res = await authClient.post("/oauth2/authenticated/refresh-token");
+ console.log("OAuthCallback: refresh response:", res && res.data);
+
+ accessToken = res?.data?.data?.accessToken || res?.data?.auth_token || res?.data?.token || null;
+ console.log("OAuthCallback: computed accessToken:", accessToken);
+
+ if (accessToken) break;
+ lastError = new Error("No access token found in refresh response");
+ } catch (error) {
+ lastError = error;
+ console.warn(`OAuthCallback: refresh attempt ${attempt} failed`, {
+ message: (error as any)?.message,
+ status: (error as any)?.response?.status,
+ });
+ }
+
+ if (attempt < MAX_REFRESH_RETRIES) {
+ await wait(RETRY_DELAY_MS * attempt);
+ }
+ }
+
+ if (accessToken) {
+ loginSuccess(accessToken);
+
+ const savedRedirect = getPostLoginRedirect();
+
+ if (savedRedirect && savedRedirect.startsWith("/") && !savedRedirect.startsWith("//")) {
+ navigate(savedRedirect, { replace: true });
+ } else {
+ navigate("/home", { replace: true });
+ }
+ } else {
+ throw lastError || new Error("OAuth callback failed without an access token");
+ }
+ } catch (error) {
+ console.error("Error completing OAuth login:", {
+ message: (error as any)?.message,
+ response: (error as any)?.response?.data,
+ status: (error as any)?.response?.status,
+ });
+ navigateToLoginWithNext();
+ }
+ };
+
+ completeLogin();
+ }, [loginSuccess, navigate, searchParams]);
+
+ return (
+
+
+ */}
+
+
+
+
+ + Welcome Back 👋 +
++ Sign in or create an account with Google +
+ {/*
+
+
+
+
+
+
+ By continuing, you agree to our{" "}
+
+ Terms of Service
+ {" "}
+ and{" "}
+
+ Privacy Policy
+
+
+
+
+ )
+
+};
+
+export default OAuthCallback;
diff --git a/src/main/java/com/cadac/stone_inscription/OAuthDemo.java b/src/main/java/com/cadac/stone_inscription/OAuthDemo.java
index af6cdd8..f59cc7e 100644
--- a/src/main/java/com/cadac/stone_inscription/OAuthDemo.java
+++ b/src/main/java/com/cadac/stone_inscription/OAuthDemo.java
@@ -4,50 +4,62 @@
import org.springframework.security.access.annotation.Secured;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@RestController
-@RequestMapping("/api/v1")
-public class OAuthDemo {
-
- @GetMapping("/")
- public String getMethodName(@RequestParam String param) {
- return "hello ";
- }
-
- @Secured( "user" )
- @GetMapping("/fail")
- public String getfail() {
- return "hello fail ";
- }
-
- @GetMapping("/noauth/check")
- public String noAuth() {
- return "This endpoint does not require authentication.";
- }
-
- // Direct Facebook login endpoint
- @GetMapping("/auth/facebook")
- public String facebookLogin() {
- return "redirect:/oauth2/authorization/facebook";
- }
-
- @Secured({ "admin" })
- @GetMapping("/auth")
- public String auth() {
- return "This endpoint requires authentication.";
- }
-
- @GetMapping("/auth/token")
- public String authToken() {
- return "Authentication successful. You can now access secured endpoints.";
- }
-
- @Secured({ "user", "admin" })
- @GetMapping("/authrole")
- public String authRole() {
- return "This endpoint requires authentication with role.";
- }
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+@RestController
+@RequestMapping("/api/v1")
+@Tag(name = "Authentication", description = "OAuth smoke-test and role-check endpoints.")
+public class OAuthDemo {
+
+ @GetMapping("/")
+ @Operation(summary = "API smoke test", description = "Returns a minimal success message for connectivity checks.")
+ public String getMethodName(@Parameter(description = "Echo parameter placeholder.", example = "ping") @RequestParam String param) {
+ return "hello ";
+ }
+
+ @Secured( "user" )
+ @GetMapping("/fail")
+ @Operation(summary = "User role check", description = "Requires a user role and returns a simple role-check message.")
+ public String getfail() {
+ return "hello fail ";
+ }
+
+ @GetMapping("/noauth/check")
+ @Operation(summary = "Public auth health check", description = "Confirms that public no-auth routes are reachable.")
+ public String noAuth() {
+ return "This endpoint does not require authentication.";
+ }
+
+ // Direct Facebook login endpoint
+ @GetMapping("/auth/facebook")
+ @Operation(summary = "Facebook login redirect marker", description = "Legacy endpoint that returns the Facebook OAuth redirect target as text.")
+ public String facebookLogin() {
+ return "redirect:/oauth2/authorization/facebook";
+ }
+
+ @Secured({ "admin" })
+ @GetMapping("/auth")
+ @Operation(summary = "Admin auth check", description = "Requires an admin role and returns a simple authenticated message.")
+ public String auth() {
+ return "This endpoint requires authentication.";
+ }
+
+ @GetMapping("/auth/token")
+ @Operation(summary = "Token success marker", description = "Returns a text message used after successful authentication flows.")
+ public String authToken() {
+ return "Authentication successful. You can now access secured endpoints.";
+ }
+
+ @Secured({ "user", "admin" })
+ @GetMapping("/authrole")
+ @Operation(summary = "User or admin role check", description = "Requires either user or admin role.")
+ public String authRole() {
+ return "This endpoint requires authentication with role.";
+ }
}
diff --git a/src/main/java/com/cadac/stone_inscription/admin/service/AdminAccessServiceImpl.java b/src/main/java/com/cadac/stone_inscription/admin/service/AdminAccessServiceImpl.java
index 1d56e64..9aba208 100644
--- a/src/main/java/com/cadac/stone_inscription/admin/service/AdminAccessServiceImpl.java
+++ b/src/main/java/com/cadac/stone_inscription/admin/service/AdminAccessServiceImpl.java
@@ -33,7 +33,7 @@ public class AdminAccessServiceImpl implements AdminAccessService {
@Value("${app.backend.url}")
private String backendUrl;
- @Value("${app.frontend.admin.approval-result-url:https://inscriptions.cdacb.in/admin/approval-result}")
+ @Value("${app.frontend.admin.approval-result-url}")
private String approvalResultUrl;
@Value("${admin.approval.token-validity-ms:86400000}")
diff --git a/src/main/java/com/cadac/stone_inscription/api/dto/AccessTokenResponse.java b/src/main/java/com/cadac/stone_inscription/api/dto/AccessTokenResponse.java
new file mode 100644
index 0000000..3b06ed6
--- /dev/null
+++ b/src/main/java/com/cadac/stone_inscription/api/dto/AccessTokenResponse.java
@@ -0,0 +1,18 @@
+package com.cadac.stone_inscription.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+@Schema(name = "AccessTokenResponse", description = "Access token payload returned after refresh-token rotation.")
+public class AccessTokenResponse {
+
+ @Schema(description = "New short-lived JWT access token.", example = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJuser@example.com\"")
+ private String accessToken;
+
+ public String getAccessToken() {
+ return accessToken;
+ }
+
+ public void setAccessToken(String accessToken) {
+ this.accessToken = accessToken;
+ }
+}
diff --git a/src/main/java/com/cadac/stone_inscription/api/dto/ApiErrorResponse.java b/src/main/java/com/cadac/stone_inscription/api/dto/ApiErrorResponse.java
new file mode 100644
index 0000000..a255791
--- /dev/null
+++ b/src/main/java/com/cadac/stone_inscription/api/dto/ApiErrorResponse.java
@@ -0,0 +1,44 @@
+package com.cadac.stone_inscription.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Schema(name = "ApiErrorResponse", description = "Standard error body returned by API exception handlers.")
+public class ApiErrorResponse {
+
+ @Schema(description = "Human-readable error message.", example = "Invalid or missing authorization token")
+ @JsonProperty("error_message")
+ private String errorMessage;
+
+ @Schema(description = "HTTP status reason or numeric status used by the handler.", example = "UNAUTHORIZED")
+ @JsonProperty("http_status")
+ private Object httpStatus;
+
+ @Schema(description = "HTTP status code.", example = "401")
+ @JsonProperty("http_status_code")
+ private Integer httpStatusCode;
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ public void setErrorMessage(String errorMessage) {
+ this.errorMessage = errorMessage;
+ }
+
+ public Object getHttpStatus() {
+ return httpStatus;
+ }
+
+ public void setHttpStatus(Object httpStatus) {
+ this.httpStatus = httpStatus;
+ }
+
+ public Integer getHttpStatusCode() {
+ return httpStatusCode;
+ }
+
+ public void setHttpStatusCode(Integer httpStatusCode) {
+ this.httpStatusCode = httpStatusCode;
+ }
+}
diff --git a/src/main/java/com/cadac/stone_inscription/api/dto/ApiSuccessResponse.java b/src/main/java/com/cadac/stone_inscription/api/dto/ApiSuccessResponse.java
new file mode 100644
index 0000000..783f6e4
--- /dev/null
+++ b/src/main/java/com/cadac/stone_inscription/api/dto/ApiSuccessResponse.java
@@ -0,0 +1,42 @@
+package com.cadac.stone_inscription.api.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Schema(name = "ApiSuccessResponse", description = "Standard success envelope returned by most JSON endpoints.")
+public class ApiSuccessResponse
+ {/* 
+
+ Logging in...
+