@saltcorn/mobile-app 1.3.1-beta.11 → 1.3.1-beta.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.3.1-beta.11",
+  "version": "1.3.1-beta.12",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "universal-router": "9.2.1",
-    "axios": "^1.7.7",
+    "axios": "^0.29.0",
     "jwt-decode": "4.0.0",
     "i18next": "24.2.2",
     "i18next-sprintf-postprocessor": "0.2.2",

package/src/helpers/auth.js

@@ -19,27 +19,27 @@ 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: "GET",
+          path: "/auth/login-with/jwt",
+          params: {
+            email,
+            password,
+          },
+        };
   const response = await apiCall(opts);
   return response.data;
 }
 
-export async function login({ email, password, entryPoint, isSignup }) {
+export async function login({ email, password, isSignup }) {
   const loginResult = await loginRequest({
     email,
     password,
@@ -48,7 +48,8 @@ export async function login({ email, password, entryPoint, isSignup }) {
   if (typeof loginResult === "string") {
     // use it as a token
     const decodedJwt = jwtDecode(loginResult);
-    const config = saltcorn.data.state.getState().mobileConfig;
+    const state = saltcorn.data.state.getState();
+    const config = state.mobileConfig;
     config.user = decodedJwt.user;
     config.isPublicUser = false;
     config.isOfflineMode = false;
@@ -86,6 +87,16 @@ export async function login({ email, password, entryPoint, isSignup }) {
         sprintf: [config.user.email],
       }),
     });
+
+    let entryPoint = null;
+    if (config.entryPointType === "byrole") {
+      const homepageByRole = state.getConfig("home_page_by_role", {})[
+        config.user.role_id
+      ];
+      if (homepageByRole) entryPoint = `get/page/${homepageByRole}`;
+      else throw new Error("No homepage defined for this role.");
+    } else entryPoint = config.entry_point;
+
     addRoute({ route: entryPoint, query: undefined });
     const page = await router.resolve({
       pathname: entryPoint,

package/src/helpers/offline_mode.js

@@ -224,8 +224,8 @@ const loadOfflineChanges = async (synchedTbls) => {
          from "${saltcorn.data.db.sqlsanitize(
            synchedTbl
          )}_sync_info" as info_tbl left join "${saltcorn.data.db.sqlsanitize(
-        synchedTbl
-      )}" as data_tbl
+           synchedTbl
+         )}" as data_tbl
          on info_tbl.ref = data_tbl."${saltcorn.data.db.sqlsanitize(pkName)}"
          where info_tbl.modified_local = true`
     );
@@ -562,7 +562,7 @@ export async function clearLocalData(inTransaction) {
     const { synchedTables } = saltcorn.data.state.getState().mobileConfig;
     for (const tblName of synchedTables) {
       const table = saltcorn.data.models.Table.findOne({ name: tblName });
-      await table.deleteRows();
+      await table.deleteRows({});
       await saltcorn.data.db.deleteWhere(`${table.name}_sync_info`, {});
     }
     if (!inTransaction) await saltcorn.data.db.query("COMMIT");