atmn 0.0.19 → 0.0.20

package/dist/cli.cjs

@@ -118,15 +118,15 @@ async function upsertEnvVar(filePath, varName, newValue) {
   }
   fs__default.default.writeFileSync(filePath, lines.join("\n"));
 }
-function storeToEnv(prodKey, sandboxKey) {
+async function storeToEnv(prodKey, sandboxKey) {
   const envPath = `${process.cwd()}/.env`;
   const envLocalPath = `${process.cwd()}/.env.local`;
   const envVars = `AUTUMN_PROD_SECRET_KEY=${prodKey}
 AUTUMN_SECRET_KEY=${sandboxKey}
 `;
   if (fs__default.default.existsSync(envPath)) {
-    upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
-    upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
+    await upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
+    await upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
     console.log(chalk7__default.default.green(".env file found. Updated keys."));
   } else if (fs__default.default.existsSync(envLocalPath)) {
     fs__default.default.writeFileSync(envPath, envVars);
@@ -181,9 +181,10 @@ async function request({
   data,
   headers,
   customAuth,
-  throwOnError = true
+  throwOnError = true,
+  secretKey
 }) {
-  const apiKey = readFromEnv();
+  const apiKey = secretKey || readFromEnv();
   try {
     const response = await axios__default.default.request({
       method,
@@ -253,17 +254,16 @@ async function deleteProduct(id) {
     path: `/products/${id}`
   });
 }
-async function updateCLIStripeKeys(stripeTestKey, stripeLiveKey, stripeFlowAuthKey) {
-  return await internalRequest({
+async function updateCLIStripeKeys({
+  stripeSecretKey,
+  autumnSecretKey
+}) {
+  return await request({
+    base: EXTERNAL_BASE,
     method: "POST",
-    path: "/dev/cli/stripe",
-    data: {
-      stripeTestKey,
-      stripeLiveKey,
-      successUrl: "https://useautumn.com",
-      defaultCurrency: "usd"
-    },
-    customAuth: stripeFlowAuthKey
+    path: "/organization/stripe",
+    data: { secret_key: stripeSecretKey },
+    secretKey: autumnSecretKey
   });
 }
 
@@ -669,7 +669,7 @@ async function AuthCommand() {
   const keyInfo = await getOTP(otp);
   if (!keyInfo.stripe_connected) {
     let connectStripe = await prompts.confirm({
-      message: "It seems like your organization doesn't have any Stripe keys connected. Would you like to connect them now?",
+      message: "It seems like your organization doesn't have any Stripe keys connected. Would you like to connect your Stripe test secret key now?",
       theme: inputTheme
     });
     if (connectStripe) {
@@ -678,10 +678,14 @@ async function AuthCommand() {
         mask: "*",
         theme: passwordTheme
       });
-      await updateCLIStripeKeys(
-        stripeTestKey,
-        stripeTestKey,
-        keyInfo.stripeFlowAuthKey
+      await updateCLIStripeKeys({
+        stripeSecretKey: stripeTestKey,
+        autumnSecretKey: keyInfo.sandboxKey
+      });
+      console.log(
+        chalk7__default.default.green(
+          "Stripe test secret key has been saved to your .env file. To connect your Stripe live secret key, please visit the Autumn dashboard here: https://app.useautumn.com/dev?tab=stripe"
+        )
       );
     } else {
       console.log(
@@ -691,7 +695,7 @@ async function AuthCommand() {
       );
     }
   }
-  storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
+  await storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
   console.log(
     chalk7__default.default.green(
       "Success! Sandbox and production keys have been saved to your .env file.\n`atmn` uses the AUTUMN_SECRET_KEY to authenticate with the Autumn API."

package/dist/cli.js

@@ -100,15 +100,15 @@ async function upsertEnvVar(filePath, varName, newValue) {
   }
   fs.writeFileSync(filePath, lines.join("\n"));
 }
-function storeToEnv(prodKey, sandboxKey) {
+async function storeToEnv(prodKey, sandboxKey) {
   const envPath = `${process.cwd()}/.env`;
   const envLocalPath = `${process.cwd()}/.env.local`;
   const envVars = `AUTUMN_PROD_SECRET_KEY=${prodKey}
 AUTUMN_SECRET_KEY=${sandboxKey}
 `;
   if (fs.existsSync(envPath)) {
-    upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
-    upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
+    await upsertEnvVar(envPath, "AUTUMN_PROD_SECRET_KEY", prodKey);
+    await upsertEnvVar(envPath, "AUTUMN_SECRET_KEY", sandboxKey);
     console.log(chalk7.green(".env file found. Updated keys."));
   } else if (fs.existsSync(envLocalPath)) {
     fs.writeFileSync(envPath, envVars);
@@ -163,9 +163,10 @@ async function request({
   data,
   headers,
   customAuth,
-  throwOnError = true
+  throwOnError = true,
+  secretKey
 }) {
-  const apiKey = readFromEnv();
+  const apiKey = secretKey || readFromEnv();
   try {
     const response = await axios.request({
       method,
@@ -235,17 +236,16 @@ async function deleteProduct(id) {
     path: `/products/${id}`
   });
 }
-async function updateCLIStripeKeys(stripeTestKey, stripeLiveKey, stripeFlowAuthKey) {
-  return await internalRequest({
+async function updateCLIStripeKeys({
+  stripeSecretKey,
+  autumnSecretKey
+}) {
+  return await request({
+    base: EXTERNAL_BASE,
     method: "POST",
-    path: "/dev/cli/stripe",
-    data: {
-      stripeTestKey,
-      stripeLiveKey,
-      successUrl: "https://useautumn.com",
-      defaultCurrency: "usd"
-    },
-    customAuth: stripeFlowAuthKey
+    path: "/organization/stripe",
+    data: { secret_key: stripeSecretKey },
+    secretKey: autumnSecretKey
   });
 }
 
@@ -651,7 +651,7 @@ async function AuthCommand() {
   const keyInfo = await getOTP(otp);
   if (!keyInfo.stripe_connected) {
     let connectStripe = await confirm({
-      message: "It seems like your organization doesn't have any Stripe keys connected. Would you like to connect them now?",
+      message: "It seems like your organization doesn't have any Stripe keys connected. Would you like to connect your Stripe test secret key now?",
       theme: inputTheme
     });
     if (connectStripe) {
@@ -660,10 +660,14 @@ async function AuthCommand() {
         mask: "*",
         theme: passwordTheme
       });
-      await updateCLIStripeKeys(
-        stripeTestKey,
-        stripeTestKey,
-        keyInfo.stripeFlowAuthKey
+      await updateCLIStripeKeys({
+        stripeSecretKey: stripeTestKey,
+        autumnSecretKey: keyInfo.sandboxKey
+      });
+      console.log(
+        chalk7.green(
+          "Stripe test secret key has been saved to your .env file. To connect your Stripe live secret key, please visit the Autumn dashboard here: https://app.useautumn.com/dev?tab=stripe"
+        )
       );
     } else {
       console.log(
@@ -673,7 +677,7 @@ async function AuthCommand() {
       );
     }
   }
-  storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
+  await storeToEnv(keyInfo.prodKey, keyInfo.sandboxKey);
   console.log(
     chalk7.green(
       "Success! Sandbox and production keys have been saved to your .env file.\n`atmn` uses the AUTUMN_SECRET_KEY to authenticate with the Autumn API."

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atmn",
-	"version": "0.0.19",
+	"version": "0.0.20",
 	"license": "MIT",
 	"bin": "dist/cli.js",
 	"main": "dist/index.js",