@saltcorn/mobile-app 1.5.0-beta.9 → 1.5.0-rc.1

package/src/init.js

@@ -22,7 +22,11 @@ import {
   gotoEntryView,
   addRoute,
 } from "./helpers/navigation.js";
-import { checkSendIntentReceived } from "./helpers/common.js";
+import {
+  checkSendIntentReceived,
+  tryInitBackgroundSync,
+  tryInitPush,
+} from "./helpers/common.js";
 import { readJSONCordova, readTextCordova } from "./helpers/file_system.js";
 
 import i18next from "i18next";
@@ -443,6 +447,7 @@ export async function init(mobileConfig) {
     const jwt = state.mobileConfig.jwt;
     const alerts = [];
     if ((networkDisabled && jwt) || (await checkJWT(jwt))) {
+      // already logged in, continue
       const mobileConfig = state.mobileConfig;
       const decodedJwt = jwtDecode(mobileConfig.jwt);
       mobileConfig.user = decodedJwt.user;
@@ -467,7 +472,7 @@ export async function init(mobileConfig) {
             }
         } else if (offlineUser) {
           if (offlineUser === mobileConfig.user.email) {
-            await sync();
+            await sync(true, true, alerts);
             alerts.push({
               type: "info",
               msg: "Synchronized your offline data.",
@@ -478,7 +483,7 @@ export async function init(mobileConfig) {
               msg: `'${offlineUser}' has not yet uploaded offline data.`,
             });
         } else {
-          await sync();
+          await sync(true, true, alerts);
           alerts.push({
             type: "info",
             msg: "Synchronized your offline data.",
@@ -486,6 +491,9 @@ export async function init(mobileConfig) {
         }
       }
 
+      await tryInitPush(mobileConfig);
+      await tryInitBackgroundSync(mobileConfig);
+
       if (Capacitor.getPlatform() === "ios") {
         const shareData = await checkSendIntentReceived();
         if (shareData && notEmpty(shareData)) return await postShare(shareData);
@@ -518,6 +526,7 @@ export async function init(mobileConfig) {
       }
       if (page.content) await replaceIframe(page.content, page.isFile);
     } else if (isPublicJwt(jwt)) {
+      // already logged in as public
       const config = state.mobileConfig;
       config.user = { role_id: 100, email: "public", language: "en" };
       config.isPublicUser = true;
@@ -539,13 +548,17 @@ export async function init(mobileConfig) {
       )) &&
       state.mobileConfig.autoPublicLogin
     ) {
+      // try autoPublicLogin
       if (networkDisabled)
         throw new Error(
           "No internet connection or previous login is available. " +
             "Please go online and reload, the public login is not yet supported."
         );
       await publicLogin(getEntryPoint(100, state, state.mobileConfig));
-    } else await showLogin(alerts);
+    } else {
+      // open login page
+      await showLogin(alerts);
+    }
   } catch (error) {
     if (typeof saltcorn === "undefined" || typeof router === "undefined") {
       const msg = `An error occured: ${

package/src/routing/index.js

@@ -6,7 +6,7 @@ import {
   updateTableRow,
   insertTableRow,
 } from "./routes/api";
-import { getLoginView, logoutAction, getSignupView } from "./routes/auth";
+import { getLoginView, getSignupView } from "./routes/auth";
 import { deleteRows } from "./routes/delete";
 import { postToggleField } from "./routes/edit";
 import { getErrorView } from "./routes/error";
@@ -54,16 +54,12 @@ const routes = [
     path: "get/auth/login",
     action: getLoginView,
   },
-  {
-    path: "get/auth/logout",
-    action: logoutAction,
-  },
   {
     path: "get/auth/signup",
     action: getSignupView,
   },
+
   // delete
-  
   {
     path: "post/delete/:tableName/:id", // legacy
     action: deleteRows,
@@ -72,7 +68,7 @@ const routes = [
     path: "delete/api/:tableName/:id",
     action: deleteRows,
   },
-  
+
   // edit
   {
     path: "post/edit/toggle/:name/:id/:field_name",

package/src/routing/routes/auth.js

@@ -1,11 +1,12 @@
 /*global saltcorn */
 import { MobileRequest } from "../mocks/request";
 import { MobileResponse } from "../mocks/response";
-import { apiCall } from "../../helpers/api";
-import { removeJwt } from "../../helpers/auth";
 import { sbAdmin2Layout, getHeaders } from "../utils";
-import { clearHistory } from "../../helpers/navigation";
 
+/**
+ * internal helper to prepare the login or signup form
+ * @returns
+ */
 const prepareAuthForm = () => {
   return new saltcorn.data.models.Form({
     class: "login",
@@ -29,7 +30,13 @@ const prepareAuthForm = () => {
   });
 };
 
-// TODO delete this and integrate getAuthLinks() from '/server/auth/routes.js'
+/**
+ * internal helper to get auth links
+ * TODO delete this and integrate getAuthLinks() from '/server/auth/routes.js'
+ * @param {*} current
+ * @param {*} entryPoint
+ * @returns
+ */
 const getAuthLinks = (current, entryPoint) => {
   const links = { methods: [] };
   const state = saltcorn.data.state.getState();
@@ -51,6 +58,13 @@ const getAuthLinks = (current, entryPoint) => {
   return links;
 };
 
+/**
+ * internal helper to render login view
+ * @param {*} entryPoint
+ * @param {*} versionTag
+ * @param {*} alerts
+ * @returns
+ */
 const renderLoginView = async (entryPoint, versionTag, alerts = []) => {
   const state = saltcorn.data.state.getState();
   const form = prepareAuthForm(entryPoint);
@@ -101,6 +115,12 @@ const renderLoginView = async (entryPoint, versionTag, alerts = []) => {
   });
 };
 
+/**
+ * internal helper to render signup view
+ * @param {*} entryPoint
+ * @param {*} versionTag
+ * @returns
+ */
 const renderSignupView = (entryPoint, versionTag) => {
   const form = prepareAuthForm(entryPoint);
   form.onSubmit = `javascript:signupFormSubmit(this, '${entryPoint}')`;
@@ -146,23 +166,3 @@ export const getSignupView = async () => {
     replaceIframe: true,
   };
 };
-
-/**
- *
- * @returns
- */
-export const logoutAction = async () => {
-  const config = saltcorn.data.state.getState().mobileConfig;
-  const response = await apiCall({ method: "GET", path: "/auth/logout" });
-  if (response.data.success) {
-    await removeJwt();
-    clearHistory();
-    config.jwt = undefined;
-    return {
-      content: await renderLoginView(config.entry_point, config.version_tag),
-    };
-  } else {
-    console.log("unable to logout");
-    return {};
-  }
-};

package/www/js/iframe_view_utils.js

@@ -192,7 +192,7 @@ async function inline_local_submit(e, opts1) {
     });
     inline_submit_success(e, form, opts);
   } catch (error) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: error.message ? error.message : "An error occured.",
@@ -565,7 +565,7 @@ async function mobile_modal(url, opts = {}) {
       // onOpen onClose initialize_page?
     }
   } catch (error) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: error.message ? error.message : "An error occured.",
@@ -665,7 +665,7 @@ async function make_unique_field(
       );
     }
   } catch (error) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: "unable to 'make_unique_field'",
@@ -835,16 +835,13 @@ async function switchNetworkMode() {
       parent.saltcorn.mobileApp.navigation.addRoute({
         route: "get/sync/sync_settings",
       });
-      parent.saltcorn.mobileApp.common.showAlerts(
-        [
-          {
-            type: "info",
-            msg: parent.saltcorn.mobileApp.offlineMode.getOfflineMsg(),
-          },
-        ],
-        false
-      );
-      parent.saltcorn.mobileApp.common.clearAlerts();
+      parent.saltcorn.mobileApp.common.showAlerts([
+        {
+          type: "info",
+          msg: parent.saltcorn.mobileApp.offlineMode.getOfflineMsg(),
+        },
+      ]);
+      parent.saltcorn.mobileApp.common.clearToasts();
     } else {
       if (networkState === "none")
         throw new Error("No internet connection is available.");
@@ -854,16 +851,16 @@ async function switchNetworkMode() {
       parent.saltcorn.mobileApp.navigation.addRoute({
         route: "get/sync/sync_settings",
       });
-      parent.saltcorn.mobileApp.common.showAlerts([
+      parent.saltcorn.mobileApp.common.showToasts([
         {
           type: "info",
           msg: "You are online again.",
         },
       ]);
-      parent.saltcorn.mobileApp.common.clearTopAlerts();
+      parent.saltcorn.mobileApp.common.clearAlerts();
     }
   } catch (error) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: `Unable to change the network mode: ${
@@ -883,7 +880,7 @@ async function callSync() {
   try {
     const mobileConfig = parent.saltcorn.data.state.getState().mobileConfig;
     if (mobileConfig.networkState === "none") {
-      parent.saltcorn.mobileApp.common.showAlerts([
+      parent.saltcorn.mobileApp.common.showToasts([
         {
           type: "error",
           msg: "You don't have an internet connection.",
@@ -892,15 +889,15 @@ async function callSync() {
     } else {
       const wasOffline = mobileConfig.isOfflineMode;
       showLoadSpinner();
-      await parent.saltcorn.mobileApp.offlineMode.sync();
-      parent.saltcorn.mobileApp.common.clearAlerts();
+      const alerts = [];
+      await parent.saltcorn.mobileApp.offlineMode.sync(true, true, alerts);
+      parent.saltcorn.mobileApp.common.clearToasts();
       if (!wasOffline) {
-        parent.saltcorn.mobileApp.common.showAlerts([
-          {
-            type: "info",
-            msg: "Synchronized your offline data.",
-          },
-        ]);
+        alerts.push({
+          type: "info",
+          msg: "Synchronized your offline data.",
+        });
+        parent.saltcorn.mobileApp.common.showToasts(alerts);
       } else {
         setNetworSwitcherOn();
         parent.saltcorn.mobileApp.navigation.clearHistory();
@@ -908,13 +905,12 @@ async function callSync() {
         parent.saltcorn.mobileApp.navigation.addRoute({
           route: "get/sync/sync_settings",
         });
-        parent.saltcorn.mobileApp.common.showAlerts([
-          {
-            type: "info",
-            msg: "Synchronized your offline data, you are online again.",
-          },
-        ]);
-        parent.saltcorn.mobileApp.common.clearTopAlerts();
+        alerts.push({
+          type: "info",
+          msg: "Synchronized your offline data, you are online again.",
+        });
+        parent.saltcorn.mobileApp.common.showToasts(alerts);
+        parent.saltcorn.mobileApp.common.clearAlerts();
       }
     }
   } catch (error) {
@@ -930,14 +926,14 @@ async function deleteOfflineDataClicked() {
     await parent.saltcorn.mobileApp.offlineMode.getLastOfflineSession();
   const { user } = parent.saltcorn.data.state.getState().mobileConfig;
   if (!lastOfflineSession?.offlineUser) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: "You don't have any offline data.",
       },
     ]);
   } else if (lastOfflineSession.offlineUser !== user.email) {
-    parent.saltcorn.mobileApp.common.showAlerts([
+    parent.saltcorn.mobileApp.common.showToasts([
       {
         type: "error",
         msg: `The offline data is owned by '${lastOfflineSession.offlineUser}'.`,

package/build_scripts/modify_android_manifest.js

@@ -1,53 +0,0 @@
-const { parseStringPromise, Builder } = require("xml2js");
-const { join } = require("path");
-const { readFileSync, writeFileSync } = require("fs");
-
-const readMobileConfig = () => {
-  console.log("Reading mobile config");
-  const content = readFileSync(
-    "/saltcorn-mobile-app/saltcorn-mobile-cfg.json",
-    "utf8"
-  );
-  console.log(content);
-  return JSON.parse(content);
-};
-
-(async () => {
-  try {
-    const { permissions, features } = readMobileConfig();
-    const androidManifest = join(
-      "android",
-      "app",
-      "src",
-      "main",
-      "AndroidManifest.xml"
-    );
-    const content = readFileSync(androidManifest);
-    const parsed = await parseStringPromise(content);
-
-    parsed.manifest["uses-permission"] = permissions.map((p) => ({
-      $: { "android:name": p },
-    }));
-    parsed.manifest["uses-feature"] = features.map((f) => ({
-      $: { "android:name": f },
-    }));
-
-    parsed.manifest.application[0].$ = {
-      ...parsed.manifest.application[0].$,
-      "android:allowBackup": "false",
-      "android:fullBackupContent": "false",
-      "android:dataExtractionRules": "@xml/data_extraction_rules",
-      "android:networkSecurityConfig": "@xml/network_security_config",
-      "android:usesCleartextTraffic": "true",
-    };
-    const xmlBuilder = new Builder();
-    const newCfg = xmlBuilder.buildObject(parsed);
-    writeFileSync(androidManifest, newCfg);
-  } catch (error) {
-    console.log(
-      `Unable to modify the AndroidManifest.xml: ${
-        error.message ? error.message : "Unknown error"
-      }`
-    );
-  }
-})();

package/build_scripts/modify_gradle_cfg.js

@@ -1,21 +0,0 @@
-const { join } = require("path");
-const { readFileSync, writeFileSync } = require("fs");
-
-console.log("Writing gradle config");
-console.log("args", process.argv);
-const args = process.argv.slice(2);
-const appVersion = args[0].split("=")[1];
-
-const gradleFile = join(__dirname, "..", "android", "app", "build.gradle");
-const gradleContent = readFileSync(gradleFile, "utf8");
-
-// generate versionCode from appVersion
-const parts = appVersion.split(".");
-const versionCode =
-  parseInt(parts[0]) * 1000000 + parseInt(parts[1]) * 1000 + parseInt(parts[2]);
-let newGradleContent = gradleContent
-  .replace(/versionName "1.0"/, `versionName "${appVersion}"`)
-  .replace(/versionCode 1/, `versionCode ${versionCode}`);
-
-console.log("newGradleContent", newGradleContent);
-writeFileSync(gradleFile, newGradleContent, "utf8");

package/src/helpers/notifications.js

@@ -1,92 +0,0 @@
-import { Capacitor } from "@capacitor/core";
-import { apiCall } from "./api";
-import { showAlerts } from "./common";
-
-/**
- * @capacitor/push-notifications isn't always included in the build
- */
-async function loadNotificationsPlugin() {
-  try {
-    const { PushNotifications } = await import("@capacitor/push-notifications");
-    return PushNotifications;
-  } catch (error) {
-    console.warn("Error loading PushNotifications plugin:", error);
-    return null;
-  }
-}
-
-/**
- * @capacitor/device isn't always included in the build
- */
-async function loadDevicePlugin() {
-  try {
-    const { Device } = await import("@capacitor/device");
-    return Device;
-  } catch (error) {
-    console.warn("Error loading Device plugin:", error);
-    return null;
-  }
-}
-
-async function uploadFcmToken(token, deviceId) {
-  try {
-    const response = await apiCall({
-      method: "POST",
-      path: "/notifications/fcm-token",
-      body: { token, deviceId },
-    });
-    const data = response.data;
-    if (data.success.success === "ok")
-      console.log("Token uploaded successfully:", data);
-    else console.error("Unable to upload token:", data);
-  } catch (error) {
-    console.error("Error uploading token:", error);
-  }
-}
-
-export async function initPushNotifications() {
-  const PushNotifications = await loadNotificationsPlugin();
-  if (Capacitor.getPlatform() !== "web" && PushNotifications) {
-    const { Device } = await loadDevicePlugin();
-    const permStatus = await PushNotifications.requestPermissions();
-    if (permStatus.receive === "granted") {
-      await PushNotifications.register();
-      PushNotifications.addListener("registration", async (token) => {
-        const { identifier } = await Device.getId();
-        await uploadFcmToken(token.value, identifier);
-      });
-
-      PushNotifications.addListener("registrationError", (err) => {
-        console.error("Push registration error:", err);
-      });
-
-      PushNotifications.addListener(
-        "pushNotificationReceived",
-        (notification) => {
-          console.log("Push received in foreground:", notification);
-          showAlerts([
-            {
-              type: "info",
-              msg: notification.body,
-              title: notification.title,
-            },
-          ]);
-        }
-      );
-    } else {
-      console.warn("Push notification permission not granted");
-    }
-  }
-}
-
-export async function unregisterPushNotifications() {
-  const PushNotifications = await loadNotificationsPlugin();
-  if (Capacitor.getPlatform() !== "web" && PushNotifications) {
-    try {
-      await PushNotifications.unregister();
-      console.log("Push notifications unregistered successfully");
-    } catch (error) {
-      console.error("Error unregistering push notifications:", error);
-    }
-  }
-}