fix: show name in prompt

salesforcecli · Mar 27, 2024 · 4d8d947 · 4d8d947
1 parent b66760c
commit 4d8d947
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/messages/verify.md b/messages/verify.md
@@ -38,7 +38,7 @@ A digital signature is specified for this plugin but it didn't verify against th
 
 # InstallConfirmation
 
-This plugin isn't signed by Salesforce. Only install the plugin if you trust its creator. Do you want to continue the installation?,
+%s isn't signed by Salesforce. Only install the plugin if you trust its creator. Do you want to continue the installation?,
 
 # SuggestAllowList
 

diff --git a/src/hooks/verifyInstallSignature.ts b/src/hooks/verifyInstallSignature.ts
@@ -65,7 +65,7 @@ export const hook: Hook.PluginsPreinstall = async function (options) {
       this.error(error);
     }
   } else {
-    await doPrompt();
+    await doPrompt(options.plugin.url);
   }
 };
 

diff --git a/src/shared/installationVerification.ts b/src/shared/installationVerification.ts
@@ -437,9 +437,14 @@ export class VerificationConfig {
   }
 }
 
-export async function doPrompt(): Promise<void> {
+export async function doPrompt(plugin?: string): Promise<void> {
   const messages = Messages.loadMessages('@salesforce/plugin-trust', 'verify');
-  if (!(await prompts.confirm({ message: messages.getMessage('InstallConfirmation'), ms: 30_000 }))) {
+  if (
+    !(await prompts.confirm({
+      message: messages.getMessage('InstallConfirmation', [plugin ?? 'This plugin']),
+      ms: 30_000,
+    }))
+  ) {
     throw new SfError('The user canceled the plugin installation.', 'InstallationCanceledError');
   }
   // they approved the plugin.  Let them know how to automate this.
@@ -473,7 +478,7 @@ export async function doInstallationCodeSigningVerification(
         if (!verificationConfig.verifier) {
           throw new Error('VerificationConfig.verifier is not set.');
         }
-        return await doPrompt();
+        return await doPrompt(plugin.plugin);
       } else if (err.name === 'PluginNotFound' || err.name === 'PluginAccessDenied') {
         throw setErrorName(new SfError(err.message ?? 'The user canceled the plugin installation.'), '');
       }