DISPLAY-993: Refresh token when activated code to refresh tenants

os2display · Sep 22, 2023 · ad8e7ea · ad8e7ea
1 parent 8c6f286
commit ad8e7ea
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/components/user/login.jsx b/src/components/user/login.jsx
@@ -60,6 +60,7 @@ function Login() {
 
     // Set data in local storage, to persist login on refresh
     localStorage.setItem(localStorageKeys.API_TOKEN, data.token);
+    localStorage.setItem(localStorageKeys.API_REFRESH_TOKEN, data.refresh_token);
     localStorage.setItem(localStorageKeys.USER_NAME, user?.fullname);
     localStorage.setItem(localStorageKeys.EMAIL, user?.email);
     localStorage.setItem(localStorageKeys.TENANTS, JSON.stringify(tenants));
@@ -109,6 +110,36 @@ function Login() {
     );
   };
 
+  const refreshTokenAndLogin = () => {
+    ConfigLoader.loadConfig().then((config) => {
+      fetch(`${config.api}v1/authentication/token/refresh`, {
+        mode: "cors",
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        credentials: "include",
+        body: JSON.stringify({
+          refresh_token: localStorage.getItem(localStorageKeys.API_REFRESH_TOKEN),
+        })
+      })
+        .then((resp) => resp.json())
+        .then((data) => {
+          if (data.code !== 200) {
+            setErrorMessage(data.message);
+          }
+
+          if (data?.token) {
+            login(data);
+          }
+        })
+        .catch((err) => {
+          setError(true);
+          displayError(t("error-refreshing-code"), err);
+        });
+    });
+  }
+
   const onActivationCodeSubmit = (e) => {
     e.preventDefault();
     e.stopPropagation();
@@ -120,8 +151,8 @@ function Login() {
         }),
       })
     )
-      .then(() => {
-        window.href = "/admin";
+      .then((resp) => {
+        refreshTokenAndLogin();
       })
       .catch((err) => {
         setError(true);

diff --git a/src/components/util/local-storage-keys.jsx b/src/components/util/local-storage-keys.jsx
@@ -1,5 +1,6 @@
 const localStorageKeys = {
   API_TOKEN: "api-token",
+  API_REFRESH_TOKEN: "api-refresh-token",
   EMAIL: "email",
   SELECTED_TENANT: "selected-tenant",
   TENANTS: "tenants",

diff --git a/src/translations/da/common.json b/src/translations/da/common.json
@@ -816,7 +816,8 @@
     "login-with-external": " login",
     "logged-in-select-tenant": "Vælg lokation.",
     "activation-code": "Indtast aktiveringskode for at blive koblet på en instans.",
-    "error-activating-code": "Aktivering fejlede."
+    "error-activating-code": "Aktivering fejlede.",
+    "error-refreshing-code": "Aktivering fejlede. Prøv igen."
   },
   "file-dropzone": {
     "drag-and-drop-text": "Vælg filer ved at trykke på eller trække filer ind i firkanten",