@salesforce/b2c-cli 1.21.3 → 1.22.0

package/dist/commands/auth/client/index.d.ts

@@ -1,14 +1,14 @@
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
 /**
  * Authenticate an API client (client_credentials or password grant) and persist the session.
- * Mirrors sfcc-ci `client:auth` command behavior. Uses the same stateful store so tokens
- * are shared with sfcc-ci, b2c auth:login, and subsequent CLI commands.
  *
  * Grant type is auto-detected based on credentials provided:
  *   - client_credentials: when only --client-id + --client-secret are given
  *   - password: when --user + --user-password are also provided
  *
- * Use --renew to enable automatic token renewal for later use with `auth client renew`.
+ * Only the access token is persisted — the client secret is NEVER stored.
+ * When the access token expires, re-run this command with the same credentials
+ * to obtain a new one. There is no automatic refresh.
  */
 export default class AuthClient extends BaseCommand<typeof AuthClient> {
     static description: string;
@@ -18,7 +18,6 @@ export default class AuthClient extends BaseCommand<typeof AuthClient> {
         'client-secret': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        renew: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'grant-type': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         user: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'user-password': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/auth/client/index.js

@@ -5,25 +5,24 @@
  */
 import { Flags } from '@oclif/core';
 import { BaseCommand, loadConfig } from '@salesforce/b2c-tooling-sdk/cli';
-import { setStoredSession, decodeJWT, encodeBasicClientCredentials } from '@salesforce/b2c-tooling-sdk/auth';
+import { saveAuthSession, decodeJWT, encodeBasicClientCredentials } from '@salesforce/b2c-tooling-sdk/auth';
 import { DEFAULT_ACCOUNT_MANAGER_HOST } from '@salesforce/b2c-tooling-sdk';
 import { t } from '../../../i18n/index.js';
 /**
  * Authenticate an API client (client_credentials or password grant) and persist the session.
- * Mirrors sfcc-ci `client:auth` command behavior. Uses the same stateful store so tokens
- * are shared with sfcc-ci, b2c auth:login, and subsequent CLI commands.
  *
  * Grant type is auto-detected based on credentials provided:
  *   - client_credentials: when only --client-id + --client-secret are given
  *   - password: when --user + --user-password are also provided
  *
- * Use --renew to enable automatic token renewal for later use with `auth client renew`.
+ * Only the access token is persisted — the client secret is NEVER stored.
+ * When the access token expires, re-run this command with the same credentials
+ * to obtain a new one. There is no automatic refresh.
  */
 export default class AuthClient extends BaseCommand {
     static description = t('commands.auth.client.description', 'Authenticate an API client and save session');
     static examples = [
         '<%= config.bin %> <%= command.id %> --client-id <id> --client-secret <secret>',
-        '<%= config.bin %> <%= command.id %> --client-id <id> --client-secret <secret> --renew',
         '<%= config.bin %> <%= command.id %> --client-id <id> --client-secret <secret> --user <email> --user-password <pwd>',
         '<%= config.bin %> <%= command.id %> --client-id <id> --client-secret <secret> --grant-type client_credentials',
     ];
@@ -54,11 +53,6 @@ export default class AuthClient extends BaseCommand {
             delimiter: ',',
             helpGroup: 'AUTH',
         }),
-        renew: Flags.boolean({
-            char: 'r',
-            description: 'Enable automatic token renewal (stores credentials for later refresh)',
-            default: false,
-        }),
         'grant-type': Flags.string({
             char: 't',
             description: 'OAuth grant type (default: auto-detect based on provided credentials)',
@@ -92,7 +86,6 @@ export default class AuthClient extends BaseCommand {
         const user = this.flags.user;
         const userPassword = this.flags['user-password'];
         const grantType = this.resolveGrantType(this.flags['grant-type'], user);
-        const autoRenew = this.flags.renew;
         if (grantType === 'password' && (!user || !userPassword)) {
             this.error(t('commands.auth.client.userRequired', 'Username and password are required for password grant. Provide --user and --user-password.'));
         }
@@ -140,15 +133,17 @@ export default class AuthClient extends BaseCommand {
         catch {
             // not a JWT; ignore
         }
-        setStoredSession({
+        saveAuthSession({
             clientId,
+            flow: 'client-credentials',
             accessToken: data.access_token,
-            refreshToken: data.refresh_token ?? null,
-            renewBase: autoRenew ? credentials : null,
-            user: this.extractUser(data.id_token),
+            refreshToken: null,
+            sub: this.extractUser(data.id_token),
+            expiresAt: new Date(Date.now() + (data.expires_in ?? 0) * 1000).toISOString(),
+            scopes: data.scope ? data.scope.split(' ') : (scopes ?? []),
+            accountManagerHost,
         });
-        const renewMsg = autoRenew ? ' Auto-renewal enabled.' : '';
-        this.log(t('commands.auth.client.success', 'Authentication succeeded.{{renewMsg}}', { renewMsg }));
+        this.log(t('commands.auth.client.success', 'Authentication succeeded.'));
     }
     extractUser(idToken) {
         if (!idToken)

package/dist/commands/auth/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/auth/client/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/auth/client/index.ts"],"names":[],"mappings":"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"}

package/dist/commands/auth/client/token.d.ts

@@ -6,18 +6,21 @@ interface AuthClientTokenOutput {
     accessToken: string;
     clientId: string;
     expires: string;
-    renewable: boolean;
     scopes: string[];
     user: null | string;
 }
 /**
- * Return the current authentication token from the stateful store.
- * Mirrors sfcc-ci `client:auth:token` command behavior.
+ * Return the stored authentication token. With multiple stored sessions
+ * (e.g. one from `auth client`, one from `auth login`), pass `--client-id`
+ * to disambiguate.
  */
 export default class AuthClientToken extends BaseCommand<typeof AuthClientToken> {
     static description: string;
     static enableJsonFlag: boolean;
     static examples: string[];
+    static flags: {
+        'client-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
     static hiddenAliases: string[];
     run(): Promise<AuthClientTokenOutput>;
 }

package/dist/commands/auth/client/token.js

@@ -3,62 +3,76 @@
  * SPDX-License-Identifier: Apache-2
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
-import { ux } from '@oclif/core';
+import { Flags, ux } from '@oclif/core';
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { getStoredSession, isStatefulTokenValid, decodeJWT } from '@salesforce/b2c-tooling-sdk/auth';
+import { findAuthSession, listAuthSessions, isAuthSessionTokenValid, decodeJWT } from '@salesforce/b2c-tooling-sdk/auth';
 import { t } from '../../../i18n/index.js';
 /**
- * Return the current authentication token from the stateful store.
- * Mirrors sfcc-ci `client:auth:token` command behavior.
+ * Return the stored authentication token. With multiple stored sessions
+ * (e.g. one from `auth client`, one from `auth login`), pass `--client-id`
+ * to disambiguate.
  */
 export default class AuthClientToken extends BaseCommand {
-    static description = t('commands.auth.client.token.description', 'Return the current authentication token (stateful)');
+    static description = t('commands.auth.client.token.description', 'Return the stored authentication token');
     static enableJsonFlag = true;
-    static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> --json'];
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> --client-id <id>',
+        '<%= config.bin %> <%= command.id %> --json',
+    ];
+    static flags = {
+        'client-id': Flags.string({
+            description: 'Client ID for the stored session to read',
+            env: 'SFCC_CLIENT_ID',
+            helpGroup: 'AUTH',
+        }),
+    };
     static hiddenAliases = ['client:auth:token'];
     async run() {
-        this.logger.debug('[StatefulAuth] Reading stored session from stateful store');
-        const session = getStoredSession();
+        const requestedClientId = this.flags['client-id'];
+        let session = requestedClientId ? findAuthSession(requestedClientId) : null;
+        if (!session && !requestedClientId) {
+            const all = listAuthSessions();
+            if (all.length === 1) {
+                session = all[0];
+            }
+            else if (all.length > 1) {
+                this.error(t('commands.auth.client.token.ambiguous', 'Multiple stored sessions found. Pass --client-id to choose one.'));
+            }
+        }
         if (!session?.accessToken) {
-            this.logger.debug('[StatefulAuth] No stored session found');
-            this.error(t('commands.auth.client.token.noToken', 'No authentication token found. Run `auth client` to authenticate first.'));
+            this.error(t('commands.auth.client.token.noToken', 'No authentication token found. Run `auth client` or `auth login` to authenticate first.'));
         }
-        this.logger.debug({ clientId: session.clientId, user: session.user }, `[StatefulAuth] Found session for client: ${session.clientId}`);
-        // Decode JWT to extract metadata
         let expires = '';
-        let scopes = [];
+        let scopes = session.scopes ?? [];
         try {
             const decoded = decodeJWT(session.accessToken);
             const exp = decoded.payload.exp;
             if (typeof exp === 'number') {
                 expires = new Date(exp * 1000).toISOString();
             }
-            const scope = decoded.payload.scope;
-            scopes = scope === null || scope === undefined ? [] : Array.isArray(scope) ? scope : scope.split(' ');
-            this.logger.debug({ expires, scopes }, '[StatefulAuth] Decoded JWT claims');
-            this.logger.trace({ jwt: decoded.payload }, '[StatefulAuth] JWT payload');
+            if (scopes.length === 0) {
+                const scope = decoded.payload.scope;
+                scopes = scope === null || scope === undefined ? [] : Array.isArray(scope) ? scope : scope.split(' ');
+            }
         }
         catch {
-            this.logger.debug('[StatefulAuth] Token is not a valid JWT; returning raw token');
+            // not a JWT; ignore
         }
-        const valid = isStatefulTokenValid(session);
-        const renewable = session.renewBase !== null && session.renewBase !== undefined && session.renewBase !== '';
-        this.logger.debug({ valid, renewable }, `[StatefulAuth] Token valid: ${valid}, renewable: ${renewable}`);
+        const valid = isAuthSessionTokenValid(session);
         const output = {
             accessToken: session.accessToken,
             clientId: session.clientId,
             expires,
-            renewable,
             scopes,
-            user: session.user ?? null,
+            user: session.sub ?? null,
         };
         if (this.jsonEnabled()) {
             if (!valid) {
-                this.warn(t('commands.auth.client.token.expired', 'Token is expired or invalid. Run `auth client renew` or `auth client` to refresh.'));
+                this.warn(t('commands.auth.client.token.expired', 'Token is expired or invalid. Run `auth client` or `auth login` to re-authenticate.'));
             }
             return output;
         }
-        // In normal mode, output just the raw token to stdout (matches sfcc-ci behavior)
         ux.stdout(session.accessToken);
         return output;
     }

package/dist/commands/auth/client/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/commands/auth/client/token.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../../src/commands/auth/client/token.ts"],"names":[],"mappings":"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"}

package/dist/commands/auth/login.d.ts

@@ -1,8 +1,8 @@
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
 /**
- * Log in via browser (implicit OAuth) and persist the session for stateful auth.
- * Uses the same storage as sfcc-ci; when valid, subsequent commands use this token
- * until it expires or you run auth:logout.
+ * Log in via browser (Authorization Code + PKCE) and persist the session for
+ * stateful auth. PKCE sessions use the CLI's unified multi-session store; old
+ * sfcc-ci-compatible renewal records are intentionally not reused.
  */
 export default class AuthLogin extends BaseCommand<typeof AuthLogin> {
     static args: {
@@ -13,8 +13,10 @@ export default class AuthLogin extends BaseCommand<typeof AuthLogin> {
     static flags: {
         'account-manager-host': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'auth-scope': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'auth-methods': import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static hiddenAliases: string[];
     protected loadConfiguration(): Promise<import("@salesforce/b2c-tooling-sdk").ResolvedB2CConfig>;
     run(): Promise<void>;
+    private selectMethod;
 }

package/dist/commands/auth/login.js

@@ -5,13 +5,14 @@
  */
 import { Args, Flags } from '@oclif/core';
 import { BaseCommand, ERROR_CODE, loadConfig } from '@salesforce/b2c-tooling-sdk/cli';
-import { ImplicitOAuthStrategy, setStoredSession, decodeJWT } from '@salesforce/b2c-tooling-sdk/auth';
+import { ImplicitOAuthStrategy, createUserAuthStrategy } from '@salesforce/b2c-tooling-sdk/auth';
 import { DEFAULT_ACCOUNT_MANAGER_HOST } from '@salesforce/b2c-tooling-sdk';
 import { t, withDocs } from '../../i18n/index.js';
+const LOGIN_AUTH_METHODS = ['user', 'implicit'];
 /**
- * Log in via browser (implicit OAuth) and persist the session for stateful auth.
- * Uses the same storage as sfcc-ci; when valid, subsequent commands use this token
- * until it expires or you run auth:logout.
+ * Log in via browser (Authorization Code + PKCE) and persist the session for
+ * stateful auth. PKCE sessions use the CLI's unified multi-session store; old
+ * sfcc-ci-compatible renewal records are intentionally not reused.
  */
 export default class AuthLogin extends BaseCommand {
     static args = {
@@ -21,7 +22,11 @@ export default class AuthLogin extends BaseCommand {
         }),
     };
     static description = withDocs(t('commands.auth.login.description', 'Log in via browser and save session (stateful auth)'), '/cli/auth.html#b2c-auth-login');
-    static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> your-client-id'];
+    static examples = [
+        '<%= config.bin %> <%= command.id %>',
+        '<%= config.bin %> <%= command.id %> your-client-id',
+        '<%= config.bin %> <%= command.id %> --auth-methods implicit',
+    ];
     static flags = {
         'account-manager-host': Flags.string({
             description: `Account Manager hostname for OAuth (default: ${DEFAULT_ACCOUNT_MANAGER_HOST})`,
@@ -37,14 +42,25 @@ export default class AuthLogin extends BaseCommand {
             delimiter: ',',
             helpGroup: 'AUTH',
         }),
+        'auth-methods': Flags.string({
+            description: 'Browser-based auth flow to use. Defaults to "user" (Authorization Code + PKCE).',
+            env: 'SFCC_AUTH_METHODS',
+            options: [...LOGIN_AUTH_METHODS],
+            multiple: true,
+            multipleNonGreedy: true,
+            delimiter: ',',
+            helpGroup: 'AUTH',
+        }),
     };
     static hiddenAliases = ['auth:login'];
     loadConfiguration() {
         const scopes = this.flags['auth-scope'];
+        const authMethods = this.flags['auth-methods'];
         return loadConfig({
             clientId: this.args.clientId ?? process.env.SFCC_CLIENT_ID,
             accountManagerHost: this.flags['account-manager-host'],
             scopes: scopes && scopes.length > 0 ? scopes : undefined,
+            authMethods: authMethods && authMethods.length > 0 ? authMethods : undefined,
         }, this.getBaseConfigOptions());
     }
     async run() {
@@ -54,30 +70,29 @@ export default class AuthLogin extends BaseCommand {
         }
         const accountManagerHost = this.resolvedConfig.values.accountManagerHost ?? DEFAULT_ACCOUNT_MANAGER_HOST;
         const scopes = this.resolvedConfig.values.scopes;
-        const strategy = new ImplicitOAuthStrategy({
-            clientId,
-            scopes,
-            accountManagerHost,
-        });
-        const tokenResponse = await strategy.getTokenResponse();
-        let user = null;
-        try {
-            const decoded = decodeJWT(tokenResponse.accessToken);
-            if (typeof decoded.payload.sub === 'string') {
-                user = decoded.payload.sub;
-            }
+        const method = this.selectMethod();
+        if (method === 'implicit') {
+            this.warn(t('warning.implicitFlowDeprecated', 'The OAuth implicit flow is deprecated. Create a new public OAuth client in Account Manager ' +
+                'and use Authorization Code + PKCE (the default) instead. ' +
+                'See https://salesforcecommercecloud.github.io/b2c-developer-tooling/guide/authentication.html#implicit-flow-deprecation'));
+            const strategy = new ImplicitOAuthStrategy({ clientId, scopes, accountManagerHost });
+            await strategy.getTokenResponse();
         }
-        catch {
-            // ignore
+        else {
+            // PKCE with an automatic, WARN-logged fallback to the implicit flow for
+            // clients not yet registered for PKCE (see oauth-pkce-fallback in the SDK).
+            const strategy = createUserAuthStrategy({ clientId, scopes, accountManagerHost });
+            await strategy.getTokenResponse();
         }
-        setStoredSession({
-            clientId,
-            accessToken: tokenResponse.accessToken,
-            refreshToken: null,
-            renewBase: null,
-            user,
-        });
         this.log(t('commands.auth.login.success', 'Login succeeded. Session saved for stateful auth.'));
     }
+    selectMethod() {
+        // CLI/env values are merged into resolvedConfig by loadConfiguration(), so
+        // this also honors an explicit dw.json `auth-methods` selection. Ignore
+        // non-browser methods because `auth login` is browser-only; absent an
+        // explicit browser method, PKCE remains the absolute default.
+        const method = this.resolvedConfig.values.authMethods?.find((candidate) => LOGIN_AUTH_METHODS.includes(candidate));
+        return method ?? 'user';
+    }
 }
 //# sourceMappingURL=login.js.map

package/dist/commands/auth/login.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"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"}

package/dist/commands/auth/logout.d.ts

@@ -1,8 +1,8 @@
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
 /**
- * Clear the stored OAuth session (stateful auth).
- * Uses the same storage as sfcc-ci; after logout, commands use stateless auth
- * (client credentials or implicit) when configured.
+ * Clear all stored OAuth sessions, including the legacy sfcc-ci-compatible
+ * renewal record. After logout, commands resolve a configured stateless flow
+ * or start the default PKCE browser flow.
  */
 export default class AuthLogout extends BaseCommand<typeof AuthLogout> {
     static description: string;

package/dist/commands/auth/logout.js

@@ -4,19 +4,19 @@
  * For full license text, see the license.txt file in the repo root or http://www.apache.org/licenses/LICENSE-2.0
  */
 import { BaseCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { clearStoredSession } from '@salesforce/b2c-tooling-sdk/auth';
+import { clearAllAuthSessions } from '@salesforce/b2c-tooling-sdk/auth';
 import { t, withDocs } from '../../i18n/index.js';
 /**
- * Clear the stored OAuth session (stateful auth).
- * Uses the same storage as sfcc-ci; after logout, commands use stateless auth
- * (client credentials or implicit) when configured.
+ * Clear all stored OAuth sessions, including the legacy sfcc-ci-compatible
+ * renewal record. After logout, commands resolve a configured stateless flow
+ * or start the default PKCE browser flow.
  */
 export default class AuthLogout extends BaseCommand {
     static description = withDocs(t('commands.auth.logout.description', 'Clear stored session (stateful auth)'), '/cli/auth.html#b2c-auth-logout');
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static hiddenAliases = ['auth:logout'];
     async run() {
-        clearStoredSession();
+        clearAllAuthSessions();
         this.log(t('commands.auth.logout.success', 'Logged out. Stored session cleared.'));
     }
 }

package/dist/commands/auth/logout.js.map

@@ -1 +1 @@
-{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,WAAW,EAAC,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAC,kBAAkB,EAAC,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEhD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAA8B;IACpE,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,kCAAkC,EAAE,sCAAsC,CAAC,EAC7E,gCAAgC,CACjC,CAAC;IAEF,MAAM,CAAC,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAE1D,MAAM,CAAC,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;IAEvC,KAAK,CAAC,GAAG;QACP,kBAAkB,EAAE,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,8BAA8B,EAAE,qCAAqC,CAAC,CAAC,CAAC;IACrF,CAAC"}
+{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAC,WAAW,EAAC,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAC,oBAAoB,EAAC,MAAM,kCAAkC,CAAC;AACtE,OAAO,EAAC,CAAC,EAAE,QAAQ,EAAC,MAAM,qBAAqB,CAAC;AAEhD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,WAA8B;IACpE,MAAM,CAAC,WAAW,GAAG,QAAQ,CAC3B,CAAC,CAAC,kCAAkC,EAAE,sCAAsC,CAAC,EAC7E,gCAAgC,CACjC,CAAC;IAEF,MAAM,CAAC,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAE1D,MAAM,CAAC,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;IAEvC,KAAK,CAAC,GAAG;QACP,oBAAoB,EAAE,CAAC;QACvB,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,8BAA8B,EAAE,qCAAqC,CAAC,CAAC,CAAC;IACrF,CAAC"}

package/dist/commands/cap/install.d.ts

@@ -1,5 +1,6 @@
 import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { commerceAppInstall, validateCap, type CommerceAppInstallResult } from '@salesforce/b2c-tooling-sdk/operations/cap';
+import { commerceAppInstall, readManifestFromTarget, validateCap, type CommerceAppInstallResult } from '@salesforce/b2c-tooling-sdk/operations/cap';
+import { confirm } from '@salesforce/b2c-tooling-sdk/ux';
 export default class CapInstall extends JobCommand<typeof CapInstall> {
     static args: {
         path: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
@@ -13,6 +14,7 @@ export default class CapInstall extends JobCommand<typeof CapInstall> {
         timeout: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'skip-validate': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'create-pr': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         server: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'webdav-server': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'code-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -47,7 +49,9 @@ export default class CapInstall extends JobCommand<typeof CapInstall> {
     };
     protected operations: {
         commerceAppInstall: typeof commerceAppInstall;
+        readManifestFromTarget: typeof readManifestFromTarget;
         validateCap: typeof validateCap;
+        confirm: typeof confirm;
     };
     run(): Promise<CommerceAppInstallResult>;
 }

package/dist/commands/cap/install.js

@@ -5,8 +5,12 @@
  */
 import { Args, Flags } from '@oclif/core';
 import { JobCommand } from '@salesforce/b2c-tooling-sdk/cli';
-import { commerceAppInstall, validateCap, JobExecutionError, } from '@salesforce/b2c-tooling-sdk/operations/cap';
+import { commerceAppInstall, readManifestFromTarget, validateCap, JobExecutionError, } from '@salesforce/b2c-tooling-sdk/operations/cap';
+import { confirm } from '@salesforce/b2c-tooling-sdk/ux';
 import { t, withDocs } from '../../i18n/index.js';
+const NON_SFDC_WARNING = 'You are installing a Non-SFDC Application, as that term may be defined in the MSA between SFDC and Customer. ' +
+    'SFDC does not warrant or support Non-SFDC Applications or other non-SFDC products or services. ' +
+    'By proceeding, you acknowledge these terms.';
 export default class CapInstall extends JobCommand {
     static args = {
         path: Args.string({
@@ -46,18 +50,26 @@ export default class CapInstall extends JobCommand {
             description: 'Create a pull request against the connected Storefront Next repository when the app includes storefront content',
             default: false,
         }),
+        force: Flags.boolean({
+            char: 'f',
+            description: 'Skip the non-Salesforce app confirmation prompt',
+            default: false,
+        }),
     };
     operations = {
         commerceAppInstall,
+        readManifestFromTarget,
         validateCap,
+        confirm,
     };
     async run() {
         this.requireOAuthCredentials();
         this.requireWebDavCredentials();
         const { path } = this.args;
-        const { 'site-id': site, 'clean-archive': cleanArchive, timeout, 'skip-validate': skipValidate, 'create-pr': createPr, } = this.flags;
+        const { 'site-id': site, 'clean-archive': cleanArchive, timeout, 'skip-validate': skipValidate, 'create-pr': createPr, force, } = this.flags;
         const hostname = this.resolvedConfig.values.hostname;
         // Validate first unless skipped
+        let manifest;
         if (!skipValidate) {
             this.log(t('commands.cap.install.validating', 'Validating CAP structure...'));
             const validation = await this.operations.validateCap(path);
@@ -72,12 +84,8 @@ export default class CapInstall extends JobCommand {
                     this.log(`  ⚠ ${warn}`);
                 }
             }
+            manifest = validation.manifest;
         }
-        this.log(t('commands.cap.install.installing', 'Installing CAP {{path}} to {{hostname}} (site: {{site}})...', {
-            path,
-            hostname,
-            site,
-        }));
         const context = this.createContext('cap:install', { path, site, hostname });
         const beforeResult = await this.runBeforeHooks(context);
         if (beforeResult.skip) {
@@ -92,6 +100,22 @@ export default class CapInstall extends JobCommand {
                 archiveKept: false,
             };
         }
+        manifest ??= await this.operations.readManifestFromTarget(path);
+        if (manifest.provider !== 'salesforce') {
+            this.log(`⚠ ${NON_SFDC_WARNING}`);
+            if (!force && !this.jsonEnabled()) {
+                const proceed = await this.operations.confirm(t('commands.cap.install.confirmNonSfdc', 'Proceed with installing this non-Salesforce app?'));
+                if (!proceed) {
+                    this.log(t('commands.cap.install.cancelled', 'Install cancelled'));
+                    this.exit(0);
+                }
+            }
+        }
+        this.log(t('commands.cap.install.installing', 'Installing CAP {{path}} to {{hostname}} (site: {{site}})...', {
+            path,
+            hostname,
+            site,
+        }));
         try {
             const result = await this.operations.commerceAppInstall(this.instance, path, {
                 siteId: site,

package/dist/commands/cap/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/cap/install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../src/commands/cap/install.ts"],"names":[],"mappings":"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"}