@saltcorn/mobile-app 0.8.5 → 0.8.6-beta.2

package/package.json

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

package/www/index.html

@@ -124,7 +124,7 @@
                 config.pluginHeaders.push(prepareHeader(header));
               }
             else if (typeof pluginHeaders === "function") {
-              const headerResult = pluginHeaders(row.configuration);
+              const headerResult = pluginHeaders(row.configuration || {});
               if (Array.isArray(headerResult)) {
                 for (const header of headerResult)
                   config.pluginHeaders.push(prepareHeader(header));
@@ -146,10 +146,9 @@
       const initJwt = async () => {
         if (!(await saltcorn.data.db.tableExists("jwt_table"))) {
           await createJwtTable();
-        }
-        else {
+        } else {
           const jwt = await getJwt();
-          if(jwt) {
+          if (jwt) {
             const state = saltcorn.data.state.getState();
             state.mobileConfig.jwt = jwt;
           }
@@ -159,14 +158,13 @@
       const checkJWT = async () => {
         const state = saltcorn.data.state.getState();
         const jwt = state.mobileConfig.jwt;
-        if(jwt && jwt !== "undefined") {
+        if (jwt && jwt !== "undefined") {
           const response = await apiCall({
             method: "GET",
             path: "/auth/authenticated",
           });
           return response.data.authenticated;
-        }
-        else return false;
+        } else return false;
       };
 
       const initI18Next = async () => {

package/www/js/mocks/request.js

@@ -1,9 +1,9 @@
 /*global i18next, saltcorn*/
 
 function MobileRequest({ xhr = false, files = undefined, query = undefined }) {
-  const roleId = saltcorn.data.state.getState().mobileConfig.role_id
-    ? saltcorn.data.state.getState().mobileConfig.role_id
-    : 10;
+  const cfg = saltcorn.data.state.getState().mobileConfig;
+  const roleId = cfg.role_id ? cfg.role_id : 10;
+  const userId = cfg.user_id ? cfg.user_id : undefined;
   const flashMessages = [];
 
   return {
@@ -21,6 +21,7 @@ function MobileRequest({ xhr = false, files = undefined, query = undefined }) {
       return mobileCfg?.language ? mobileCfg.language : "en";
     },
     user: {
+      id: userId,
       role_id: roleId,
     },
     flash: (type, msg) => {

package/www/js/routes/auth.js

@@ -1,4 +1,4 @@
-/*global sbAdmin2Layout, apiCall, removeJwt, saltcorn*/
+/*global sbAdmin2Layout, apiCall, removeJwt, saltcorn, clearHistory*/
 
 const prepareAuthForm = () => {
   return new saltcorn.data.models.Form({
@@ -90,6 +90,7 @@ const logoutAction = async () => {
   const response = await apiCall({ method: "GET", path: "/auth/logout" });
   if (response.data.success) {
     await removeJwt();
+    clearHistory();
     config.jwt = undefined;
     return {
       content: renderLoginView(config.entry_point, config.version_tag),

package/www/js/utils/global_utils.js

@@ -16,6 +16,10 @@ function addRoute(routeEntry) {
   routingHistory.push(routeEntry);
 }
 
+function clearHistory() {
+  routingHistory = [];
+}
+
 async function apiCall({ method, path, params, body, responseType }) {
   const config = saltcorn.data.state.getState().mobileConfig;
   const serverPath = config.server_path;
@@ -155,8 +159,12 @@ async function handleRoute(route, query, files) {
       files: files,
     });
     if (page.redirect) {
-      const { path, query } = splitPathQuery(page.redirect);
-      await handleRoute(path, query);
+      if (page.redirect.startsWith("http://localhost")) {
+        await gotoEntryView();
+      } else {
+        const { path, query } = splitPathQuery(page.redirect);
+        await handleRoute(path, query);
+      }
     } else if (page.content) {
       if (!page.replaceIframe) await replaceIframeInnerContent(page.content);
       else await replaceIframe(page.content);
@@ -173,7 +181,10 @@ async function handleRoute(route, query, files) {
 }
 
 async function goBack(steps = 1, exitOnFirstPage = false) {
-  if (exitOnFirstPage && routingHistory.length === 1) {
+  if (
+    routingHistory.length === 0 ||
+    (exitOnFirstPage && routingHistory.length === 1)
+  ) {
     navigator.app.exitApp();
   } else if (routingHistory.length <= steps) {
     routingHistory = [];

package/www/js/utils/iframe_view_utils.js

@@ -100,6 +100,7 @@ async function login(e, entryPoint, isSignup) {
     const config = parent.saltcorn.data.state.getState().mobileConfig;
     config.role_id = decodedJwt.user.role_id ? decodedJwt.user.role_id : 10;
     config.user_name = decodedJwt.user.email;
+    config.user_id = decodedJwt.user.id;
     config.language = decodedJwt.user.language;
     config.isPublicUser = false;
     await parent.setJwt(loginResult);

package/www/js/utils/table_utils.js

@@ -46,18 +46,21 @@ async function updateUserDefinedTables() {
   const existingTables = await saltcorn.data.db.listUserDefinedTables();
   const tables = await saltcorn.data.models.Table.find();
   for (const table of tables) {
+    const sanitized = saltcorn.data.db.sqlsanitize(table.name);
     if (
       table.name !== "users" &&
-      !existingTables.find((row) => row.name === table.name)
+      !existingTables.find((row) => row.name === sanitized)
     ) {
       // CREATE TABLE without inserting into _sc_tables
       await saltcorn.data.models.Table.create(table.name, {}, table.id);
     }
     const existingFields = (
-      await saltcorn.data.db.query(`PRAGMA table_info('${table.name}')`)
+      await saltcorn.data.db.query(`PRAGMA table_info('${sanitized}')`)
     ).rows.map((row) => row.name);
     for (const field of await table.getFields()) {
-      if (existingFields.indexOf(field.name) < 0) {
+      if (
+        existingFields.indexOf(saltcorn.data.db.sqlsanitize(field.name)) < 0
+      ) {
         // field is new
         await saltcorn.data.models.Field.create(field, false, field.id);
       }