Stop redirecting to login

gui/rpk-gui/src/providers/auth-provider.tsx

@@ -12,7 +12,7 @@ const DEFAULT_LOGIN_REDIRECT = "/hub"
 const authProvider: AuthProvider = {
   login: async ({ providerName, email, password }) => {
     const to_param = findGetParameter("to");
-    const redirect = to_param === null ? DEFAULT_LOGIN_REDIRECT : to_param
+    const redirect = to_param === null ? getLoginRedirect() : to_param
     if (providerName) {
       let scope = {};
       if (providerName === "google") {
@@ -61,18 +61,22 @@ const authProvider: AuthProvider = {
     const response = await fetch(`${API_URL}/hub/auth/logout`, { method: "POST" });
     if (response.status == 204 || response.status == 401) {
       forget_user();
-      return {
-        success: true,
-        redirectTo: "/",
-      };
+      return { success: true };
     }
     return { success: false };
   },
   check: async () => {
-    if (get_user() == null) {
+    const user = get_user();
+    if (user == null || isEmpty(user)) {
+      const user_data = await get_me();
+
+      if (user_data) {
+        store_user(user_data)
+        return { authenticated: true }
+      }
+
       return {
         authenticated: false,
-        redirectTo: "/login",
         logout: true
       }
     }
@@ -84,11 +88,7 @@ const authProvider: AuthProvider = {
       return user;
     }
 
-    const response = await fetch(`${API_URL}/hub/users/me`);
-    if (response.status < 200 || response.status > 299) {
-      return null;
-    }
-    const user_data = await response.json();
+    const user_data = get_me()
     store_user(user_data)
 
     return user_data;
@@ -154,9 +154,8 @@ const authProvider: AuthProvider = {
     if (error?.status === 401) {
       forget_user();
       return {
-        redirectTo: "/login",
-        logout: true,
         error: { message: "Authentication required" },
+        logout: true,
       } as OnErrorResponse;
     }
     else if (error?.status === 403) {
@@ -170,6 +169,15 @@ const authProvider: AuthProvider = {
   },
 };
 
+async function get_me() {
+  const response = await fetch(`${API_URL}/hub/users/me`);
+  if (response.status < 200 || response.status > 299) {
+    return null;
+  }
+  const user_data = await response.json();
+  return user_data
+}
+
 function store_user(user: any) {
   localStorage.setItem(LOCAL_STORAGE_USER_KEY, JSON.stringify(user));
 }
@@ -200,4 +208,11 @@ function findGetParameter(parameterName: string) {
     return result;
 }
 
+function getLoginRedirect() {
+  if (location.pathname == "/login") {
+    return DEFAULT_LOGIN_REDIRECT
+  }
+
+  return location.pathname + location.search;
+}
 export default authProvider;