@saltcorn/mobile-app 0.8.7-beta.5 → 0.8.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "0.8.7-beta.5",
+  "version": "0.8.7",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {

package/www/index.html

@@ -243,6 +243,35 @@
         }
       };
 
+      const isPublicEntryPoint = async (entryPoint) => {
+        try {
+          const tokens = entryPoint.split("/");
+          if (tokens.length < 3) throw new Error("The format is incorrect");
+          const name = tokens[tokens.length - 1];
+          const entryObj =
+            tokens[tokens.length - 2] === "view"
+              ? saltcorn.data.models.View.findOne({ name: name })
+              : saltcorn.data.models.Page.findOne({ name: name });
+          if (!entryObj) throw new Error(`The object '${name}' does not exist`);
+          else return entryObj.min_role === 100;
+        } catch (error) {
+          console.log(
+            `Unable to inspect '${entryPoint}': ${
+              error.message ? error.message : "Unknown error"
+            }`
+          );
+          return false;
+        }
+      };
+
+      const showLogin = async (alerts) => {
+        const page = await router.resolve({
+          pathname: "get/auth/login",
+          alerts,
+        });
+        await replaceIframe(page.content);
+      };
+
       // device is ready
       const init = async () => {
         document.addEventListener("resume", onResume, false);
@@ -366,26 +395,25 @@
               alerts,
             });
             await replaceIframe(page.content);
-          } else {
+          } else if (await isPublicEntryPoint(entryPoint)) {
+            await publicLogin(entryPoint);
+          } else await showLogin(alerts);
+        } catch (error) {
+          if (error.httpCode === 401) await showLogin([]);
+          else {
+            state.mobileConfig.inErrorState = true;
             const page = await router.resolve({
-              pathname: "get/auth/login",
-              alerts,
+              pathname: "get/error_page",
+              fullWrap: true,
+              alerts: [
+                {
+                  type: "error",
+                  msg: error.message ? error.message : "An error occured.",
+                },
+              ],
             });
             await replaceIframe(page.content);
           }
-        } catch (error) {
-          state.mobileConfig.inErrorState = true;
-          const page = await router.resolve({
-            pathname: "get/error_page",
-            fullWrap: true,
-            alerts: [
-              {
-                type: "error",
-                msg: error.message ? error.message : "An error occured.",
-              },
-            ],
-          });
-          await replaceIframe(page.content);
         }
       };
 

package/www/js/routes/delete.js

@@ -10,7 +10,8 @@ const deleteRows = async (context) => {
     if (role_id <= table.min_role_write) {
       await table.deleteRows({ id });
       // TODO 'table.is_owner' check?
-    } else throw new Error(i18next.t("Not authorized"));
+    } else
+      throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
     if (isOfflineMode && !(await offlineHelper.hasOfflineRows())) {
       await offlineHelper.setOfflineSession(null);
     }

package/www/js/routes/edit.js

@@ -9,7 +9,7 @@ const postToggleField = async (context) => {
     state.mobileConfig;
   if (isOfflineMode || localTableIds.indexOf(table.id) >= 0) {
     if (role_id > table.min_role_write)
-      throw new Error(i18next.t("Not authorized"));
+      throw new saltcorn.data.utils.NotAuthorized(i18next.t("Not authorized"));
     await table.toggleBool(+id, field_name);
     if (isOfflineMode && !(await offlineHelper.getLastOfflineSession()))
       await offlineHelper.setOfflineSession({ offlineUser: user_name });

package/www/js/routes/page.js

@@ -7,7 +7,7 @@ const postPageAction = async (context) => {
   const page = await saltcorn.data.models.Page.findOne({ name: page_name });
   const req = new MobileRequest({ xhr: context.xhr });
   if (state.mobileConfig.role_id > page.min_role) {
-    throw new Error(req.__("Not authorized"));
+    throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
   let col;
   saltcorn.data.models.layout.traverseSync(page.layout, {
@@ -30,7 +30,7 @@ const getPage = async (context) => {
   const page = await saltcorn.data.models.Page.findOne({ name: page_name });
   const req = new MobileRequest({ xhr: context.xhr });
   if (state.mobileConfig.role_id > page.min_role) {
-    throw new Error(req.__("Not authorized"));
+    throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
   const query = parseQuery(context.query);
   const res = new MobileResponse();

package/www/js/routes/view.js

@@ -23,7 +23,7 @@ const postView = async (context) => {
     mobileCfg.role_id > view.min_role &&
     !(await view.authorise_post({ body, req, ...view }))
   ) {
-    throw new Error(req.__("Not authorized"));
+    throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   }
   await view.runPost(
     {},
@@ -52,7 +52,8 @@ const postViewRoute = async (context) => {
   const res = new MobileResponse();
   const state = saltcorn.data.state.getState();
   const { role_id, isOfflineMode, user_name } = state.mobileConfig;
-  if (role_id > view.min_role) throw new Error(req.__("Not authorized"));
+  if (role_id > view.min_role)
+    throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   await view.runRoute(
     context.params.route,
     context.data,
@@ -80,7 +81,7 @@ const getView = async (context) => {
     state.mobileConfig.role_id > view.min_role &&
     !(await view.authorise_get({ query, req, ...view }))
   )
-    throw new Error(req.__("Not authorized"));
+    throw new saltcorn.data.utils.NotAuthorized(req.__("Not authorized"));
   const contents = await view.run_possibly_on_page(
     query,
     req,