@nativesquare/soma 0.9.4 → 0.10.1

package/src/component/_generated/api.ts

@@ -57,8 +57,17 @@ import type * as garmin_utils from "../garmin/utils.js";
 import type * as garmin_webhooks from "../garmin/webhooks.js";
 import type * as private_ from "../private.js";
 import type * as public_ from "../public.js";
+import type * as strava_auth from "../strava/auth.js";
+import type * as strava_client from "../strava/client.js";
 import type * as strava_private from "../strava/private.js";
 import type * as strava_public from "../strava/public.js";
+import type * as strava_transform_activity from "../strava/transform/activity.js";
+import type * as strava_transform_athlete from "../strava/transform/athlete.js";
+import type * as strava_transform_maps_sportType from "../strava/transform/maps/sportType.js";
+import type * as strava_types_stravaApi_client_index from "../strava/types/stravaApi/client/index.js";
+import type * as strava_types_stravaApi_index from "../strava/types/stravaApi/index.js";
+import type * as strava_utils from "../strava/utils.js";
+import type * as utils from "../utils.js";
 import type * as validators_activity from "../validators/activity.js";
 import type * as validators_athlete from "../validators/athlete.js";
 import type * as validators_body from "../validators/body.js";
@@ -130,8 +139,17 @@ const fullApi: ApiFromModules<{
   "garmin/webhooks": typeof garmin_webhooks;
   private: typeof private_;
   public: typeof public_;
+  "strava/auth": typeof strava_auth;
+  "strava/client": typeof strava_client;
   "strava/private": typeof strava_private;
   "strava/public": typeof strava_public;
+  "strava/transform/activity": typeof strava_transform_activity;
+  "strava/transform/athlete": typeof strava_transform_athlete;
+  "strava/transform/maps/sportType": typeof strava_transform_maps_sportType;
+  "strava/types/stravaApi/client/index": typeof strava_types_stravaApi_client_index;
+  "strava/types/stravaApi/index": typeof strava_types_stravaApi_index;
+  "strava/utils": typeof strava_utils;
+  utils: typeof utils;
   "validators/activity": typeof validators_activity;
   "validators/athlete": typeof validators_athlete;
   "validators/body": typeof validators_body;

package/src/component/_generated/component.ts

@@ -38,31 +38,186 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           any,
           Name
         >;
-        connectGarmin: FunctionReference<
+        disconnectGarmin: FunctionReference<
+          "action",
+          "internal",
+          { userId: string },
+          any,
+          Name
+        >;
+        getGarminAuthUrl: FunctionReference<
+          "action",
+          "internal",
+          { clientId: string; redirectUri?: string; userId: string },
+          any,
+          Name
+        >;
+        pullActivities: FunctionReference<
           "action",
           "internal",
           {
             clientId: string;
             clientSecret: string;
-            code: string;
-            codeVerifier: string;
-            redirectUri?: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
             userId: string;
           },
           any,
           Name
         >;
-        disconnectGarmin: FunctionReference<
+        pullAll: FunctionReference<
           "action",
           "internal",
-          { userId: string },
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
           any,
           Name
         >;
-        getGarminAuthUrl: FunctionReference<
+        pullBloodPressures: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullBody: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullDailies: FunctionReference<
           "action",
           "internal",
-          { clientId: string; redirectUri?: string; userId?: string },
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullHRV: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullMenstruation: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullPulseOx: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullRespiration: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullSkinTemperature: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullSleep: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullStressDetails: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
+          any,
+          Name
+        >;
+        pullUserMetrics: FunctionReference<
+          "action",
+          "internal",
+          {
+            clientId: string;
+            clientSecret: string;
+            endTimeInSeconds?: number;
+            startTimeInSeconds?: number;
+            userId: string;
+          },
           any,
           Name
         >;
@@ -1647,34 +1802,48 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
     };
     strava: {
       public: {
-        connectStrava: FunctionReference<
+        completeStravaOAuth: FunctionReference<
           "action",
           "internal",
           {
-            baseUrl?: string;
             clientId: string;
             clientSecret: string;
             code: string;
-            includeStreams?: boolean;
-            userId: string;
-          },
-          {
-            connectionId: string;
-            errors: Array<{ activityId: number; error: string }>;
-            synced: number;
+            state: string;
           },
+          { connectionId: string; userId: string },
           Name
         >;
         disconnectStrava: FunctionReference<
+          "action",
+          "internal",
+          { clientId: string; clientSecret: string; userId: string },
+          null,
+          Name
+        >;
+        getStravaAuthUrl: FunctionReference<
           "action",
           "internal",
           {
-            baseUrl?: string;
             clientId: string;
-            clientSecret: string;
+            redirectUri: string;
+            scope?: string;
             userId: string;
           },
-          null,
+          any,
+          Name
+        >;
+        syncAllTypes: FunctionReference<
+          "action",
+          "internal",
+          {
+            accessToken: string;
+            after?: number;
+            before?: number;
+            connectionId: string;
+            userId: string;
+          },
+          any,
           Name
         >;
         syncStrava: FunctionReference<
@@ -1682,15 +1851,13 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
           "internal",
           {
             after?: number;
-            baseUrl?: string;
             clientId: string;
             clientSecret: string;
-            includeStreams?: boolean;
             userId: string;
           },
           {
-            errors: Array<{ activityId: number; error: string }>;
-            synced: number;
+            errors: Array<{ error: string; id: string; type: string }>;
+            synced: { activities: number; athletes: number };
           },
           Name
         >;

package/src/component/garmin/auth.ts

@@ -32,15 +32,6 @@ export function generateCodeVerifier(length = 64): string {
   );
 }
 
-/**
- * Generate a random state parameter for CSRF protection.
- */
-export function generateState(): string {
-  const bytes = new Uint8Array(32);
-  crypto.getRandomValues(bytes);
-  return Array.from(bytes, (b) => b.toString(16).padStart(2, "0")).join("");
-}
-
 /**
  * Compute the S256 code challenge from a code verifier.
  * Returns `base64url(sha256(verifier))`.

package/src/component/garmin/private.ts

@@ -94,6 +94,10 @@ import {
   garminMenstrualCycleTrackingPushPayloadSchema,
 } from "./schemas/menstrualCycleTracking.js";
 import { transformMenstrualCycleTracking } from "./transform/menstrualCycleTracking.js";
+import { refreshToken } from "./auth";
+import type { Doc, Id } from "../_generated/dataModel";
+
+const REFRESH_BUFFER_SECONDS = 600;
 // ─── Internal Pending OAuth CRUD ─────────────────────────────────────────────
 // Temporary storage for in-progress Garmin OAuth 2.0 PKCE flows.
 // Bridges getGarminAuthUrl and completeGarminOAuth.
@@ -117,18 +121,6 @@ export const storePendingOAuth = internalMutation({
 
 export const getPendingOAuth = internalQuery({
   args: { state: v.string() },
-  returns: v.union(
-    v.object({
-      _id: v.id("pendingOAuth"),
-      _creationTime: v.number(),
-      provider: v.string(),
-      state: v.string(),
-      codeVerifier: v.string(),
-      userId: v.string(),
-      createdAt: v.number(),
-    }),
-    v.null(),
-  ),
   handler: async (ctx, args) => {
     return await ctx.db
       .query("pendingOAuth")
@@ -152,6 +144,84 @@ export const deletePendingOAuth = internalMutation({
   },
 });
 
+export const resolveConnectionAndAccessToken = internalAction({
+  args: {
+    userId: v.string(),
+    clientId: v.string(),
+    clientSecret: v.string(),
+  },
+  handler: async (ctx, args): Promise<{
+    connectionId: Id<"connections">;
+    accessToken: string;
+  }> => {
+    const connection: Doc<"connections"> | null = await ctx.runQuery(
+      internal.private.getConnectionByProvider,
+      { userId: args.userId, provider: "GARMIN" },
+    );
+
+    if (!connection) {
+      throw new Error(
+        `No Garmin connection found for user "${args.userId}". ` +
+        "Connect to Garmin first via getGarminAuthUrl.",
+      );
+    }
+
+    if (!connection.active) {
+      throw new Error(
+        `Garmin connection for user "${args.userId}" is inactive. Reconnect first.`,
+      );
+    }
+
+    const connectionId = connection._id;
+
+    const tokenDoc: Doc<"providerTokens"> | null = await ctx.runQuery(
+      internal.garmin.private.getTokens,
+      { connectionId },
+    );
+
+    if (!tokenDoc) {
+      throw new Error(
+        "No Garmin tokens found for this connection. " +
+        "The connection may have been created before token storage was available.",
+      );
+    }
+
+    let accessToken = tokenDoc.accessToken;
+
+    // Refresh the token if it's expired or about to expire
+    const nowSeconds = Math.floor(Date.now() / 1000);
+    if (
+      tokenDoc.expiresAt &&
+      tokenDoc.refreshToken &&
+      nowSeconds >= tokenDoc.expiresAt - REFRESH_BUFFER_SECONDS
+    ) {
+      const refreshed = await refreshToken({
+        clientId: args.clientId,
+        clientSecret: args.clientSecret,
+        refreshToken: tokenDoc.refreshToken,
+      });
+
+      accessToken = refreshed.access_token;
+      const newExpiresAt = nowSeconds + refreshed.expires_in;
+
+      const _refreshed: null = await ctx.runMutation(
+        internal.garmin.private.storeTokens,
+        {
+          connectionId,
+          accessToken: refreshed.access_token,
+          refreshToken: refreshed.refresh_token,
+          expiresAt: newExpiresAt,
+        },
+      );
+    }
+
+    return {
+      connectionId,
+      accessToken,
+    };
+  },
+});
+
 // ─── Internal Token CRUD ─────────────────────────────────────────────────────
 
 /**
@@ -240,6 +310,8 @@ export const deleteTokens = internalMutation({
   },
 });
 
+
+
 // ─── Activity Push Processing ───────────────────────────────────────────────
 
 /**