@drawbridge/drawbridge-utils 0.0.19 → 0.0.20

package/dist/shopify.cjs

@@ -30,7 +30,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var shopify_exports = {};
 __export(shopify_exports, {
   getAdminToken: () => getAdminToken,
-  refreshAdminToken: () => refreshAdminToken
+  refreshAdminToken: () => refreshAdminToken,
+  resolveConnectionSettings: () => resolveConnectionSettings
 });
 module.exports = __toCommonJS(shopify_exports);
 
@@ -66,6 +67,8 @@ var decrypt = (value) => {
 
 // shopify.js
 var SHOPIFY_ADMIN_API_VERSION = "2025-01";
+var REFRESH_TOKEN_LIFETIME_MS = 90 * 24 * 60 * 60 * 1e3;
+var ACCESS_TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1e3;
 var shopifyOAuthFetch = async (url, body) => {
   const response = await fetch(url, {
     method: "POST",
@@ -98,9 +101,37 @@ var pingShop = async ({ adminAccessToken, domain }) => {
     throw error;
   }
 };
+var resolveConnectionSettings = async ({ connection, controller }) => {
+  const connectionSettings = (connection == null ? void 0 : connection.settings) ? decrypt(connection.settings) : {};
+  if (!(connection == null ? void 0 : connection.credential)) {
+    return connectionSettings;
+  }
+  const credential = await controller.get({
+    collection: "credential",
+    query: {
+      id: connection.credential
+    }
+  });
+  const credentialSettings = (credential == null ? void 0 : credential.settings) ? decrypt(credential.settings) : {};
+  return {
+    ...credentialSettings,
+    ...connectionSettings
+  };
+};
 var refreshAdminToken = async ({ connection, controller }) => {
-  const settings = decrypt(connection.settings);
-  const { domain, refreshToken } = settings;
+  const credential = await controller.get({
+    collection: "credential",
+    query: {
+      id: connection.credential
+    }
+  });
+  if (!credential) {
+    throw new Error("refreshAdminToken: credential not found for connection " + connection.id);
+  }
+  ;
+  const settings = decrypt(credential.settings);
+  const { identifier: domain } = credential;
+  const { refreshToken } = settings;
   const data = await shopifyOAuthFetch(
     `https://${domain}/admin/oauth/access_token`,
     {
@@ -114,73 +145,48 @@ var refreshAdminToken = async ({ connection, controller }) => {
   const newRefreshToken = data.refresh_token;
   const expiresIn = data.expires_in;
   const tokenExpiresAt = expiresIn ? new Date(Date.now() + expiresIn * 1e3) : null;
+  const refreshTokenExpiresAt = new Date(Date.now() + REFRESH_TOKEN_LIFETIME_MS);
   await pingShop({ adminAccessToken, domain });
-  const tokenWorkflow = await controller.get({
-    collection: "workflow",
-    query: {
-      connection: connection.id,
-      organization: connection.organization,
-      system: true,
-      title: "Shopify Token Activity"
-    }
-  });
-  await controller.transaction(async (session) => {
-    const options = { session };
-    await controller.update({
-      collection: "connection",
-      data: {
-        $set: {
-          settings: encrypt({
-            ...settings,
-            adminAccessToken,
-            refreshToken: newRefreshToken,
-            tokenExpiresAt
-          })
-        }
-      },
-      options,
-      query: {
-        id: connection.id
+  await controller.update({
+    collection: "credential",
+    data: {
+      $set: {
+        settings: encrypt({
+          ...settings,
+          adminAccessToken,
+          refreshToken: newRefreshToken,
+          refreshTokenExpiresAt,
+          tokenExpiresAt
+        })
       }
-    });
-    if (tokenWorkflow) {
-      await controller.create({
-        collection: "action",
-        data: {
-          completedAt: /* @__PURE__ */ new Date(),
-          error: null,
-          errorStatus: null,
-          organization: connection.organization,
-          request: null,
-          response: null,
-          slug: "action.shopify.token.refresh",
-          status: "succeeded",
-          trigger: {
-            data: {
-              connection: connection.id
-            },
-            event: "shopify.token"
-          },
-          usage: null,
-          workflow: tokenWorkflow.id
-        },
-        options
-      });
+    },
+    query: {
+      id: credential.id
     }
-    ;
   });
   return adminAccessToken;
 };
 var getAdminToken = async ({ connection, controller }) => {
-  const { adminAccessToken, tokenExpiresAt } = decrypt(connection.settings);
-  const needsRefresh = tokenExpiresAt && new Date(tokenExpiresAt) < new Date(Date.now() + 5 * 60 * 1e3);
+  if (!(connection == null ? void 0 : connection.credential)) {
+    return null;
+  }
+  ;
+  const settings = await resolveConnectionSettings({ connection, controller });
+  const { adminAccessToken, refreshToken, tokenExpiresAt } = settings;
+  if (!refreshToken) {
+    return adminAccessToken;
+  }
+  ;
+  const needsRefresh = !tokenExpiresAt || new Date(tokenExpiresAt) < new Date(Date.now() + ACCESS_TOKEN_REFRESH_BUFFER_MS);
   if (needsRefresh) {
     return refreshAdminToken({ connection, controller });
   }
+  ;
   return adminAccessToken;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAdminToken,
-  refreshAdminToken
+  refreshAdminToken,
+  resolveConnectionSettings
 });

package/dist/shopify.d.cts

@@ -2,6 +2,8 @@ import { decrypt, encrypt } from './encrypt.cjs';
 import 'crypto';
 
 const SHOPIFY_ADMIN_API_VERSION = '2025-01';
+const REFRESH_TOKEN_LIFETIME_MS = 90 * 24 * 60 * 60 * 1000;
+const ACCESS_TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1000;
 
 const shopifyOAuthFetch = async ( url, body ) => {
 
@@ -52,10 +54,49 @@ const pingShop = async ({ adminAccessToken, domain }) => {
 
 };
 
+const resolveConnectionSettings = async ({ connection, controller }) => {
+
+	const connectionSettings = connection?.settings ? decrypt( connection.settings ) : {};
+
+	if( ! connection?.credential ){
+
+		return connectionSettings;
+
+	}
+
+	const credential = await controller.get({
+		collection : 'credential',
+		query : {
+			id : connection.credential
+		}
+	});
+
+	const credentialSettings = credential?.settings ? decrypt( credential.settings ) : {};
+
+	return {
+		...credentialSettings,
+		...connectionSettings
+	};
+
+};
+
 const refreshAdminToken = async ({ connection, controller }) => {
 
-	const settings = decrypt( connection.settings );
-	const { domain, refreshToken } = settings;
+	const credential = await controller.get({
+		collection : 'credential',
+		query : {
+			id : connection.credential
+		}
+	});
+
+	if( ! credential ){
+
+		throw new Error( 'refreshAdminToken: credential not found for connection ' + connection.id );
+
+	}
+	const settings = decrypt( credential.settings );
+	const { identifier : domain } = credential;
+	const { refreshToken } = settings;
 
 	const data = await shopifyOAuthFetch(
 		`https://${ domain }/admin/oauth/access_token`,
@@ -71,88 +112,57 @@ const refreshAdminToken = async ({ connection, controller }) => {
 	const newRefreshToken = data.refresh_token;
 	const expiresIn = data.expires_in;
 	const tokenExpiresAt = expiresIn ? new Date( Date.now() + ( expiresIn * 1000 ) ) : null;
+	const refreshTokenExpiresAt = new Date( Date.now() + REFRESH_TOKEN_LIFETIME_MS );
 
 	await pingShop({ adminAccessToken, domain });
 
-	const tokenWorkflow = await controller.get({
-		collection : 'workflow',
+	await controller.update({
+		collection : 'credential',
+		data : {
+			$set : {
+				settings : encrypt({
+					...settings,
+					adminAccessToken,
+					refreshToken : newRefreshToken,
+					refreshTokenExpiresAt,
+					tokenExpiresAt
+				})
+			}
+		},
 		query : {
-			connection : connection.id,
-			organization : connection.organization,
-			system : true,
-			title : 'Shopify Token Activity'
+			id : credential.id
 		}
 	});
 
-	await controller.transaction( async ( session ) => {
-
-		const options = { session };
-
-		await controller.update({
-			collection : 'connection',
-			data : {
-				$set : {
-					settings : encrypt({
-						...settings,
-						adminAccessToken,
-						refreshToken : newRefreshToken,
-						tokenExpiresAt
-					})
-				}
-			},
-			options,
-			query : {
-				id : connection.id
-			}
-		});
-
-		if( tokenWorkflow ){
-
-			await controller.create({
-				collection : 'action',
-				data : {
-					completedAt : new Date(),
-					error : null,
-					errorStatus : null,
-					organization : connection.organization,
-					request : null,
-					response : null,
-					slug : 'action.shopify.token.refresh',
-					status : 'succeeded',
-					trigger : {
-						data : {
-							connection : connection.id
-						},
-						event : 'shopify.token'
-					},
-					usage : null,
-					workflow : tokenWorkflow.id
-				},
-				options
-			});
-
-		}
-	} );
-
 	return adminAccessToken;
 
 };
 
 const getAdminToken = async ({ connection, controller }) => {
 
-	const { adminAccessToken, tokenExpiresAt } = decrypt( connection.settings );
+	if( ! connection?.credential ){
+
+		return null;
+
+	}
+	const settings = await resolveConnectionSettings({ connection, controller });
+	const { adminAccessToken, refreshToken, tokenExpiresAt } = settings;
+
+	if( ! refreshToken ){
+
+		return adminAccessToken;
 
-	const needsRefresh = tokenExpiresAt &&
-		new Date( tokenExpiresAt ) < new Date( Date.now() + ( 5 * 60 * 1000 ) );
+	}
+	const needsRefresh = ! tokenExpiresAt ||
+		new Date( tokenExpiresAt ) < new Date( Date.now() + ACCESS_TOKEN_REFRESH_BUFFER_MS );
 
 	if( needsRefresh ){
 
 		return refreshAdminToken({ connection, controller });
 
 	}
-
 	return adminAccessToken;
 
 };
 
-export { getAdminToken, refreshAdminToken };
+export { getAdminToken, refreshAdminToken, resolveConnectionSettings };

package/dist/shopify.d.ts

@@ -2,6 +2,8 @@ import { decrypt, encrypt } from './encrypt.js';
 import 'crypto';
 
 const SHOPIFY_ADMIN_API_VERSION = '2025-01';
+const REFRESH_TOKEN_LIFETIME_MS = 90 * 24 * 60 * 60 * 1000;
+const ACCESS_TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1000;
 
 const shopifyOAuthFetch = async ( url, body ) => {
 
@@ -52,10 +54,49 @@ const pingShop = async ({ adminAccessToken, domain }) => {
 
 };
 
+const resolveConnectionSettings = async ({ connection, controller }) => {
+
+	const connectionSettings = connection?.settings ? decrypt( connection.settings ) : {};
+
+	if( ! connection?.credential ){
+
+		return connectionSettings;
+
+	}
+
+	const credential = await controller.get({
+		collection : 'credential',
+		query : {
+			id : connection.credential
+		}
+	});
+
+	const credentialSettings = credential?.settings ? decrypt( credential.settings ) : {};
+
+	return {
+		...credentialSettings,
+		...connectionSettings
+	};
+
+};
+
 const refreshAdminToken = async ({ connection, controller }) => {
 
-	const settings = decrypt( connection.settings );
-	const { domain, refreshToken } = settings;
+	const credential = await controller.get({
+		collection : 'credential',
+		query : {
+			id : connection.credential
+		}
+	});
+
+	if( ! credential ){
+
+		throw new Error( 'refreshAdminToken: credential not found for connection ' + connection.id );
+
+	}
+	const settings = decrypt( credential.settings );
+	const { identifier : domain } = credential;
+	const { refreshToken } = settings;
 
 	const data = await shopifyOAuthFetch(
 		`https://${ domain }/admin/oauth/access_token`,
@@ -71,88 +112,57 @@ const refreshAdminToken = async ({ connection, controller }) => {
 	const newRefreshToken = data.refresh_token;
 	const expiresIn = data.expires_in;
 	const tokenExpiresAt = expiresIn ? new Date( Date.now() + ( expiresIn * 1000 ) ) : null;
+	const refreshTokenExpiresAt = new Date( Date.now() + REFRESH_TOKEN_LIFETIME_MS );
 
 	await pingShop({ adminAccessToken, domain });
 
-	const tokenWorkflow = await controller.get({
-		collection : 'workflow',
+	await controller.update({
+		collection : 'credential',
+		data : {
+			$set : {
+				settings : encrypt({
+					...settings,
+					adminAccessToken,
+					refreshToken : newRefreshToken,
+					refreshTokenExpiresAt,
+					tokenExpiresAt
+				})
+			}
+		},
 		query : {
-			connection : connection.id,
-			organization : connection.organization,
-			system : true,
-			title : 'Shopify Token Activity'
+			id : credential.id
 		}
 	});
 
-	await controller.transaction( async ( session ) => {
-
-		const options = { session };
-
-		await controller.update({
-			collection : 'connection',
-			data : {
-				$set : {
-					settings : encrypt({
-						...settings,
-						adminAccessToken,
-						refreshToken : newRefreshToken,
-						tokenExpiresAt
-					})
-				}
-			},
-			options,
-			query : {
-				id : connection.id
-			}
-		});
-
-		if( tokenWorkflow ){
-
-			await controller.create({
-				collection : 'action',
-				data : {
-					completedAt : new Date(),
-					error : null,
-					errorStatus : null,
-					organization : connection.organization,
-					request : null,
-					response : null,
-					slug : 'action.shopify.token.refresh',
-					status : 'succeeded',
-					trigger : {
-						data : {
-							connection : connection.id
-						},
-						event : 'shopify.token'
-					},
-					usage : null,
-					workflow : tokenWorkflow.id
-				},
-				options
-			});
-
-		}
-	} );
-
 	return adminAccessToken;
 
 };
 
 const getAdminToken = async ({ connection, controller }) => {
 
-	const { adminAccessToken, tokenExpiresAt } = decrypt( connection.settings );
+	if( ! connection?.credential ){
+
+		return null;
+
+	}
+	const settings = await resolveConnectionSettings({ connection, controller });
+	const { adminAccessToken, refreshToken, tokenExpiresAt } = settings;
+
+	if( ! refreshToken ){
+
+		return adminAccessToken;
 
-	const needsRefresh = tokenExpiresAt &&
-		new Date( tokenExpiresAt ) < new Date( Date.now() + ( 5 * 60 * 1000 ) );
+	}
+	const needsRefresh = ! tokenExpiresAt ||
+		new Date( tokenExpiresAt ) < new Date( Date.now() + ACCESS_TOKEN_REFRESH_BUFFER_MS );
 
 	if( needsRefresh ){
 
 		return refreshAdminToken({ connection, controller });
 
 	}
-
 	return adminAccessToken;
 
 };
 
-export { getAdminToken, refreshAdminToken };
+export { getAdminToken, refreshAdminToken, resolveConnectionSettings };

package/dist/shopify.js

@@ -5,6 +5,8 @@ import {
 
 // shopify.js
 var SHOPIFY_ADMIN_API_VERSION = "2025-01";
+var REFRESH_TOKEN_LIFETIME_MS = 90 * 24 * 60 * 60 * 1e3;
+var ACCESS_TOKEN_REFRESH_BUFFER_MS = 5 * 60 * 1e3;
 var shopifyOAuthFetch = async (url, body) => {
   const response = await fetch(url, {
     method: "POST",
@@ -37,9 +39,37 @@ var pingShop = async ({ adminAccessToken, domain }) => {
     throw error;
   }
 };
+var resolveConnectionSettings = async ({ connection, controller }) => {
+  const connectionSettings = (connection == null ? void 0 : connection.settings) ? decrypt(connection.settings) : {};
+  if (!(connection == null ? void 0 : connection.credential)) {
+    return connectionSettings;
+  }
+  const credential = await controller.get({
+    collection: "credential",
+    query: {
+      id: connection.credential
+    }
+  });
+  const credentialSettings = (credential == null ? void 0 : credential.settings) ? decrypt(credential.settings) : {};
+  return {
+    ...credentialSettings,
+    ...connectionSettings
+  };
+};
 var refreshAdminToken = async ({ connection, controller }) => {
-  const settings = decrypt(connection.settings);
-  const { domain, refreshToken } = settings;
+  const credential = await controller.get({
+    collection: "credential",
+    query: {
+      id: connection.credential
+    }
+  });
+  if (!credential) {
+    throw new Error("refreshAdminToken: credential not found for connection " + connection.id);
+  }
+  ;
+  const settings = decrypt(credential.settings);
+  const { identifier: domain } = credential;
+  const { refreshToken } = settings;
   const data = await shopifyOAuthFetch(
     `https://${domain}/admin/oauth/access_token`,
     {
@@ -53,72 +83,47 @@ var refreshAdminToken = async ({ connection, controller }) => {
   const newRefreshToken = data.refresh_token;
   const expiresIn = data.expires_in;
   const tokenExpiresAt = expiresIn ? new Date(Date.now() + expiresIn * 1e3) : null;
+  const refreshTokenExpiresAt = new Date(Date.now() + REFRESH_TOKEN_LIFETIME_MS);
   await pingShop({ adminAccessToken, domain });
-  const tokenWorkflow = await controller.get({
-    collection: "workflow",
-    query: {
-      connection: connection.id,
-      organization: connection.organization,
-      system: true,
-      title: "Shopify Token Activity"
-    }
-  });
-  await controller.transaction(async (session) => {
-    const options = { session };
-    await controller.update({
-      collection: "connection",
-      data: {
-        $set: {
-          settings: encrypt({
-            ...settings,
-            adminAccessToken,
-            refreshToken: newRefreshToken,
-            tokenExpiresAt
-          })
-        }
-      },
-      options,
-      query: {
-        id: connection.id
+  await controller.update({
+    collection: "credential",
+    data: {
+      $set: {
+        settings: encrypt({
+          ...settings,
+          adminAccessToken,
+          refreshToken: newRefreshToken,
+          refreshTokenExpiresAt,
+          tokenExpiresAt
+        })
       }
-    });
-    if (tokenWorkflow) {
-      await controller.create({
-        collection: "action",
-        data: {
-          completedAt: /* @__PURE__ */ new Date(),
-          error: null,
-          errorStatus: null,
-          organization: connection.organization,
-          request: null,
-          response: null,
-          slug: "action.shopify.token.refresh",
-          status: "succeeded",
-          trigger: {
-            data: {
-              connection: connection.id
-            },
-            event: "shopify.token"
-          },
-          usage: null,
-          workflow: tokenWorkflow.id
-        },
-        options
-      });
+    },
+    query: {
+      id: credential.id
     }
-    ;
   });
   return adminAccessToken;
 };
 var getAdminToken = async ({ connection, controller }) => {
-  const { adminAccessToken, tokenExpiresAt } = decrypt(connection.settings);
-  const needsRefresh = tokenExpiresAt && new Date(tokenExpiresAt) < new Date(Date.now() + 5 * 60 * 1e3);
+  if (!(connection == null ? void 0 : connection.credential)) {
+    return null;
+  }
+  ;
+  const settings = await resolveConnectionSettings({ connection, controller });
+  const { adminAccessToken, refreshToken, tokenExpiresAt } = settings;
+  if (!refreshToken) {
+    return adminAccessToken;
+  }
+  ;
+  const needsRefresh = !tokenExpiresAt || new Date(tokenExpiresAt) < new Date(Date.now() + ACCESS_TOKEN_REFRESH_BUFFER_MS);
   if (needsRefresh) {
     return refreshAdminToken({ connection, controller });
   }
+  ;
   return adminAccessToken;
 };
 export {
   getAdminToken,
-  refreshAdminToken
+  refreshAdminToken,
+  resolveConnectionSettings
 };

package/package.json

@@ -81,5 +81,5 @@
     "build": "tsup && npm publish"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.19"
+  "version": "0.0.20"
 }