From 2f4a9d450a618a857009c4c1e3f6158f42c9add4 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Tue, 27 Apr 2021 20:01:53 +0200
Subject: [PATCH] displaying extension name in views

---
 app/scripts/comp/extension/protocol-impl.js       | 15 ++++++++++-----
 app/scripts/locales/base.json                     |  4 ++--
 .../extension/extension-create-group.hbs          |  2 +-
 app/templates/extension/extension-save-entry.hbs  |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/scripts/comp/extension/protocol-impl.js b/app/scripts/comp/extension/protocol-impl.js
index 56ebe394..ad26a6d8 100644
--- a/app/scripts/comp/extension/protocol-impl.js
+++ b/app/scripts/comp/extension/protocol-impl.js
@@ -188,12 +188,8 @@ async function checkContentRequestPermissions(request) {
         }
     }
 
-    const extensionName = client.connection.appName
-        ? `${client.connection.extensionName} (${client.connection.appName})`
-        : client.connection.extensionName;
-
     const extensionConnectView = new ExtensionConnectView({
-        extensionName,
+        extensionName: getHumanReadableExtensionName(client),
         identityVerified: !Launcher,
         files,
         allFiles: config?.allFiles ?? true,
@@ -272,6 +268,12 @@ function isKeePassXcBrowser(request) {
     return getClient(request).connection.extensionName === 'KeePassXC-Browser';
 }
 
+function getHumanReadableExtensionName(client) {
+    return client.connection.appName
+        ? `${client.connection.extensionName} (${client.connection.appName})`
+        : client.connection.extensionName;
+}
+
 function focusKeeWeb() {
     logger.debug('Focus KeeWeb');
     if (Launcher) {
@@ -527,6 +529,7 @@ const ProtocolHandlers = {
             }
 
             const saveEntryView = new ExtensionSaveEntryView({
+                extensionName: getHumanReadableExtensionName(client),
                 url: payload.url,
                 user: payload.login,
                 askSave: RuntimeDataModel.extensionSaveConfig?.askSave || 'always',
@@ -664,7 +667,9 @@ const ProtocolHandlers = {
             }
         }
 
+        const client = getClient(request);
         const createGroupView = new ExtensionCreateGroupView({
+            extensionName: getHumanReadableExtensionName(client),
             groupPath: groupNames.join(' / '),
             files: files.map((f, ix) => ({ id: f.id, name: f.name, selected: ix === 0 }))
         });
diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json
index d3d7bf46..150ad0c6 100644
--- a/app/scripts/locales/base.json
+++ b/app/scripts/locales/base.json
@@ -791,11 +791,11 @@
     "extensionConnectSettingsAreForSession": "Settings you select here are valid only for the active session. You can view and manage sessions in KeeWeb settings.",
     "extensionUnlockMessage": "Unlock to connect a browser extension",
     "extensionNewGroupHeader": "New group",
-    "extensionNewGroupBody": "A browser extension is trying to create a new group. Allow this?",
+    "extensionNewGroupBody": "{} is trying to create a new group. Allow this?",
     "extensionNewGroupPath": "Group path",
     "extensionNewGroupFile": "This group will be created in:",
     "extensionSaveEntryHeader": "Save password",
-    "extensionSaveEntryBody": "A browser extension is trying to save a password. Allow this?",
+    "extensionSaveEntryBody": "{} is trying to save a password. Allow this?",
     "extensionSaveEntryAuto": "Save other passwords automatically in this session",
     "extensionSaveEntryNewGroup": "new group"
 }
diff --git a/app/templates/extension/extension-create-group.hbs b/app/templates/extension/extension-create-group.hbs
index 45a97c2f..90ef44af 100644
--- a/app/templates/extension/extension-create-group.hbs
+++ b/app/templates/extension/extension-create-group.hbs
@@ -1,5 +1,5 @@
 <div class="extension-create-group">
-    <p>{{res 'extensionNewGroupBody'}}</p>
+    <p>{{#res 'extensionNewGroupBody'}}{{extensionName}}{{/res}}</p>
     <p>{{res 'extensionNewGroupPath'}}: {{groupPath}}</p>
     <div>
         <label for="extension-create-group__file">{{res 'extensionNewGroupFile'}}</label>
diff --git a/app/templates/extension/extension-save-entry.hbs b/app/templates/extension/extension-save-entry.hbs
index aec1da4f..98f91fa4 100644
--- a/app/templates/extension/extension-save-entry.hbs
+++ b/app/templates/extension/extension-save-entry.hbs
@@ -1,5 +1,5 @@
 <div class="extension-save-entry">
-    <p>{{res 'extensionSaveEntryBody'}}</p>
+    <p>{{#res 'extensionSaveEntryBody'}}{{extensionName}}{{/res}}</p>
     <p>
         <label for="extension-save-entry__url">{{Res 'website'}}:</label>
         <span id="extension-save-entry__url">{{url}}</span>