@tenderprompt/cli 0.1.30 → 0.1.31

package/dist/index.js

@@ -2037,8 +2037,38 @@ function normalizeStoredProfile(value) {
         permissions: Array.isArray(record.permissions)
             ? record.permissions.filter((permission) => typeof permission === 'string')
             : undefined,
+        ...normalizeStoredShopifyContext(record),
     };
 }
+function normalizeStoredShopifyContext(record) {
+    const shopifyAppUrl = typeof record.shopifyAppUrl === 'string' ? record.shopifyAppUrl : null;
+    if (shopifyAppUrl) {
+        try {
+            const parsed = parseShopifyAppUrl(shopifyAppUrl, 'profile.shopifyAppUrl');
+            return {
+                shopifyAppUrl: parsed.appUrl,
+                shopifyStore: parsed.store,
+            };
+        }
+        catch {
+            return {};
+        }
+    }
+    const shopifyStore = typeof record.shopifyStore === 'string' ? record.shopifyStore : null;
+    if (shopifyStore) {
+        try {
+            const store = parseShopifyStoreHandle(shopifyStore, 'profile.shopifyStore');
+            return {
+                shopifyAppUrl: shopifyAppUrlForStore(store),
+                shopifyStore: store,
+            };
+        }
+        catch {
+            return {};
+        }
+    }
+    return {};
+}
 function normalizeConfig(value) {
     if (!value || typeof value !== 'object' || Array.isArray(value)) {
         return {};
@@ -2148,20 +2178,19 @@ function parseShopifyStoreHandle(value, flag) {
 function shopifyAppUrlForStore(store) {
     return `https://admin.shopify.com/store/${store}/apps/tender-prompt/shopify`;
 }
-function parseShopifyAppUrlFlag(args, index) {
-    const value = args[index + 1];
+function parseShopifyAppUrl(value, flag) {
     if (!value || value.startsWith('-')) {
-        throw new TenderCliUsageError('--shopify-app-url requires a Shopify Admin App Home URL.');
+        throw new TenderCliUsageError(`${flag} requires a Shopify Admin App Home URL.`);
     }
     let url;
     try {
         url = new URL(value);
     }
     catch {
-        throw new TenderCliUsageError('--shopify-app-url requires a valid Shopify Admin App Home URL.');
+        throw new TenderCliUsageError(`${flag} requires a valid Shopify Admin App Home URL.`);
     }
     if (url.protocol !== 'https:' || url.hostname !== 'admin.shopify.com') {
-        throw new TenderCliUsageError('--shopify-app-url must start with https://admin.shopify.com/.');
+        throw new TenderCliUsageError(`${flag} must start with https://admin.shopify.com/.`);
     }
     const parts = url.pathname.split('/').filter(Boolean);
     const deviceSuffix = parts[5] === 'device' ? parts[5] : null;
@@ -2169,20 +2198,26 @@ function parseShopifyAppUrlFlag(args, index) {
         parts[0] !== 'store' ||
         parts[2] !== 'apps' ||
         parts[4] !== 'shopify') {
-        throw new TenderCliUsageError('--shopify-app-url must look like https://admin.shopify.com/store/<store>/apps/tender-prompt/shopify.');
+        throw new TenderCliUsageError(`${flag} must look like https://admin.shopify.com/store/<store>/apps/tender-prompt/shopify.`);
     }
     if (url.search || url.hash) {
-        throw new TenderCliUsageError('--shopify-app-url should not include a query string or hash.');
+        throw new TenderCliUsageError(`${flag} should not include a query string or hash.`);
     }
-    const store = parseShopifyStoreHandle(parts[1], '--shopify-app-url');
-    const appHandle = parseShopifyStoreHandle(parts[3], '--shopify-app-url');
+    const store = parseShopifyStoreHandle(parts[1], flag);
+    const appHandle = parseShopifyStoreHandle(parts[3], flag);
     return {
         store,
         appUrl: `https://admin.shopify.com/store/${store}/apps/${appHandle}/shopify`,
     };
 }
+function parseShopifyAppUrlFlag(args, index) {
+    return parseShopifyAppUrl(args[index + 1], '--shopify-app-url');
+}
+function shopifyDeviceVerificationUri(shopifyAppUrl) {
+    return `${shopifyAppUrl.replace(/\/+$/, '')}/device`;
+}
 function shopifyDeviceVerificationUrl(input) {
-    return `${input.shopifyAppUrl.replace(/\/+$/, '')}/device?user_code=${encodeURIComponent(input.userCode)}`;
+    return `${shopifyDeviceVerificationUri(input.shopifyAppUrl)}?user_code=${encodeURIComponent(input.userCode)}`;
 }
 function parseTokenFlag(args, index) {
     const value = args[index + 1];
@@ -8226,6 +8261,8 @@ async function runAuthStatus(command, io, runtime) {
             artifactId: profile?.artifactId ?? null,
             permissions: profile?.permissions ?? [],
             expiresAt: formatExpiry(profile?.expiresAt),
+            shopifyAppUrl: profile?.shopifyAppUrl ?? null,
+            shopifyStore: profile?.shopifyStore ?? null,
         };
         if (command.json) {
             io.stdout(JSON.stringify(result, null, 2));
@@ -8240,6 +8277,7 @@ async function runAuthStatus(command, io, runtime) {
                 `app_id: ${profile.artifactId ?? '(account)'}`,
                 `permissions: ${(profile.permissions ?? []).join(' ') || '(unknown)'}`,
                 `expires_at: ${formatExpiry(profile.expiresAt) ?? '(unknown)'}`,
+                `shopify_app_url: ${profile.shopifyAppUrl ?? '(none)'}`,
             ].join('\n'));
         }
         else {
@@ -8284,6 +8322,8 @@ async function runAuthStatus(command, io, runtime) {
         artifactId: profile?.artifactId ?? null,
         permissions: profile?.permissions ?? [],
         expiresAt: formatExpiry(profile?.expiresAt),
+        shopifyAppUrl: profile?.shopifyAppUrl ?? null,
+        shopifyStore: profile?.shopifyStore ?? null,
     };
     if (command.json) {
         io.stdout(JSON.stringify(result, null, 2));
@@ -8298,6 +8338,7 @@ async function runAuthStatus(command, io, runtime) {
             `app_id: ${profile.artifactId ?? '(account)'}`,
             `permissions: ${(profile.permissions ?? []).join(' ') || '(unknown)'}`,
             `expires_at: ${formatExpiry(profile.expiresAt) ?? '(unknown)'}`,
+            `shopify_app_url: ${profile.shopifyAppUrl ?? '(none)'}`,
         ].join('\n'));
     }
     else {
@@ -8314,7 +8355,11 @@ async function runAuthLogin(command, io, runtime) {
     const fetcher = runtime.fetcher ?? fetch;
     const sleeper = runtime.sleeper ?? ((milliseconds) => new Promise((resolve) => setTimeout(resolve, milliseconds)));
     const now = runtime.now ?? Date.now;
-    const baseUrl = command.baseUrl ?? readDefaultBaseUrl(env);
+    const config = await readConfig(env);
+    const existingProfile = config.profiles?.[command.saveProfile] ?? null;
+    const baseUrl = command.baseUrl ?? existingProfile?.baseUrl ?? readDefaultBaseUrl(env);
+    const shopifyAppUrl = command.shopifyAppUrl ?? existingProfile?.shopifyAppUrl ?? null;
+    const shopifyStore = command.shopifyStore ?? existingProfile?.shopifyStore ?? null;
     const deviceResponse = await fetcher(`${baseUrl}/oauth/device/code`, {
         method: 'POST',
         headers: {
@@ -8330,19 +8375,19 @@ async function runAuthLogin(command, io, runtime) {
     if (!deviceResponse.ok || !devicePayload?.device_code || !devicePayload.user_code || !devicePayload.verification_uri_complete) {
         throw new Error(devicePayload?.error_description ?? devicePayload?.error ?? `Device authorization failed with HTTP ${deviceResponse.status}.`);
     }
-    const verificationUriComplete = command.shopifyAppUrl
+    const verificationUriComplete = shopifyAppUrl
         ? shopifyDeviceVerificationUrl({
-            shopifyAppUrl: command.shopifyAppUrl,
+            shopifyAppUrl,
             userCode: devicePayload.user_code,
         })
         : devicePayload.verification_uri_complete;
-    const verificationUri = command.shopifyAppUrl ? `${command.shopifyAppUrl}/device` : devicePayload.verification_uri;
+    const verificationUri = shopifyAppUrl ? shopifyDeviceVerificationUri(shopifyAppUrl) : devicePayload.verification_uri;
     const pendingResult = {
         ok: true,
         command: command.command,
         baseUrl,
-        shopifyAppUrl: command.shopifyAppUrl,
-        shopifyStore: command.shopifyStore,
+        shopifyAppUrl,
+        shopifyStore,
         profile: command.tokenProfile,
         saveProfile: command.saveProfile,
         userCode: devicePayload.user_code,
@@ -8383,7 +8428,6 @@ async function runAuthLogin(command, io, runtime) {
         });
         const tokenPayload = await parseJsonResponse(tokenResponse);
         if (tokenResponse.ok && tokenPayload?.access_token) {
-            const config = await readConfig(env);
             const profiles = config.profiles ?? {};
             profiles[command.saveProfile] = {
                 baseUrl,
@@ -8393,6 +8437,8 @@ async function runAuthLogin(command, io, runtime) {
                 artifactId: tokenPayload.artifact_id,
                 expiresAt: tokenPayload.expires_at,
                 permissions: splitScope(tokenPayload.scope),
+                ...(shopifyAppUrl ? { shopifyAppUrl } : {}),
+                ...(shopifyStore ? { shopifyStore } : {}),
             };
             await writeConfig(env, {
                 ...config,
@@ -8410,6 +8456,8 @@ async function runAuthLogin(command, io, runtime) {
                 artifactId: tokenPayload.artifact_id ?? null,
                 permissions: splitScope(tokenPayload.scope),
                 expiresAt: formatExpiry(tokenPayload.expires_at),
+                shopifyAppUrl,
+                shopifyStore,
                 configPath: readConfigPath(env),
             };
             if (command.json) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tenderprompt/cli",
-	"version": "0.1.30",
+	"version": "0.1.31",
 	"type": "module",
 	"bin": {
 		"tender": "bin/tender.js"