@saltcorn/mobile-app 1.5.0-beta.0 → 1.5.0-beta.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@saltcorn/mobile-app",
   "displayName": "Saltcorn mobile app",
-  "version": "1.5.0-beta.0",
+  "version": "1.5.0-beta.10",
   "description": "Saltcorn mobile app for Android and iOS",
   "main": "index.js",
   "scripts": {

package/src/helpers/auth.js

@@ -12,6 +12,11 @@ import {
   unregisterPushNotifications,
 } from "../helpers/notifications";
 
+/**
+ * internal helper for the normal login/signup and public login
+ * @param {any} param0
+ * @returns
+ */
 async function loginRequest({ email, password, isSignup, isPublic }) {
   const opts = isPublic
     ? {
@@ -39,6 +44,70 @@ async function loginRequest({ email, password, isSignup, isPublic }) {
   return response.data;
 }
 
+/**
+ * helper for normal logins and auth provider logins
+ * @param {string} token
+ */
+export async function handleToken(token) {
+  const decodedJwt = jwtDecode(token);
+  const state = saltcorn.data.state.getState();
+  const config = state.mobileConfig;
+  config.user = decodedJwt.user;
+  config.isPublicUser = false;
+  config.isOfflineMode = false;
+  await insertUser(config.user);
+  await setJwt(token);
+  config.jwt = token;
+  i18next.changeLanguage(config.user.language);
+  const alerts = [];
+  if (config.allowOfflineMode) {
+    const { offlineUser, hasOfflineData } =
+      (await getLastOfflineSession()) || {};
+    if (!offlineUser || offlineUser === config.user.email) {
+      await sync();
+    } else {
+      if (hasOfflineData)
+        alerts.push({
+          type: "warning",
+          msg: `'${offlineUser}' has not yet uploaded offline data.`,
+        });
+      else {
+        await deleteOfflineData(true);
+        await sync();
+      }
+    }
+  }
+  if (saltcorn.data.utils.isPushEnabled(config.user)) {
+    initPushNotifications();
+  } else {
+    await unregisterPushNotifications();
+  }
+  alerts.push({
+    type: "success",
+    msg: i18next.t("Welcome, %s!", {
+      postProcess: "sprintf",
+      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,
+    fullWrap: true,
+    alerts,
+  });
+  if (page.content) await replaceIframe(page.content, page.isFile);
+}
+
 export async function login({ email, password, isSignup }) {
   const loginResult = await loginRequest({
     email,
@@ -47,63 +116,7 @@ export async function login({ email, password, isSignup }) {
   });
   if (typeof loginResult === "string") {
     // use it as a token
-    const decodedJwt = jwtDecode(loginResult);
-    const state = saltcorn.data.state.getState();
-    const config = state.mobileConfig;
-    config.user = decodedJwt.user;
-    config.isPublicUser = false;
-    config.isOfflineMode = false;
-    await insertUser(config.user);
-    await setJwt(loginResult);
-    config.jwt = loginResult;
-    i18next.changeLanguage(config.user.language);
-    const alerts = [];
-    if (config.allowOfflineMode) {
-      const { offlineUser, hasOfflineData } =
-        (await getLastOfflineSession()) || {};
-      if (!offlineUser || offlineUser === config.user.email) {
-        await sync();
-      } else {
-        if (hasOfflineData)
-          alerts.push({
-            type: "warning",
-            msg: `'${offlineUser}' has not yet uploaded offline data.`,
-          });
-        else {
-          await deleteOfflineData(true);
-          await sync();
-        }
-      }
-    }
-    if (saltcorn.data.utils.isPushEnabled(config.user)) {
-      initPushNotifications();
-    } else {
-      await unregisterPushNotifications();
-    }
-    alerts.push({
-      type: "success",
-      msg: i18next.t("Welcome, %s!", {
-        postProcess: "sprintf",
-        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,
-      fullWrap: true,
-      alerts,
-    });
-    if (page.content) await replaceIframe(page.content, page.isFile);
+    await handleToken(loginResult);
   } else if (loginResult?.alerts) {
     showAlerts(loginResult?.alerts);
   } else {

package/src/helpers/db_schema.js

@@ -78,7 +78,7 @@ export async function updateScPlugins(tablesJSON) {
 
 export async function updateUserDefinedTables() {
   const existingTables = await saltcorn.data.db.listUserDefinedTables();
-  const tables = await saltcorn.data.models.Table.find();
+  const tables = await saltcorn.data.models.Table.find({}, { cached: true });
   for (const table of tables) {
     const sanitized = saltcorn.data.db.sqlsanitize(table.name);
     if (

package/src/helpers/notifications.js

@@ -2,6 +2,9 @@ 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");
@@ -12,6 +15,9 @@ async function loadNotificationsPlugin() {
   }
 }
 
+/**
+ * @capacitor/device isn't always included in the build
+ */
 async function loadDevicePlugin() {
   try {
     const { Device } = await import("@capacitor/device");

package/src/index.js

@@ -12,7 +12,8 @@ import { router } from "./routing/index";
 const plugins = {};
 const context = require.context("./plugins-code", true, /index\.js$/);
 context.keys().forEach((key) => {
-  const pluginName = key.split("/")[1];
+  const tokens = key.split("/");
+  const pluginName = tokens[tokens.length - 2];
   plugins[pluginName] = context(key);
 });
 

package/src/init.js

@@ -171,7 +171,7 @@ const initI18Next = async () => {
   for (const key of Object.keys(
     saltcorn.data.models.config.available_languages
   )) {
-    if (Capacitor.platform !== "web") {
+    if (Capacitor.getPlatform() !== "web") {
       const localeFile = await readJSONCordova(
         `${key}.json`,
         `${cordova.file.applicationDirectory}public/data/locales`
@@ -219,17 +219,6 @@ const onResume = async () => {
         await startOfflineMode();
         clearHistory();
         if (mobileConfig.user?.id) await gotoEntryView();
-        else {
-          const decodedJwt = jwtDecode(mobileConfig.jwt);
-          mobileConfig.user = decodedJwt.user;
-          mobileConfig.isPublicUser = false;
-        }
-        addRoute({ route: mobileConfig.entry_point, query: undefined });
-        const page = await router.resolve({
-          pathname: mobileConfig.entry_point,
-          fullWrap: true,
-          alerts: [],
-        });
       } catch (error) {
         await showErrorPage(error);
       }
@@ -317,7 +306,7 @@ const postShare = async (shareData) => {
 };
 
 const readSchemaIfNeeded = async () => {
-  if (Capacitor.platform !== "web") {
+  if (Capacitor.getPlatform() !== "web") {
     let tablesJSON = null;
     const { created_at } = await readJSONCordova(
       "tables_created_at.json",
@@ -337,8 +326,8 @@ const readSchemaIfNeeded = async () => {
   }
 };
 
-const readSiteLogo = async (state) => {
-  if (Capacitor.platform === "web") return "";
+const readSiteLogo = async () => {
+  if (Capacitor.getPlatform() === "web") return "";
   try {
     const base64 = await readTextCordova(
       "encoded_site_logo.txt",
@@ -369,7 +358,7 @@ const getEntryPoint = (roleId, state, mobileConfig) => {
 // device is ready
 export async function init(mobileConfig) {
   try {
-    if (Capacitor.platform === "web") {
+    if (Capacitor.getPlatform() === "web") {
       defineCustomElements(window);
       await customElements.whenDefined("jeep-sqlite");
       const jeepSqlite = document.createElement("jeep-sqlite");
@@ -381,6 +370,28 @@ export async function init(mobileConfig) {
       await saltcorn.mobileApp.navigation.goBack(1, true);
     });
 
+    App.addListener("appUrlOpen", async (event) => {
+      try {
+        const url = event.url;
+        if (url.startsWith("mobileapp://auth/callback")) {
+          const token = new URL(url).searchParams.get("token");
+          const method = new URL(url).searchParams.get("method");
+          const methods = saltcorn.data.state.getState().auth_methods;
+          if (!methods[method])
+            throw new Error(`Authentication method '${method}' not found.`);
+          const modName = methods[method].module_name;
+          if (!modName)
+            throw new Error(`Module name for '${method}' is not defined.`);
+          const authModule = saltcorn.mobileApp.plugins[modName];
+          if (!authModule)
+            throw new Error(`Authentication module '${modName}' not found.`);
+          await authModule.finishLogin(token);
+        }
+      } catch (error) {
+        await showErrorPage(error);
+      }
+    });
+
     const lastLocation = takeLastLocation();
     document.addEventListener("resume", onResume, false);
     await addScripts(mobileConfig.version_tag);
@@ -417,10 +428,10 @@ export async function init(mobileConfig) {
     state.mobileConfig.networkState = (
       await Network.getStatus()
     ).connectionType;
-    if (Capacitor.platform === "android") {
+    if (Capacitor.getPlatform() === "android") {
       const shareData = await checkSendIntentReceived();
       if (shareData) return await postShare(shareData);
-    } else if (Capacitor.platform === "ios") {
+    } else if (Capacitor.getPlatform() === "ios") {
       window.addEventListener("sendIntentReceived", async () => {
         const shareData = await checkSendIntentReceived();
         if (shareData && notEmpty(shareData)) return await postShare(shareData);
@@ -475,7 +486,7 @@ export async function init(mobileConfig) {
         }
       }
 
-      if (Capacitor.platform === "ios") {
+      if (Capacitor.getPlatform() === "ios") {
         const shareData = await checkSendIntentReceived();
         if (shareData && notEmpty(shareData)) return await postShare(shareData);
       }

package/src/routing/routes/auth.js

@@ -33,11 +33,21 @@ const prepareAuthForm = () => {
 const getAuthLinks = (current, entryPoint) => {
   const links = { methods: [] };
   const state = saltcorn.data.state.getState();
+  const mobileConfig = state.mobileConfig;
   if (current !== "login") links.login = "javascript:execLink('/auth/login')";
   if (current !== "signup" && state.getConfig("allow_signup"))
     links.signup = "javascript:execLink('/auth/signup')";
-  if (state.getConfig("public_user_link"))
+  if (mobileConfig.showContinueAsPublicUser)
     links.publicUser = `javascript:publicLogin('${entryPoint}')`;
+  for (const [name, auth] of Object.entries(state.auth_methods)) {
+    links.methods.push({
+      icon: auth.icon,
+      label: auth.label,
+      name,
+      url: `javascript:loginWith('${name}')`,
+    });
+  }
+
   return links;
 };
 
@@ -74,6 +84,8 @@ const renderLoginView = async (entryPoint, versionTag, alerts = []) => {
     }
   }
 
+  const assets_by_role = state.assets_by_role || {};
+  const roleHeaders = assets_by_role[100];
   return layout.authWrap({
     title: "login",
     form: form,
@@ -82,8 +94,10 @@ const renderLoginView = async (entryPoint, versionTag, alerts = []) => {
     headers: [
       { css: `static_assets/${versionTag}/saltcorn.css` },
       { script: "js/iframe_view_utils.js" },
+      ...(roleHeaders ? roleHeaders : []),
     ],
     csrfToken: false,
+    req: new MobileRequest(),
   });
 };
 
@@ -104,6 +118,11 @@ const renderSignupView = (entryPoint, versionTag) => {
   });
 };
 
+/**
+ *
+ * @param {*} context
+ * @returns
+ */
 export const getLoginView = async (context) => {
   const mobileConfig = saltcorn.data.state.getState().mobileConfig;
   return {
@@ -116,6 +135,10 @@ export const getLoginView = async (context) => {
   };
 };
 
+/**
+ *
+ * @returns
+ */
 export const getSignupView = async () => {
   const config = saltcorn.data.state.getState().mobileConfig;
   return {
@@ -124,6 +147,10 @@ export const getSignupView = async () => {
   };
 };
 
+/**
+ *
+ * @returns
+ */
 export const logoutAction = async () => {
   const config = saltcorn.data.state.getState().mobileConfig;
   const response = await apiCall({ method: "GET", path: "/auth/logout" });

package/src/routing/routes/notifications.js

@@ -46,7 +46,7 @@ export const postShare = async (context) => {
       saltcorn.markup.tags.script(`
       setTimeout(() => {
         ${
-          Capacitor.platform === "android"
+          Capacitor.getPlatform() === "android"
             ? "parent.saltcorn.mobileApp.common.finishShareIntent();"
             : "parent.saltcorn.mobileApp.navigation.gotoEntryView();"
         } 

package/src/routing/utils.js

@@ -50,7 +50,9 @@ const getMenu = (req) => {
   const role = mobileCfg.user.role_id || 100;
   const extraMenu = saltcorn.data.web_mobile_commons.get_extra_menu(
     role,
-    req.__
+    req.__,
+    undefined,
+    req
   );
   if (mobileCfg.inErrorState) {
     const entryLink = mobileCfg.entry_point?.startsWith("get")

package/www/index.html

@@ -16,7 +16,7 @@
       if (window.saltcorn) window.saltcorn.mobileApp = mobileApp;
       else window.saltcorn = { mobileApp };
 
-      if (Capacitor.platform !== "web") {
+      if (Capacitor.getPlatform() !== "web") {
         document.addEventListener("deviceready", () => {
           saltcorn.mobileApp.init(_sc_mobile_config);
         });

package/www/js/iframe_view_utils.js

@@ -124,6 +124,8 @@ async function formSubmit(e, urlSuffix, viewname, noSubmitCb, matchingState) {
   }
 }
 
+function sc_form_submit_in_progress() {}
+
 async function ajaxSubmitForm(e, force_no_reload, event) {
   const form = $(e).closest("form");
   const action = form.attr("action");
@@ -285,6 +287,24 @@ async function loginFormSubmit(e, entryView) {
   }
 }
 
+async function loginWith(strategyName) {
+  try {
+    console.log("login with", strategyName);
+    const methods = parent.saltcorn.data.state.getState().auth_methods;
+    if (!methods[strategyName])
+      throw new Error(`No such auth strategy: ${strategyName}`);
+    const modName = methods[strategyName].module_name;
+    if (!modName)
+      throw new Error(`Module name for '${strategyName}' is not defined.`);
+    const authModule = parent.saltcorn.mobileApp.plugins[modName];
+    if (!authModule)
+      throw new Error(`Authentication module '${modName}' not found.`);
+    await authModule.startLogin(strategyName);
+  } catch (error) {
+    parent.saltcorn.mobileApp.common.errorAlert(error);
+  }
+}
+
 async function local_post_btn(e) {
   try {
     showLoadSpinner();
@@ -405,8 +425,8 @@ async function pjax_to(href, query, e) {
   let $dest = localizer.length
     ? localizer
     : inModal
-    ? $("#scmodal .modal-body")
-    : $("#page-inner-content");
+      ? $("#scmodal .modal-body")
+      : $("#page-inner-content");
   if (!$dest.length)
     await parent.saltcorn.mobileApp.navigation.handleRoute(safeHref, query);
   else