fix: fix the claim-add-raw view to work with axios

Reviewed-on: #148

BUILDING.md

@@ -61,9 +61,11 @@ Install dependencies:
 
 * `npx prettier --write ./sw_scripts/`
 
-* Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
+* Update the ClickUp tasks & CHANGELOG.md & the version in package.json.
 
-* Run a build to make sure package-lock version is updated, linting works, etc: `npm install && npm run build`
+* Run install & build to make sure package-lock version is updated, linting works, etc: `npm install && npm run build:web`
+
+* If also deploying to mobile, update the new version in the ios & android filed.
 
 * Commit everything (since the commit hash is used the app).
 
@@ -362,7 +364,7 @@ Prerequisites: macOS with Xcode installed
 4. Bump the version to match Android & package.json:
 
    ```
-   cd ios/App && xcrun agvtool new-version 36 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.3;/g" App.xcodeproj/project.pbxproj && cd -
+   cd ios/App && xcrun agvtool new-version 44 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.0.10;/g" App.xcodeproj/project.pbxproj && cd -
    # Unfortunately this edits Info.plist directly.
    #xcrun agvtool new-marketing-version 0.4.5
    ```

CHANGELOG.md

@@ -6,7 +6,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## [1.0.3] - 2025.07.12
+## [1.0.10] - 2025.08.25
+### Fixed
+- Now shows confirmable claims 30 minutes before meeting starts
+
+
+## [1.0.9] - 2025.08.20
+### Fixed
+- Deep link errors for meeting members
+
+
+## [1.0.6] - 2025.08.09
+### Fixed
+- Deep link errors where none would validate
+
+
+## [1.0.5] - 2025.07.24
+### Fixed
+- Export & import of contacts corrupted contact methods
+
+
+## [1.0.4] - 2025.07.20 - 002f2407208d56cc59c0aa7c880535ae4cbace8b
+### Fixed
+- Deep link for invite-one-accept
+
+
+## [1.0.3] - 2025.07.12 - a9a8ba217cd6015321911e98e6843e988dc2c4ae
 ### Changed
 - Photo is pinned to profile mode
 ### Fixed

android/app/build.gradle

@@ -31,8 +31,8 @@ android {
         applicationId "app.timesafari.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 36
-        versionName "1.0.3"
+        versionCode 44
+        versionName "1.0.10"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App.xcodeproj/project.pbxproj

@@ -403,7 +403,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -413,7 +413,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.10;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -430,7 +430,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 36;
+				CURRENT_PROJECT_VERSION = 44;
 				DEVELOPMENT_TEAM = GM3FS5JQPH;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -440,7 +440,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.3;
+				MARKETING_VERSION = 1.0.10;
 				PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timesafari",
-  "version": "1.0.4-beta",
+  "version": "1.0.10",
   "description": "Time Safari Application",
   "author": {
     "name": "Time Safari Team"

src/components/DataExportSection.vue

@@ -60,9 +60,11 @@ backup and database export, with platform-specific download instructions. * *
 
 <script lang="ts">
 import { Component, Prop, Vue } from "vue-facing-decorator";
+import * as R from "ramda";
+
 import { AppString, NotificationIface } from "../constants/app";
 
-import { Contact } from "../db/tables/contacts";
+import { Contact, ContactMaybeWithJsonStrings, ContactMethod } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
 
 import { logger } from "../utils/logger";
@@ -72,6 +74,7 @@ import {
   PlatformCapabilities,
 } from "../services/PlatformService";
 import { contactsToExportJson } from "../libs/util";
+import { parseJsonField } from "../db/databaseUtil";
 
 /**
  * @vue-component
@@ -133,13 +136,13 @@ export default class DataExportSection extends Vue {
    */
   public async exportDatabase() {
     try {
-      let allContacts: Contact[] = [];
+      let allDbContacts: ContactMaybeWithJsonStrings[] = [];
       const platformService = PlatformServiceFactory.getInstance();
       const result = await platformService.dbQuery(`SELECT * FROM contacts`);
       if (result) {
-        allContacts = databaseUtil.mapQueryResultToValues(
+        allDbContacts = databaseUtil.mapQueryResultToValues(
           result,
-        ) as unknown as Contact[];
+        ) as unknown as ContactMaybeWithJsonStrings[];
       }
       // if (USE_DEXIE_DB) {
       //   await db.open();
@@ -147,6 +150,19 @@ export default class DataExportSection extends Vue {
       // }
 
       // Convert contacts to export format
+      const allContacts: Contact[] = allDbContacts.map((contact) => {
+        // first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
+        const exContact: Contact = R.omit(
+          ["contactMethods"],
+          contact,
+        );
+        // now add contactMethods as a true array of ContactMethod objects
+        exContact.contactMethods = contact.contactMethods
+          ? parseJsonField(contact.contactMethods, [] as Array<ContactMethod>)
+          : undefined;
+        return exContact;
+      });
+
       const exportData = contactsToExportJson(allContacts);
       const jsonStr = JSON.stringify(exportData, null, 2);
       const blob = new Blob([jsonStr], { type: "application/json" });

src/db/tables/contacts.ts

@@ -30,6 +30,17 @@ export type ContactWithJsonStrings = Omit<Contact, "contactMethods"> & {
   contactMethods?: string;
 };
 
+/**
+ * This is for those cases (eg. with a DB) where field values may be all primitives or may be JSON values.
+ * See src/db/databaseUtil.ts parseJsonField for more details.
+ *
+ * This is so that we can reuse most of the type and don't have to maintain another copy.
+ * Another approach uses typescript conditionals: https://chatgpt.com/share/6855cdc3-ab5c-8007-8525-726612016eb2
+ */
+export type ContactMaybeWithJsonStrings = Omit<Contact, "contactMethods"> & {
+  contactMethods?: string | Array<ContactMethod>;
+};
+
 export const ContactSchema = {
   contacts: "&did, name", // no need to key by other things
 };

src/interfaces/deepLinks.ts

@@ -28,12 +28,11 @@
 import { z } from "zod";
 
 // Parameter validation schemas for each route type
-export const deepLinkSchemas = {
+export const deepLinkPathSchemas = {
   claim: z.object({
     id: z.string(),
   }),
   "claim-add-raw": z.object({
-    id: z.string(),
     claim: z.string().optional(),
     claimJwtId: z.string().optional(),
   }),
@@ -61,7 +60,7 @@ export const deepLinkSchemas = {
     jwt: z.string().optional(),
   }),
   "onboard-meeting-members": z.object({
-    id: z.string(),
+    groupId: z.string(),
   }),
   project: z.object({
     id: z.string(),
@@ -71,6 +70,17 @@ export const deepLinkSchemas = {
   }),
 };
 
+export const deepLinkQuerySchemas = {
+  "onboard-meeting-members": z.object({
+    password: z.string(),
+  }),
+};
+
+// Add a union type of all valid route paths
+export const VALID_DEEP_LINK_ROUTES = Object.keys(
+  deepLinkPathSchemas,
+) as readonly (keyof typeof deepLinkPathSchemas)[];
+
 // Create a type from the array
 export type DeepLinkRoute = (typeof VALID_DEEP_LINK_ROUTES)[number];
 
@@ -81,12 +91,13 @@ export const baseUrlSchema = z.object({
   queryParams: z.record(z.string()).optional(),
 });
 
-// Add a union type of all valid route paths
-export const VALID_DEEP_LINK_ROUTES = Object.keys(deepLinkSchemas) as readonly (keyof typeof deepLinkSchemas)[];
+// export type DeepLinkPathParams = {
+//   [K in keyof typeof deepLinkPathSchemas]: z.infer<(typeof deepLinkPathSchemas)[K]>;
+// };
 
-export type DeepLinkParams = {
-  [K in keyof typeof deepLinkSchemas]: z.infer<(typeof deepLinkSchemas)[K]>;
-};
+// export type DeepLinkQueryParams = {
+//   [K in keyof typeof deepLinkQuerySchemas]: z.infer<(typeof deepLinkQuerySchemas)[K]>;
+// };
 
 export interface DeepLinkError extends Error {
   code: string;
@@ -94,4 +105,6 @@ export interface DeepLinkError extends Error {
 }
 
 // Use the type to ensure route validation
-export const routeSchema = z.enum(VALID_DEEP_LINK_ROUTES as [string, ...string[]]);
+export const routeSchema = z.enum(
+  VALID_DEEP_LINK_ROUTES as [string, ...string[]],
+);

src/libs/endorserServer.ts

@@ -214,13 +214,13 @@ const testRecursivelyOnStrings = (
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function containsHiddenDid(obj: any) {
-  return testRecursivelyOnStrings(isHiddenDid, obj);
+  return testRecursivelyOnStrings(obj, isHiddenDid);
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const containsNonHiddenDid = (obj: any) => {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return testRecursivelyOnStrings((s: any) => isDid(s) && !isHiddenDid(s), obj);
+  return testRecursivelyOnStrings(obj, (s: any) => isDid(s) && !isHiddenDid(s));
 };
 
 export function stripEndorserPrefix(claimId: string) {

src/libs/util.ts

@@ -17,7 +17,7 @@ import {
   updateDefaultSettings,
 } from "../db/index";
 import { Account, AccountEncrypted } from "../db/tables/accounts";
-import { Contact, ContactWithJsonStrings } from "../db/tables/contacts";
+import { Contact } from "../db/tables/contacts";
 import * as databaseUtil from "../db/databaseUtil";
 import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "../db/tables/settings";
 import {
@@ -966,31 +966,19 @@ export interface DatabaseExport {
 }
 
 /**
- * Converts an array of contacts to the standardized database export JSON format.
+ * Converts an array of contacts to the export JSON format.
  * This format is used for data migration and backup purposes.
  *
  * @param contacts - Array of Contact objects to convert
  * @returns DatabaseExport object in the standardized format
  */
 export const contactsToExportJson = (contacts: Contact[]): DatabaseExport => {
-  // Convert each contact to a plain object and ensure all fields are included
-  const rows = contacts.map((contact) => {
-    const exContact: ContactWithJsonStrings = R.omit(
-      ["contactMethods"],
-      contact,
-    );
-    exContact.contactMethods = contact.contactMethods
-      ? JSON.stringify(contact.contactMethods, [])
-      : undefined;
-    return exContact;
-  });
-
   return {
     data: {
       data: [
         {
           tableName: "contacts",
-          rows,
+          rows: contacts,
         },
       ],
     },

src/main.capacitor.ts

@@ -72,7 +72,8 @@ const handleDeepLink = async (data: { url: string }) => {
     await deepLinkHandler.handleDeepLink(data.url);
   } catch (error) {
     logger.error("[DeepLink] Error handling deep link: ", error);
-    let message: string = error instanceof Error ? error.message : safeStringify(error);
+    let message: string =
+      error instanceof Error ? error.message : safeStringify(error);
     if (data.url) {
       message += `\nURL: ${data.url}`;
     }

src/services/deepLinks.ts

@@ -47,16 +47,20 @@ import { Router } from "vue-router";
 import { z } from "zod";
 
 import {
-  deepLinkSchemas,
+  deepLinkPathSchemas,
   baseUrlSchema,
   routeSchema,
   DeepLinkRoute,
+  deepLinkQuerySchemas,
 } from "../interfaces/deepLinks";
 import { logConsoleAndDb } from "../db/databaseUtil";
 import type { DeepLinkError } from "../interfaces/deepLinks";
 
 // Helper function to extract the first key from a Zod object schema
-function getFirstKeyFromZodObject(schema: z.ZodObject<any>): string | undefined {
+function getFirstKeyFromZodObject(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  schema: z.ZodObject<any>,
+): string | undefined {
   const shape = schema.shape;
   const keys = Object.keys(shape);
   return keys.length > 0 ? keys[0] : undefined;
@@ -64,21 +68,25 @@ function getFirstKeyFromZodObject(schema: z.ZodObject<any>): string | undefined
 
 /**
  * Maps deep link routes to their corresponding Vue router names and optional parameter keys.
- * 
+ *
  * It's an object where keys are the deep link routes and values are objects with 'name' and 'paramKey'.
  *
  * The paramKey is used to extract the parameter from the route path,
  * because "router.replace" expects the right parameter name for the route.
  */
 export const ROUTE_MAP: Record<string, { name: string; paramKey?: string }> =
-  Object.entries(deepLinkSchemas).reduce((acc, [routeName, schema]) => {
-    const paramKey = getFirstKeyFromZodObject(schema as z.ZodObject<any>);
-      acc[routeName] = { 
-        name: routeName, 
-        paramKey 
+  Object.entries(deepLinkPathSchemas).reduce(
+    (acc, [routeName, schema]) => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const paramKey = getFirstKeyFromZodObject(schema as z.ZodObject<any>);
+      acc[routeName] = {
+        name: routeName,
+        paramKey,
       };
       return acc;
-    }, {} as Record<string, { name: string; paramKey?: string }>);
+    },
+    {} as Record<string, { name: string; paramKey?: string }>,
+  );
 
 /**
  * Handles processing and routing of deep links in the application.
@@ -192,15 +200,23 @@ export class DeepLinkHandler {
     }
 
     // Continue with parameter validation as before...
-    const schema = deepLinkSchemas[path as keyof typeof deepLinkSchemas];
+    const pathSchema = deepLinkPathSchemas[path as keyof typeof deepLinkPathSchemas];
+    const querySchema = deepLinkQuerySchemas[path as keyof typeof deepLinkQuerySchemas];
 
-    let validatedParams, validatedQuery;
+    let validatedPathParams: Record<string, string> = {};
+    let validatedQueryParams: Record<string, string> = {};
     try {
-      validatedParams = await schema.parseAsync(params);
-      validatedQuery = await schema.parseAsync(query);
+      if (pathSchema) {
+        validatedPathParams = await pathSchema.parseAsync(params);
+      }
+      if (querySchema) {
+        validatedQueryParams = await querySchema.parseAsync(query);
+      }
     } catch (error) {
       // For parameter validation errors, provide specific error feedback
-      logConsoleAndDb(`[DeepLink] Invalid parameters for route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with params: ${JSON.stringify(params)} ... and query: ${JSON.stringify(query)}`, true);
+      logConsoleAndDb(
+        `[DeepLink] Invalid parameters for route name ${routeName} for path: ${path} ... with error: ${JSON.stringify(error)} ... with params: ${JSON.stringify(params)} ... and query: ${JSON.stringify(query)}`,
+      );
       await this.router.replace({
         name: "deep-link-error",
         params,
@@ -219,24 +235,25 @@ export class DeepLinkHandler {
     try {
       await this.router.replace({
         name: routeName,
-        params: validatedParams,
-        query: validatedQuery,
+        params: validatedPathParams,
+        query: validatedQueryParams
       });
     } catch (error) {
-      logConsoleAndDb(`[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedParams)} ... and validated query: ${JSON.stringify(validatedQuery)}`, true);
+      logConsoleAndDb(
+        `[DeepLink] Error routing to route name ${routeName} for path: ${path}: ${JSON.stringify(error)} ... with validated params: ${JSON.stringify(validatedPathParams)} ... and query: ${JSON.stringify(validatedQueryParams)}`,
+      );
       // For parameter validation errors, provide specific error feedback
       await this.router.replace({
         name: "deep-link-error",
-        params: validatedParams,
+        params: validatedPathParams,
         query: {
           originalPath: path,
           errorCode: "ROUTING_ERROR",
-          errorMessage: `Error routing to ${routeName}: ${(JSON.stringify(error))}`,
-          ...validatedQuery,
+          errorMessage: `Error routing to ${routeName}: ${JSON.stringify(error)}`,
+          ...validatedQueryParams,
         },
       });
     }
-
   }
 
   /**

src/views/AccountViewView.vue

@@ -1154,6 +1154,7 @@ export default class AccountViewView extends Vue {
         } catch (error) {
           if (error.status === 404) {
             // this is ok: the profile is not yet created
+            logger.info("Note that axios may have logged an error but it just doesn't exist.");
           } else {
             databaseUtil.logConsoleAndDb(
               "Error loading profile: " + errorStringForLog(error),

src/views/ClaimAddRawView.vue

@@ -30,7 +30,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { AxiosInstance } from "axios";
 
 import QuickNav from "../components/QuickNav.vue";
 import { NotificationIface, USE_DEXIE_DB } from "../constants/app";
@@ -54,7 +53,6 @@ export default class ClaimAddRawView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
   $route!: RouteLocationNormalizedLoaded;
   $router!: Router;
-  axios!: AxiosInstance;
 
   accountIdentityStr: string = "null";
   activeDid = "";

src/views/DeepLinkErrorView.vue

@@ -31,7 +31,11 @@
       <h2>Supported Deep Links</h2>
       <ul>
         <li v-for="(routeItem, index) in validRoutes" :key="index">
-          <code>timesafari://{{ routeItem }}/:{{ deepLinkSchemaKeys[routeItem] }}</code>
+          <code
+            >timesafari://{{ routeItem }}/:{{
+              deepLinkSchemaKeys[routeItem]
+            }}</code
+          >
         </li>
       </ul>
     </div>
@@ -41,7 +45,10 @@
 <script setup lang="ts">
 import { computed, onMounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
-import { VALID_DEEP_LINK_ROUTES, deepLinkSchemas } from "../interfaces/deepLinks";
+import {
+  VALID_DEEP_LINK_ROUTES,
+  deepLinkPathSchemas,
+} from "../interfaces/deepLinks";
 import { logConsoleAndDb } from "../db/databaseUtil";
 import { logger } from "../utils/logger";
 
@@ -49,10 +56,10 @@ const route = useRoute();
 const router = useRouter();
 // an object with the route as the key and the first param name as the value
 const deepLinkSchemaKeys = Object.fromEntries(
-  Object.entries(deepLinkSchemas).map(([route, schema]) => {
+  Object.entries(deepLinkPathSchemas).map(([route, schema]) => {
     const param = Object.keys(schema.shape)[0];
     return [route, param];
-  })
+  }),
 );
 
 // Extract error information from query params

src/views/InviteOneAcceptView.vue

@@ -128,7 +128,10 @@ export default class InviteOneAcceptView extends Vue {
     }
 
     // Extract JWT from route path
-    const jwt = (this.$route.params.jwt as string) || this.$route.query.jwt as string || "";
+    const jwt =
+      (this.$route.params.jwt as string) ||
+      (this.$route.query.jwt as string) ||
+      "";
     await this.processInvite(jwt, false);
 
     this.checkingInvite = false;

src/views/OnboardMeetingMembersView.vue

@@ -117,6 +117,9 @@ export default class OnboardMeetingMembersView extends Vue {
     this.isRegistered = settings.isRegistered || false;
     try {
       if (!this.activeDid) {
+        logConsoleAndDb(
+          "[OnboardMeetingMembersView] No active DID found, creating identity as fallback for meeting setup",
+        );
         this.activeDid = await generateSaveAndActivateIdentity();
         this.isRegistered = false;
       }

src/views/QuickActionBvcBeginView.vue

@@ -153,9 +153,7 @@ export default class QuickActionBvcBeginView extends Vue {
               group: "alert",
               type: "danger",
               title: "Error",
-              text:
-                timeResult?.error ||
-                "There was an error sending the time.",
+              text: timeResult?.error || "There was an error sending the time.",
             },
             5000,
           );

src/views/QuickActionBvcEndView.vue

@@ -221,7 +221,8 @@ export default class QuickActionBvcBeginView extends Vue {
     }
     const eventStartDateObj = currentOrPreviousSat
       .set({ weekday: 6 })
-      .set({ hour: 9 })
+      .set({ hour: 8 })
+      .set({ minute: 30 }) // to catch if people put their claims 30 minutes early
       .startOf("hour");
 
     // Hack, but full ISO pushes the length to 340 which crashes verifyJWT!