From 3bb58baf45fe1074429f0dc1886e4278e20cf1db Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Tue, 19 Oct 2021 12:10:31 +0200
Subject: [PATCH] Add types for addLogin and changePassword runtime messages

---
 src/background/models/addLoginRuntimeMessage.ts |  5 +++++
 .../models/changePasswordRuntimeMessage.ts      |  5 +++++
 src/background/notification.background.ts       |  8 +++++---
 src/content/notificationBar.ts                  | 17 +++++++++++------
 4 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 src/background/models/addLoginRuntimeMessage.ts
 create mode 100644 src/background/models/changePasswordRuntimeMessage.ts

diff --git a/src/background/models/addLoginRuntimeMessage.ts b/src/background/models/addLoginRuntimeMessage.ts
new file mode 100644
index 0000000000..3426bc595d
--- /dev/null
+++ b/src/background/models/addLoginRuntimeMessage.ts
@@ -0,0 +1,5 @@
+export default class AddLoginRuntimeMessage {
+    username: string;
+    password: string;
+    url: string;
+}
diff --git a/src/background/models/changePasswordRuntimeMessage.ts b/src/background/models/changePasswordRuntimeMessage.ts
new file mode 100644
index 0000000000..8f3f6aa577
--- /dev/null
+++ b/src/background/models/changePasswordRuntimeMessage.ts
@@ -0,0 +1,5 @@
+export default class ChangePasswordRuntimeMessage {
+    currentPassword: string;
+    newPassword: string;
+    url: string;
+}
diff --git a/src/background/notification.background.ts b/src/background/notification.background.ts
index d12834e0a4..929da3f040 100644
--- a/src/background/notification.background.ts
+++ b/src/background/notification.background.ts
@@ -22,6 +22,8 @@ import { PolicyType } from 'jslib-common/enums/policyType';
 
 import AddChangePasswordQueueMessage from './models/addChangePasswordQueueMessage';
 import AddLoginQueueMessage from './models/addLoginQueueMessage';
+import AddLoginRuntimeMessage from './models/addLoginRuntimeMessage';
+import ChangePasswordRuntimeMessage from './models/changePasswordRuntimeMessage';
 import LockedVaultPendingNotificationsItem from './models/lockedVaultPendingNotificationsItem';
 import { NotificationQueueMessageType } from './models/NotificationQueueMessageType';
 
@@ -178,7 +180,7 @@ export default class NotificationBackground {
         }
     }
 
-    private async addLogin(loginInfo: any, tab: chrome.tabs.Tab) {
+    private async addLogin(loginInfo: AddLoginRuntimeMessage, tab: chrome.tabs.Tab) {
         const loginDomain = Utils.getDomain(loginInfo.url);
         if (loginDomain == null) {
             return;
@@ -220,7 +222,7 @@ export default class NotificationBackground {
         }
     }
 
-    private async pushAddLoginToQueue(loginDomain: string, loginInfo: any, tab: chrome.tabs.Tab, isVaultLocked: boolean = false) {
+    private async pushAddLoginToQueue(loginDomain: string, loginInfo: AddLoginRuntimeMessage, tab: chrome.tabs.Tab, isVaultLocked: boolean = false) {
         // remove any old messages for this tab
         this.removeTabFromNotificationQueue(tab);
         const message: AddLoginQueueMessage = {
@@ -237,7 +239,7 @@ export default class NotificationBackground {
         await this.checkNotificationQueue(tab);
     }
 
-    private async changedPassword(changeData: any, tab: chrome.tabs.Tab) {
+    private async changedPassword(changeData: ChangePasswordRuntimeMessage, tab: chrome.tabs.Tab) {
         const loginDomain = Utils.getDomain(changeData.url);
         if (loginDomain == null) {
             return;
diff --git a/src/content/notificationBar.ts b/src/content/notificationBar.ts
index 103b819d6e..da3f25d7d4 100644
--- a/src/content/notificationBar.ts
+++ b/src/content/notificationBar.ts
@@ -1,3 +1,6 @@
+import AddLoginRuntimeMessage from 'src/background/models/addLoginRuntimeMessage';
+import ChangePasswordRuntimeMessage from 'src/background/models/changePasswordRuntimeMessage';
+
 document.addEventListener('DOMContentLoaded', event => {
     if (window.location.hostname.indexOf('vault.bitwarden.com') > -1) {
         return;
@@ -294,7 +297,7 @@ document.addEventListener('DOMContentLoaded', event => {
             }
             const disabledBoth = disabledChangedPasswordNotification && disabledAddLoginNotification;
             if (!disabledBoth && formData[i].usernameEl != null && formData[i].passwordEl != null) {
-                const login = {
+                const login: AddLoginRuntimeMessage = {
                     username: formData[i].usernameEl.value,
                     password: formData[i].passwordEl.value,
                     url: document.URL,
@@ -343,13 +346,15 @@ document.addEventListener('DOMContentLoaded', event => {
 
                 if (newPass != null && curPass != null || (newPassOnly && newPass != null)) {
                     processedForm(form);
+
+                    const changePasswordRuntimeMessage: ChangePasswordRuntimeMessage = {
+                        newPassword: newPass,
+                        currentPassword: curPass,
+                        url: document.URL,
+                    };
                     sendPlatformMessage({
                         command: 'bgChangedPassword',
-                        data: {
-                            newPassword: newPass,
-                            currentPassword: curPass,
-                            url: document.URL,
-                        },
+                        data: changePasswordRuntimeMessage,
                     });
                     break;
                 }