feature: add the ability to create and delete shopify plans and have it reflected in trieve

densumesh · cdxker · commit 5374a61f665e · 2025-04-09T11:08:08.000-07:00
diff --git a/clients/trieve-shopify-extension/app/auth.ts b/clients/trieve-shopify-extension/app/auth.ts
@@ -3,7 +3,7 @@ import { authenticate } from "app/shopify.server";
 import { StrongTrieveKey, TrieveKey } from "./types";
 import { TrieveSDK } from "trieve-ts-sdk";
 import { getTrieveBaseUrlEnv } from "./env.server";
-
+import { JwtPayload } from "jsonwebtoken";
 export const validateTrieveAuth = async <S extends boolean = true>(
   request: LoaderFunctionArgs["request"],
   strict: S = true as S,
@@ -49,6 +49,49 @@ export const validateTrieveAuth = async <S extends boolean = true>(
   } as S extends true ? StrongTrieveKey : TrieveKey;
 };
 
+export const validateTrieveAuthWehbook = async <S extends boolean = true>(
+  shop: string,
+  strict: S = true as S,
+): Promise<S extends true ? StrongTrieveKey : TrieveKey> => {
+  const key = await prisma.apiKey.findFirst({
+    where: {
+      shop: `https://${shop}`,
+    },
+  });
+
+  if (!key) {
+    throw new Response(
+      JSON.stringify({ message: "No key matching the current user" }),
+      {
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+        status: 401,
+      },
+    );
+  }
+
+  if (strict && !key.currentDatasetId) {
+    throw new Response(
+      JSON.stringify({ message: "No dataset selected" }),
+      {
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+        status: 401,
+      },
+    );
+  }
+
+  return {
+    id: key.id,
+    key: key.key,
+    organizationId: key.organizationId,
+    currentDatasetId: key.currentDatasetId,
+    userId: key.userId,
+  } as S extends true ? StrongTrieveKey : TrieveKey;
+};
+
 export const sdkFromKey = (key: TrieveKey): TrieveSDK => {
   const trieve = new TrieveSDK({
     baseUrl: getTrieveBaseUrlEnv(),
diff --git a/clients/trieve-shopify-extension/app/routes/app._dashboard._index.tsx b/clients/trieve-shopify-extension/app/routes/app._dashboard._index.tsx
@@ -142,8 +142,6 @@ export default function Dashboard() {
     );
   }
 
-  const navigate = useNavigate();
-
   return (
     <>
       <Modal open={showCancelModal} onClose={() => { setShowCancelModal(false) }} title="Cancel Subscription">
diff --git a/clients/trieve-shopify-extension/app/routes/app._dashboard.chat.tsx b/clients/trieve-shopify-extension/app/routes/app._dashboard.chat.tsx
@@ -47,7 +47,7 @@ export default function ChatAnalyticsPage() {
               granularity={granularity}
               direct={false}
             />
-            <ChatUserJourneyFunnel filters={filters} />
+            {/* <ChatUserJourneyFunnel filters={filters} /> */}
             <TopicCTRRate filters={filters} granularity={granularity} />
             <ChatAverageRating filters={filters} granularity={granularity} />
           </div>
diff --git a/clients/trieve-shopify-extension/app/routes/webhooks.app.app_subscriptions.update.tsx b/clients/trieve-shopify-extension/app/routes/webhooks.app.app_subscriptions.update.tsx
@@ -3,9 +3,23 @@ import { authenticate } from "../shopify.server";
 import { useAppBridge } from "@shopify/app-bridge-react";
 import { ShopifyPlanChangePayload } from "trieve-ts-sdk";
 import db from "../db.server";
+import { useTrieve } from "app/context/trieveContext";
+import { sdkFromKey, validateTrieveAuthWehbook } from "app/auth";
+
+async function hashString(str: string) {
+  const textEncoder = new TextEncoder();
+  const data = textEncoder.encode(str);
+  const hashBuffer = await crypto.subtle.digest('SHA-256', data);
+  const hashArray = Array.from(new Uint8Array(hashBuffer));
+  const hashHex = hashArray.map(byte => byte.toString(16).padStart(2, '0')).join('');
+  return hashHex;
+}
 
 export const action = async ({ request }: ActionFunctionArgs) => {
-  const { shop, payload, topic } = await authenticate.webhook(request);
+  const { admin, shop, payload, topic } = await authenticate.webhook(request);
+  const key = await validateTrieveAuthWehbook(shop);
+  const trieve = sdkFromKey(key);
+
 
   console.log(`Received ${topic} webhook for ${shop}`);
   const organization_id = await db.apiKey.findFirst({
@@ -17,19 +31,31 @@ export const action = async ({ request }: ActionFunctionArgs) => {
     return new Response("Organization not found", { status: 404 });
   }
 
+  const data = await admin?.graphql(
+    `
+    query {
+      currentAppInstallation {
+        activeSubscriptions {
+          currentPeriodEnd
+        }
+      }
+    }
+  `
+  )
+
   const trievePayload: ShopifyPlanChangePayload = {
     organization_id: organization_id?.organizationId,
-    session_token: process.env.SHOPIFY_SECRET_KEY || "",
+    idempotency_key: await hashString(`${payload.app_subscription.updated_at}-${payload.app_subscription.admin_graphql_api_id}`),
     shopify_plan: {
-      name: payload.app_subscription.name,
-      handle: payload.app_subscription.name,
+      handle: payload.app_subscription.name.replace("\n", "").replace(/ /g, "-").toLowerCase(),
       status: payload.app_subscription.status,
+      current_period_end: (await data?.json())?.data.currentAppInstallation.activeSubscriptions?.[0]?.currentPeriodEnd ?? undefined,
     },
   };
 
-  console.log(
-    trievePayload
-  )
+  console.log(trievePayload)
+
+  await trieve.handleShopifyPlanChange(trievePayload, process.env.SHOPIFY_SECRET_KEY || "");
 
   return new Response();
 };
diff --git a/clients/ts-sdk/openapi.json b/clients/ts-sdk/openapi.json
@@ -19077,15 +19077,15 @@
       "ShopifyPlan": {
         "type": "object",
         "required": [
-          "name",
           "handle",
           "status"
         ],
         "properties": {
-          "handle": {
-            "type": "string"
+          "current_period_end": {
+            "type": "string",
+            "nullable": true
           },
-          "name": {
+          "handle": {
             "type": "string"
           },
           "status": {
@@ -19097,17 +19097,17 @@
         "type": "object",
         "required": [
           "organization_id",
-          "session_token",
+          "idempotency_key",
           "shopify_plan"
         ],
         "properties": {
+          "idempotency_key": {
+            "type": "string"
+          },
           "organization_id": {
             "type": "string",
             "format": "uuid"
           },
-          "session_token": {
-            "type": "string"
-          },
           "shopify_plan": {
             "$ref": "#/components/schemas/ShopifyPlan"
           }
diff --git a/clients/ts-sdk/src/fetch-client.ts b/clients/ts-sdk/src/fetch-client.ts
@@ -142,6 +142,8 @@ export class TrieveFetchClient {
           headers["TR-Organization"] = value;
         } else if (key === "xApiVersion" && typeof value === "string") {
           headers["X-API-VERSION"] = value;
+        } else if (key === "xShopifyAuthorization" && typeof value === "string") {
+          headers["X-Shopify-Authorization"] = value;
         }
         // Check if the key is in the path as path params
         const snakedKey = camelcaseToSnakeCase(key);
diff --git a/clients/ts-sdk/src/functions/stripe/index.ts b/clients/ts-sdk/src/functions/stripe/index.ts
@@ -6,7 +6,7 @@
  */
 
 import { TrieveSDK } from "../../sdk";
-import { StripePlan } from "../../types.gen";
+import { ShopifyPlanChangePayload, StripePlan } from "../../types.gen";
 
 export async function getStripePlans(
   /** @hidden */
@@ -35,3 +35,16 @@ export async function startStripeCheckout(
     }
   );
 }
+
+
+export async function handleShopifyPlanChange(
+  /** @hidden */
+  this: TrieveSDK,
+  payload: ShopifyPlanChangePayload,
+  shopifySecretKey: string
+) {
+  return this.trieve.fetch<"eject">("/api/shopify/plan_change", "post", {
+    data: payload,
+    xShopifyAuthorization: shopifySecretKey,
+  });
+}
diff --git a/clients/ts-sdk/src/types.gen.ts b/clients/ts-sdk/src/types.gen.ts
@@ -3749,14 +3749,14 @@ export type ShopifyCustomerEvent = {
 };
 
 export type ShopifyPlan = {
+    current_period_end?: (string) | null;
     handle: string;
-    name: string;
     status: string;
 };
 
 export type ShopifyPlanChangePayload = {
+    idempotency_key: string;
     organization_id: string;
-    session_token: string;
     shopify_plan: ShopifyPlan;
 };
 
diff --git a/server/src/data/models.rs b/server/src/data/models.rs
@@ -4013,7 +4013,16 @@ impl StripeUsageBasedPlan {
 }
 
 #[derive(
-    Debug, Serialize, Deserialize, Selectable, Clone, Queryable, Insertable, ValidGrouping, ToSchema,
+    Debug,
+    Serialize,
+    Deserialize,
+    Selectable,
+    Clone,
+    Queryable,
+    Insertable,
+    ValidGrouping,
+    ToSchema,
+    AsChangeset,
 )]
 #[schema(example=json!({
     "id": "e3e3e3e3-e3e3-e3e3-e3e3-e3e3e3e3e3e3",
diff --git a/server/src/handlers/payment_handler.rs b/server/src/handlers/payment_handler.rs
@@ -27,6 +27,7 @@ use crate::{
     },
 };
 use actix_web::{web, HttpRequest, HttpResponse};
+use dateparser::DateTimeUtc;
 use serde::{Deserialize, Serialize};
 use stripe::{EventObject, EventType, Object, Webhook};
 use utoipa::ToSchema;
@@ -205,6 +206,7 @@ pub async fn webhook(
                                     subscription_stripe_id,
                                     plan_id,
                                     organization_id,
+                                    None,
                                     pool.clone(),
                                 )
                                 .await?;
@@ -480,6 +482,7 @@ pub async fn update_subscription_plan(
                         current_trieve_subscription.stripe_subscription_id(),
                         flat_plan.id,
                         current_trieve_subscription.organization_id(),
+                        current_trieve_subscription.current_period_end(),
                         pool.clone(),
                     )
                     .await?;
@@ -722,20 +725,15 @@ pub async fn estimate_bill_from_range(
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct ShopifyPlanChangePayload {
     pub organization_id: uuid::Uuid,
-    pub session_token: String,
+    pub idempotency_key: String,
     pub shopify_plan: ShopifyPlan,
 }
 
 #[derive(Debug, Serialize, Deserialize, ToSchema)]
 pub struct ShopifyPlan {
-    pub name: String,
     pub handle: String,
     pub status: String,
-}
-
-#[derive(Debug, Serialize, Deserialize, ToSchema)]
-pub struct ShopifyClaims {
-    pub dest: String,
+    pub current_period_end: Option<String>,
 }
 
 #[utoipa::path(
@@ -749,10 +747,22 @@ pub struct ShopifyClaims {
     ),
 )]
 pub async fn handle_shopify_plan_change(
+    req: HttpRequest,
     payload: web::Json<ShopifyPlanChangePayload>,
     pool: web::Data<Pool>,
 ) -> Result<HttpResponse, actix_web::Error> {
-    if payload.session_token != get_env!("SHOPIFY_SECRET_KEY", "SHOPIFY_SECRET_KEY must be set") {
+    let access_key = req
+        .headers()
+        .get("X-Shopify-Authorization")
+        .ok_or(ServiceError::BadRequest(
+            "X-Shopify-Authorization header is required".to_string(),
+        ))?
+        .to_str()
+        .map_err(|_| {
+            ServiceError::BadRequest("Failed to parse X-Shopify-Authorization header".to_string())
+        })?;
+
+    if access_key != get_env!("SHOPIFY_SECRET_KEY", "SHOPIFY_SECRET_KEY must be set") {
         return Err(ServiceError::BadRequest("Invalid session token".to_string()).into());
     }
 
@@ -766,6 +776,11 @@ pub async fn handle_shopify_plan_change(
         .map_err(|e| ServiceError::BadRequest(e.to_string()))?;
 
     if let Some(organization_plan) = organization_plan {
+        if organization_plan.stripe_id == payload.idempotency_key {
+            // No changes
+            return Ok(HttpResponse::NoContent().finish());
+        }
+
         if organization_plan.plan_id == plan.id
             && payload.shopify_plan.status.to_lowercase() == "active"
         {
@@ -786,19 +801,33 @@ pub async fn handle_shopify_plan_change(
         {
             // Create a new plan
             create_stripe_subscription_query(
-                plan.stripe_id,
+                payload.idempotency_key.clone(),
                 plan.id,
                 payload.organization_id,
+                payload.shopify_plan.current_period_end.clone().map(|s| {
+                    s.parse::<DateTimeUtc>()
+                        .unwrap()
+                        .0
+                        .with_timezone(&chrono::Utc)
+                        .naive_utc()
+                }),
                 pool.clone(),
             )
             .await?;
         }
     } else if payload.shopify_plan.status.to_lowercase() == "active" {
         // Create a new plan
         create_stripe_subscription_query(
-            plan.stripe_id,
+            payload.idempotency_key.clone(),
             plan.id,
             payload.organization_id,
+            payload.shopify_plan.current_period_end.clone().map(|s| {
+                s.parse::<DateTimeUtc>()
+                    .unwrap()
+                    .0
+                    .with_timezone(&chrono::Utc)
+                    .naive_utc()
+            }),
             pool.clone(),
         )
         .await?;
diff --git a/server/src/operators/dataset_operator.rs b/server/src/operators/dataset_operator.rs
diff --git a/server/src/operators/organization_operator.rs b/server/src/operators/organization_operator.rs
diff --git a/server/src/operators/payment_operator.rs b/server/src/operators/payment_operator.rs

Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,6 @@ export default function Dashboard() {`
`142`	`142`	`);`
`143`	`143`	`}`
`144`	`144`
`145`		`- const navigate = useNavigate();`
`146`		`-`
`147`	`145`	`return (`
`148`	`146`	`<>`
`149`	`147`	`<Modal open={showCancelModal} onClose={() => { setShowCancelModal(false) }} title="Cancel Subscription">`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,8 @@ export class TrieveFetchClient {`
`142`	`142`	`headers["TR-Organization"] = value;`
`143`	`143`	`} else if (key === "xApiVersion" && typeof value === "string") {`
`144`	`144`	`headers["X-API-VERSION"] = value;`
	`145`	`+ } else if (key === "xShopifyAuthorization" && typeof value === "string") {`
	`146`	`+ headers["X-Shopify-Authorization"] = value;`
`145`	`147`	`}`
`146`	`148`	`// Check if the key is in the path as path params`
`147`	`149`	`const snakedKey = camelcaseToSnakeCase(key);`