@saltcorn/mobile-app 1.6.0-beta.3 → 1.6.0-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.6.0-beta.3",
+  "version": "1.6.0-beta.4",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {

package/src/helpers/api.js

@@ -1,6 +1,9 @@
 /*global saltcorn, splashConfig*/
 
 import axios from "axios";
+import { jwtDecode } from "jwt-decode";
+import { router } from "../routing/index";
+import { replaceIframe, clearHistory } from "./navigation";
 
 export async function apiCall({
   method,
@@ -24,7 +27,28 @@ export async function apiCall({
   };
   if (config.tenantAppName) headers["X-Saltcorn-App"] = config.tenantAppName;
   const token = config.jwt;
-  if (token) headers.Authorization = `jwt ${token}`;
+  if (token) {
+    try {
+      const decoded = jwtDecode(token);
+      if (decoded.exp && decoded.exp < Date.now() / 1000 && typeof saltcorn !== "undefined" && !path.startsWith("/auth/")) {
+        const mobileConfig = saltcorn.data.state.getState().mobileConfig;
+        mobileConfig.jwt = undefined;
+        await saltcorn.data.db.deleteWhere("jwt_table");
+        clearHistory();
+        const page = await router.resolve({
+          pathname: "get/auth/login",
+          alerts: [
+            { type: "warning", msg: "Your session has expired, please log in again." },
+          ],
+        });
+        await replaceIframe(page.content);
+        return;
+      }
+    } catch {
+      // malformed token, let the request proceed and fail naturally
+    }
+    headers.Authorization = `jwt ${token}`;
+  }
   try {
     const result = await axios({
       url: url,

package/src/helpers/auth.js

@@ -26,22 +26,22 @@ async function loginRequest({ email, password, isSignup, isPublic }) {
         path: "/auth/login-with/jwt",
       }
     : isSignup
-      ? {
-          method: "POST",
-          path: "/auth/signup",
-          body: {
-            email,
-            password,
-          },
-        }
-      : {
-          method: "GET",
-          path: "/auth/login-with/jwt",
-          params: {
-            email,
-            password,
-          },
-        };
+    ? {
+        method: "POST",
+        path: "/auth/signup",
+        body: {
+          email,
+          password,
+        },
+      }
+    : {
+        method: "POST",
+        path: "/auth/login-with/jwt",
+        body: {
+          email,
+          password,
+        },
+      };
   const response = await apiCall(opts);
   return response.data;
 }
@@ -241,13 +241,34 @@ export async function setJwt(jwt) {
   await saltcorn.data.db.insert("jwt_table", { jwt: jwt });
 }
 
-export async function checkJWT(jwt) {
-  if (jwt && jwt !== "undefined") {
+async function renewJwt() {
+  try {
+    const response = await apiCall({
+      method: "POST",
+      path: "/auth/renew-jwt",
+    });
+    if (typeof response.data === "string") {
+      const config = saltcorn.data.state.getState().mobileConfig;
+      await setJwt(response.data);
+      config.jwt = response.data;
+    }
+  } catch (e) {
+    console.error("JWT renewal failed:", e.message);
+  }
+}
+
+export async function checkJWT(jwtStr) {
+  if (jwtStr && jwtStr !== "undefined") {
     const response = await apiCall({
       method: "GET",
       path: "/auth/authenticated",
       timeout: 10000,
     });
-    return response.data.authenticated;
+    if (!response.data.authenticated) return false;
+    const decoded = jwtDecode(jwtStr);
+    if (decoded.exp && decoded.exp - Date.now() / 1000 < 7 * 24 * 3600) {
+      await renewJwt();
+    }
+    return true;
   } else return false;
 }

package/src/init.js

@@ -211,10 +211,14 @@ const showErrorPage = async (error) => {
 const onResume = async () => {
   if (typeof saltcorn === "undefined") return;
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
-  if (mobileConfig?.allowOfflineMode && mobileConfig.jwt) {
+  if (mobileConfig?.jwt) {
     const netStatus = await Network.getStatus();
     mobileConfig.networkState = netStatus.connectionType;
-    if (mobileConfig.networkState === "none" && !mobileConfig.isOfflineMode) {
+    if (
+      mobileConfig.allowOfflineMode &&
+      mobileConfig.networkState === "none" &&
+      !mobileConfig.isOfflineMode
+    ) {
       try {
         await startOfflineMode();
         clearHistory();
@@ -222,14 +226,16 @@ const onResume = async () => {
       } catch (error) {
         await showErrorPage(error);
       }
-    } else if (
-      mobileConfig.networkState !== "none" &&
-      mobileConfig.syncOnAppResume
-    ) {
-      try {
-        await sync(false, false, []);
-      } catch (error) {
-        await showErrorPage(error);
+    } else if (mobileConfig.networkState !== "none") {
+      if (!mobileConfig.isOfflineMode && !isPublicJwt(mobileConfig.jwt)) {
+        await checkJWT(mobileConfig.jwt);
+      }
+      if (mobileConfig.allowOfflineMode && mobileConfig.syncOnAppResume) {
+        try {
+          await sync(false, false, []);
+        } catch (error) {
+          await showErrorPage(error);
+        }
       }
     }
   }