@drawbridge/drawbridge-utils 0.0.118 → 0.0.124

package/dist/sendgrid.cjs

@@ -100,11 +100,11 @@ var sendWithRetry = async (send, { delays = RETRY_DELAYS_MS } = {}) => {
   }
 };
 var sendgridRequest = ({ apiKey, body, method, path, query, request: request2 = request }) => {
-  const key = apiKey || process.env.SENDGRID_API_KEY;
+  if (!apiKey) throw new Error("SendGrid API key missing \u2014 pass apiKey (the drawbridge provider's apiKey)");
   return request2({
     body,
     headers: {
-      "Authorization": "Bearer " + key
+      "Authorization": "Bearer " + apiKey
     },
     method,
     query,
@@ -118,10 +118,8 @@ var sendgrid = {
   send: async ({ apiKey, from, headers, html, request: request2, subject, text, to }) => {
     var _a, _b;
     try {
-      const sender = (from == null ? void 0 : from.email) ? from : {
-        email: process.env.SENDGRID_FROM_ADDRESS,
-        name: "Drawbridge"
-      };
+      if (!(from == null ? void 0 : from.email)) throw new Error("SendGrid sender missing \u2014 pass from.email (the drawbridge provider's accountSender)");
+      const sender = { name: "Drawbridge", ...from };
       await sendWithRetry(() => sendgridRequest({
         apiKey,
         ...request2 && { request: request2 },

package/dist/sendgrid.d.cts

@@ -10,10 +10,10 @@ import { createLogger } from '@drawbridge/drawbridge-telemetry';
 // other — the private `drawbridge` manifest declares email.send, email.notify
 // and email.digest, so its transport belongs beside its manifest.
 //
-// The API key still falls back to process.env, which is a carry-over rather than
-// a preference: a published package reading a deployment's environment is the
-// thing `client : { id : 'KLAVIYO_OAUTH_CLIENT_ID' }` exists to avoid. Callers
-// that pass a key explicitly never touch it.
+// THE CREDENTIAL IS THE CALLER'S TO PASS. It used to fall back to process.env;
+// it lives encrypted in the `provider` collection now (lib/providers.js), and a
+// published package reading a deployment's environment is precisely the thing
+// `client : { id : 'KLAVIYO_OAUTH_CLIENT_ID' }` exists to avoid.
 
 
 const logger = createLogger();
@@ -90,12 +90,17 @@ const sendWithRetry = async ( send, { delays = RETRY_DELAYS_MS } = {} ) => {
 // manifest hook), and it is the only thing that works across the boundary.
 const sendgridRequest = ({ apiKey, body, method, path, query, request: request$1 = request }) => {
 
-	const key = apiKey || process.env.SENDGRID_API_KEY;
+	// THROWS RATHER THAN DEGRADES. Sending with no key is not a degraded send, it
+	// is an unauthenticated request SendGrid answers 401 — and the alternative,
+	// no-opping, is mail that stops with no error anywhere: no exception, no
+	// failed job, nothing to alert on, just people who never received the code
+	// they are waiting for. A missing credential has to be loud.
+	if( ! apiKey ) throw new Error( 'SendGrid API key missing — pass apiKey (the drawbridge provider\'s apiKey)' );
 
 	return request$1({
 		body,
 		headers : {
-			'Authorization' : 'Bearer ' + key
+			'Authorization' : 'Bearer ' + apiKey
 		},
 		method,
 		query,
@@ -113,14 +118,14 @@ const sendgrid = {
 
 		try {
 
-			const sender = ( from?.email ?
-				from
-				:
-				{
-					email : process.env.SENDGRID_FROM_ADDRESS,
-					name : 'Drawbridge'
-				}
-			);
+			// SAME REASON AS THE KEY. The account sender is stored, not deployed,
+			// and a send from no address is one SendGrid rejects — quietly, from
+			// the caller's point of view, since the throw would otherwise never
+			// name the thing that is actually missing. The display name still
+			// defaults, because that is a label rather than a credential.
+			if( ! from?.email ) throw new Error( 'SendGrid sender missing — pass from.email (the drawbridge provider\'s accountSender)' );
+
+			const sender = { name : 'Drawbridge', ...from };
 
 			await sendWithRetry( () => sendgridRequest({
 				apiKey,

package/dist/sendgrid.d.ts

@@ -10,10 +10,10 @@ import { createLogger } from '@drawbridge/drawbridge-telemetry';
 // other — the private `drawbridge` manifest declares email.send, email.notify
 // and email.digest, so its transport belongs beside its manifest.
 //
-// The API key still falls back to process.env, which is a carry-over rather than
-// a preference: a published package reading a deployment's environment is the
-// thing `client : { id : 'KLAVIYO_OAUTH_CLIENT_ID' }` exists to avoid. Callers
-// that pass a key explicitly never touch it.
+// THE CREDENTIAL IS THE CALLER'S TO PASS. It used to fall back to process.env;
+// it lives encrypted in the `provider` collection now (lib/providers.js), and a
+// published package reading a deployment's environment is precisely the thing
+// `client : { id : 'KLAVIYO_OAUTH_CLIENT_ID' }` exists to avoid.
 
 
 const logger = createLogger();
@@ -90,12 +90,17 @@ const sendWithRetry = async ( send, { delays = RETRY_DELAYS_MS } = {} ) => {
 // manifest hook), and it is the only thing that works across the boundary.
 const sendgridRequest = ({ apiKey, body, method, path, query, request: request$1 = request }) => {
 
-	const key = apiKey || process.env.SENDGRID_API_KEY;
+	// THROWS RATHER THAN DEGRADES. Sending with no key is not a degraded send, it
+	// is an unauthenticated request SendGrid answers 401 — and the alternative,
+	// no-opping, is mail that stops with no error anywhere: no exception, no
+	// failed job, nothing to alert on, just people who never received the code
+	// they are waiting for. A missing credential has to be loud.
+	if( ! apiKey ) throw new Error( 'SendGrid API key missing — pass apiKey (the drawbridge provider\'s apiKey)' );
 
 	return request$1({
 		body,
 		headers : {
-			'Authorization' : 'Bearer ' + key
+			'Authorization' : 'Bearer ' + apiKey
 		},
 		method,
 		query,
@@ -113,14 +118,14 @@ const sendgrid = {
 
 		try {
 
-			const sender = ( from?.email ?
-				from
-				:
-				{
-					email : process.env.SENDGRID_FROM_ADDRESS,
-					name : 'Drawbridge'
-				}
-			);
+			// SAME REASON AS THE KEY. The account sender is stored, not deployed,
+			// and a send from no address is one SendGrid rejects — quietly, from
+			// the caller's point of view, since the throw would otherwise never
+			// name the thing that is actually missing. The display name still
+			// defaults, because that is a label rather than a credential.
+			if( ! from?.email ) throw new Error( 'SendGrid sender missing — pass from.email (the drawbridge provider\'s accountSender)' );
+
+			const sender = { name : 'Drawbridge', ...from };
 
 			await sendWithRetry( () => sendgridRequest({
 				apiKey,

package/dist/sendgrid.js

@@ -73,11 +73,11 @@ var sendWithRetry = async (send, { delays = RETRY_DELAYS_MS } = {}) => {
   }
 };
 var sendgridRequest = ({ apiKey, body, method, path, query, request: request2 = request }) => {
-  const key = apiKey || process.env.SENDGRID_API_KEY;
+  if (!apiKey) throw new Error("SendGrid API key missing \u2014 pass apiKey (the drawbridge provider's apiKey)");
   return request2({
     body,
     headers: {
-      "Authorization": "Bearer " + key
+      "Authorization": "Bearer " + apiKey
     },
     method,
     query,
@@ -91,10 +91,8 @@ var sendgrid = {
   send: async ({ apiKey, from, headers, html, request: request2, subject, text, to }) => {
     var _a, _b;
     try {
-      const sender = (from == null ? void 0 : from.email) ? from : {
-        email: process.env.SENDGRID_FROM_ADDRESS,
-        name: "Drawbridge"
-      };
+      if (!(from == null ? void 0 : from.email)) throw new Error("SendGrid sender missing \u2014 pass from.email (the drawbridge provider's accountSender)");
+      const sender = { name: "Drawbridge", ...from };
       await sendWithRetry(() => sendgridRequest({
         apiKey,
         ...request2 && { request: request2 },

package/dist/twilio.cjs

@@ -81,9 +81,8 @@ var twilio = {
     title,
     to
   }) => {
-    accountSid = accountSid || process.env.TWILIO_ACCOUNT_SID;
-    authToken = authToken || process.env.TWILIO_AUTH_TOKEN;
-    from = from || process.env.TWILIO_ACCOUNT_FROM;
+    const missing = Object.entries({ accountSid, authToken, from }).filter(([, value]) => !value).map(([name]) => name);
+    if (missing.length) throw new Error("Twilio credentials missing \u2014 " + missing.join(", ") + " (the drawbridge provider's smsSid, smsToken and smsFrom)");
     const body = [
       title,
       message,

package/dist/twilio.d.cts

@@ -26,9 +26,17 @@ const twilio = {
 		to
 	}) => {
 
-		accountSid = accountSid || process.env.TWILIO_ACCOUNT_SID;
-		authToken = authToken || process.env.TWILIO_AUTH_TOKEN;
-		from = from || process.env.TWILIO_ACCOUNT_FROM;
+		// THROWS RATHER THAN DEGRADES. These used to fall back to process.env;
+		// they live encrypted in the `provider` collection now and the caller
+		// passes them. Missing, there is no send to degrade to — a no-op here is
+		// SMS that stops with nothing raised anywhere, which reads as delivered
+		// right up until someone reports that the code never arrived. Naming the
+		// missing ones is the difference between a five-minute fix and a hunt.
+		const missing = Object.entries({ accountSid, authToken, from })
+			.filter( ( [ , value ] ) => ! value )
+			.map( ( [ name ] ) => name );
+
+		if( missing.length ) throw new Error( 'Twilio credentials missing — ' + missing.join( ', ' ) + ' (the drawbridge provider\'s smsSid, smsToken and smsFrom)' );
 
 		// Newline-separated, brand/title first, and no "Your prize is" /
 		// "Click here to verify your prize" phrasing — textbook carrier-filter

package/dist/twilio.d.ts

@@ -26,9 +26,17 @@ const twilio = {
 		to
 	}) => {
 
-		accountSid = accountSid || process.env.TWILIO_ACCOUNT_SID;
-		authToken = authToken || process.env.TWILIO_AUTH_TOKEN;
-		from = from || process.env.TWILIO_ACCOUNT_FROM;
+		// THROWS RATHER THAN DEGRADES. These used to fall back to process.env;
+		// they live encrypted in the `provider` collection now and the caller
+		// passes them. Missing, there is no send to degrade to — a no-op here is
+		// SMS that stops with nothing raised anywhere, which reads as delivered
+		// right up until someone reports that the code never arrived. Naming the
+		// missing ones is the difference between a five-minute fix and a hunt.
+		const missing = Object.entries({ accountSid, authToken, from })
+			.filter( ( [ , value ] ) => ! value )
+			.map( ( [ name ] ) => name );
+
+		if( missing.length ) throw new Error( 'Twilio credentials missing — ' + missing.join( ', ' ) + ' (the drawbridge provider\'s smsSid, smsToken and smsFrom)' );
 
 		// Newline-separated, brand/title first, and no "Your prize is" /
 		// "Click here to verify your prize" phrasing — textbook carrier-filter

package/dist/twilio.js

@@ -56,9 +56,8 @@ var twilio = {
     title,
     to
   }) => {
-    accountSid = accountSid || process.env.TWILIO_ACCOUNT_SID;
-    authToken = authToken || process.env.TWILIO_AUTH_TOKEN;
-    from = from || process.env.TWILIO_ACCOUNT_FROM;
+    const missing = Object.entries({ accountSid, authToken, from }).filter(([, value]) => !value).map(([name]) => name);
+    if (missing.length) throw new Error("Twilio credentials missing \u2014 " + missing.join(", ") + " (the drawbridge provider's smsSid, smsToken and smsFrom)");
     const body = [
       title,
       message,

package/package.json

@@ -215,5 +215,5 @@
     "test": ". \"$HOME/.nvm/nvm.sh\" && nvm use && node --test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.0.118"
+  "version": "0.0.124"
 }