@saltcorn/mobile-app 0.7.3-beta.3 → 0.7.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "0.7.3-beta.3",
+  "version": "0.7.3",
   "description": "Apache Cordova application with @saltcorn/markup",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,9 @@
       "cordova-plugin-inappbrowser": {}
     }
   },
+  "overrides": {
+    "ansi-regex": "4.1.1"
+  },
   "dependencies": {
     "cordova": "^11.0.0",
     "cordova-sqlite-ext": "^6.0.0"

package/www/index.html

@@ -11,7 +11,6 @@
     <script src="npm_packages/axios.min.js"></script>
     <script type="module">
       import { initRoutes } from "./js/routes/init.js";
-      import { renderLoginForm } from "./js/utils/login_form.js";
       import {
         updateDb,
         getTableIds,
@@ -54,7 +53,7 @@
 
       async function loadPlugin(plugin) {
         await addScript({
-          src: `js/bundles/${plugin.name}.bundle.js`,
+          src: `js/bundle/${plugin.name}.bundle.js`,
           name: plugin.name,
         });
       }
@@ -77,11 +76,11 @@
       async function addScripts(version_tag) {
         const scripts = [
           { src: `static_assets/${version_tag}/jquery-3.6.0.min.js` },
-          { src: "js/bundles/common_chunks.bundle.js" },
-          { src: "js/bundles/markup.bundle.js", name: "markup" },
-          { src: "js/bundles/data.bundle.js", name: "data" },
-          { src: "js/bundles/base_plugin.bundle.js", name: "base_plugin" },
-          { src: "js/bundles/sbadmin2.bundle.js", name: "sbadmin2" },
+          { src: "js/bundle/common_chunks.bundle.js" },
+          { src: "js/bundle/markup.bundle.js", name: "markup" },
+          { src: "js/bundle/data.bundle.js", name: "data" },
+          { src: "js/bundle/base_plugin.bundle.js", name: "base_plugin" },
+          { src: "js/bundle/sbadmin2.bundle.js", name: "sbadmin2" },
         ];
         for (const script of scripts) {
           await addScript(script);
@@ -120,6 +119,16 @@
         iframe.contentWindow._sc_version_tag = window.config.version_tag;
       };
 
+      const checkJWT = async () => {
+        const jwt = localStorage.getItem("auth_jwt");
+        if (!jwt || jwt === "undefined") return false;
+        const response = await apiCall({
+          method: "GET",
+          path: "/auth/authenticated",
+        });
+        return response.data.authenticated;
+      };
+
       document.addEventListener("deviceready", async () => {
         window.config = await readJSON(
           "config",
@@ -151,12 +160,11 @@
         await initRoutes();
         setVersionTtag();
         const entryView = config.entry_view;
-        const jwt = localStorage.getItem("auth_jwt");
-        if (jwt && jwt !== "undefined") {
-          const decodedJwt = jwt_decode(jwt);
-          saltcorn.data.state.getState().role_id = decodedJwt?.role_id
-            ? decodedJwt.role_id
-            : 10;
+        if (await checkJWT()) {
+          const decodedJwt = jwt_decode(localStorage.getItem("auth_jwt"));
+          const state = saltcorn.data.state.getState();
+          state.role_id = decodedJwt?.role_id ? decodedJwt.role_id : 10;
+          state.user_name = decodedJwt.sub;
           addRoute({ route: entryView, query: undefined });
           const page = await router.resolve({
             pathname: entryView,
@@ -164,7 +172,12 @@
           });
           replaceIframe(page.content);
         } else {
-          replaceIframe(renderLoginForm(entryView, config.version_tag));
+          const page = await router.resolve({
+            pathname: "get/auth/login",
+            entryView: entryView,
+            versionTag: config.version_tag,
+          });
+          replaceIframe(page.content);
         }
       });
 

package/www/js/bundles/@saltcorn/any-bootstrap-theme.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/any-bootstrap-theme"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/any-bootstrap-theme"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/any-bootstrap-theme/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});

package/www/js/bundles/@saltcorn/ckeditor4.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/ckeditor4"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/ckeditor4"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data","@saltcorn/html"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/ckeditor4/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});

package/www/js/bundles/@saltcorn/html.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/html"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/html"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/html/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});

package/www/js/bundles/@saltcorn/select2.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/select2"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/select2"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/select2/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});

package/www/js/bundles/@saltcorn/shared-files.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/shared-files"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/shared-files"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/shared-files/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});

package/www/js/bundles/@saltcorn/xncolorpicker.bundle.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * ATTENTION: The "eval" devtool has been used (maybe by default in mode: "development").
+ * This devtool is neither made for production nor for readable output files.
+ * It uses "eval()" calls to create a separate source file in the browser devtools.
+ * If you are trying to read the output file, select a different devtool (https://webpack.js.org/configuration/devtool/)
+ * or disable the default devtool with "devtool: false".
+ * If you are looking for production-ready output files, see mode: "production" (https://webpack.js.org/configuration/mode/).
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["saltcorn"] = factory();
+	else
+		root["saltcorn"] = root["saltcorn"] || {}, root["saltcorn"]["@saltcorn/xncolorpicker"] = factory();
+})(self, function() {
+return (self["webpackChunksaltcorn_name_"] = self["webpackChunksaltcorn_name_"] || []).push([["@saltcorn/xncolorpicker"],{},
+/******/ __webpack_require__ => { // webpackRuntimeModules
+/******/ var __webpack_exec__ = (moduleId) => (__webpack_require__(__webpack_require__.s = moduleId))
+/******/ __webpack_require__.O(0, ["common_chunks","data"], () => (__webpack_exec__("./plugin_packages/node_modules/@saltcorn/xncolorpicker/index.js")));
+/******/ var __webpack_exports__ = __webpack_require__.O();
+/******/ return __webpack_exports__;
+/******/ }
+]);
+});