Add redirect after login (#98)

* impl * typo
thewca · Feb 5, 2024 · 05432ee · 05432ee
1 parent 3577260
commit 05432ee
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 12 deletions.
diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -113,9 +113,17 @@ function App() {
   useEffect(getStatisticsList, []);
 
   const flatLinks = [...links.flatMap((x) => (x.subItems ? x.subItems : [x]))];
+
+  // Redirect if query parameter is set
+  let params = new URLSearchParams(window.location.search);
+  let redirect =  params.get("redirect");
+  if (redirect) {
+    window.location.href = atob(redirect);
+  }
 
-  return (
-    <BrowserRouter>
+  // Only render the page if we are not being redirected
+  return redirect ? <BrowserRouter></BrowserRouter> : 
+    (<BrowserRouter>
       <div id="page-container">
         <Topbar links={links} statisticsGroups={statisticsList?.list} />
         <div id="content-wrapper">

diff --git a/client/src/main/api/statistics.api.ts b/client/src/main/api/statistics.api.ts
@@ -14,9 +14,9 @@ export class StatisticsApi {
     this.queryDatabaseEndpoint = "/database/query";
   }
 
-  getWcaAuthenticationUrl = (frontendHost: string) =>
+  getWcaAuthenticationUrl = (frontendHost: string, redirect: string) => 
     Axios.get<AuthenticationResponse>(this.BASE_URL + "/wca/authentication", {
-      params: { frontendHost },
+      params: { frontendHost, redirect },
     });
 
   getUserInfo = () => Axios.get<UserInfo>(this.BASE_URL + "/wca/user");

diff --git a/client/src/main/api/wca.api.ts b/client/src/main/api/wca.api.ts
@@ -5,7 +5,9 @@ export class WcaApi {
     // We get the url from the server
     statisticsApi
       .getWcaAuthenticationUrl(
-        window.location.protocol + "//" + window.location.host
+        window.location.protocol + "//" + window.location.host,
+        // Redirect is encoded to base 64 to avoid problems with query strings
+        btoa(window.location.href)
       )
       .then((response) => {
         // Navigante to the url

diff --git a/server/src/main/java/org/worldcubeassociation/statistics/controller/WcaController.java b/server/src/main/java/org/worldcubeassociation/statistics/controller/WcaController.java
@@ -14,7 +14,7 @@
 public interface WcaController {
 
     @GetMapping("authentication")
-    AuthenticationResponse getWcaAuthenticationUrl(@Valid @NotBlank(message = "Frontend can not be blank") @RequestParam String frontendHost);
+    AuthenticationResponse getWcaAuthenticationUrl(@Valid @NotBlank(message = "Frontend can not be blank") @RequestParam String frontendHost, @Valid @NotBlank(message = "Redirect can not be blank") @RequestParam String redirect);
 
     @GetMapping("user")
     UserInfoDTO getUserInfo(@RequestHeader(value = "Authorization", required = false) String token);

diff --git a/.../src/main/java/org/worldcubeassociation/statistics/controller/impl/WcaControllerImpl.java b/.../src/main/java/org/worldcubeassociation/statistics/controller/impl/WcaControllerImpl.java
@@ -16,8 +16,8 @@ public class WcaControllerImpl implements WcaController {
     private WCAService wcaService;
 
     @Override
-    public AuthenticationResponse getWcaAuthenticationUrl(String frontendHost) {
-        return wcaService.getWcaAuthenticationUrl(frontendHost);
+    public AuthenticationResponse getWcaAuthenticationUrl(String frontendHost, String redirect) {
+        return wcaService.getWcaAuthenticationUrl(frontendHost, redirect);
     }
 
     @Override

diff --git a/...er/src/main/java/org/worldcubeassociation/statistics/response/AuthenticationResponse.java b/...er/src/main/java/org/worldcubeassociation/statistics/response/AuthenticationResponse.java
@@ -8,4 +8,5 @@
 public class AuthenticationResponse {
     private String url;
     private String frontendHost;
+    private String redirect;
 }
diff --git a/server/src/main/java/org/worldcubeassociation/statistics/service/WCAService.java b/server/src/main/java/org/worldcubeassociation/statistics/service/WCAService.java
@@ -4,7 +4,7 @@
 import org.worldcubeassociation.statistics.response.AuthenticationResponse;
 
 public interface WCAService {
-    AuthenticationResponse getWcaAuthenticationUrl(String frontendHost);
+    AuthenticationResponse getWcaAuthenticationUrl(String frontendHost, String redirect);
 
     UserInfoDTO getUserInfo(String token);
 }
diff --git a/server/src/main/java/org/worldcubeassociation/statistics/service/impl/WCAServiceImpl.java b/server/src/main/java/org/worldcubeassociation/statistics/service/impl/WCAServiceImpl.java
@@ -20,10 +20,10 @@ public class WCAServiceImpl implements WCAService {
     private WCAApi wcaApi;
 
     @Override
-    public AuthenticationResponse getWcaAuthenticationUrl(String frontendHost) {
+    public AuthenticationResponse getWcaAuthenticationUrl(String frontendHost, String redirect) {
         return AuthenticationResponse.builder().frontendHost(frontendHost).url(String
-                .format("%s/oauth/authorize?client_id=%s&redirect_uri=%s&response_type=token&scope=public", wcaBaseUrl,
-                        wcaAppId, frontendHost)).build();
+                .format("%s/oauth/authorize?client_id=%s&redirect_uri=%s?redirect=%s&response_type=token&scope=public", wcaBaseUrl,
+                        wcaAppId, frontendHost, redirect)).build();
     }
 
     @Override