Merge branch 'v3.2.13'

Author: vivek-nexus

extension-unpacked.zip

@@ -135,11 +135,23 @@ chrome.runtime.onMessage.addListener(function (messageUnTyped, sender, sendRespo
             })
     }
 
-    if (message.type === "enable_beta") {
+    if ((message.type === "enable_beta") || (message.type === "enable_beta_with_notification")) {
+        const showNotification = (message.type === "enable_beta_with_notification")
+
         enableBeta().then((message) => {
-            /** @type {ExtensionResponse} */
-            const response = { success: true, message: message }
-            sendResponse(response)
+            registerContentScripts(showNotification).then((message) => {
+                /** @type {ExtensionResponse} */
+                const response = { success: true, message: message }
+                sendResponse(response)
+            })
+                .catch((error) => {
+                    // Fails with error codes: not defined
+                    const parsedError = /** @type {ErrorObject} */ (error)
+
+                    /** @type {ExtensionResponse} */
+                    const response = { success: false, message: parsedError }
+                    sendResponse(response)
+                })
         })
             .catch((error) => {
                 // Fails with error codes: not defined
@@ -194,9 +206,12 @@ chrome.runtime.onUpdateAvailable.addListener(() => {
     })
 })
 
-// Register content scripts whenever runtime permission is provided by the user
+// Register content scripts whenever runtime permission change—mostly serves as a backup for changes made outside the UI.
 chrome.permissions.onAdded.addListener((event) => {
-    registerContentScripts()
+    // Prevent competing with explicit content script registrations
+    setTimeout(() => {
+        registerContentScripts()
+    }, 2000)
 })
 
 
@@ -639,7 +654,7 @@ function enableBeta() {
 /**
  * @param {boolean} [showNotification]
  */
-function registerContentScripts(showNotification = true) {
+function registerContentScripts(showNotification = false) {
     return new Promise((resolve, reject) => {
         chrome.permissions.getAll().then((permissions) => {
             if (permissions.origins?.includes("https://*.zoom.us/*") && permissions.origins?.includes("https://teams.live.com/*") && permissions.origins?.includes("https://teams.microsoft.com/*")) {
@@ -699,8 +714,8 @@ function registerContentScripts(showNotification = true) {
                                             chrome.notifications.create({
                                                 type: "basic",
                                                 iconUrl: "icon.png",
-                                                title: "Enabled! Join Zoom/Teams meetings on the browser",
-                                                message: "Refresh any existing Zoom/Teams pages"
+                                                title: "Enabled!",
+                                                message: "Join Teams/Zoom meetings on the browser. Refresh any existing Zoom/Teams pages"
                                             })
                                         }
                                     })

extension/background.js

@@ -639,7 +639,6 @@ function showNotification(extensionStatusJSON) {
       }
       chrome.runtime.sendMessage(message, (responseUntyped) => {
         const response = /** @type {ExtensionResponse} */ (responseUntyped)
-        console.log(response)
         if (!response.success) {
           text.innerHTML += `<br/><br/> <b>Teams and Zoom transcripts are in beta. <u>Click to enable.</u></b>`
           obj.style.cssText += extensionStatusJSON.showBetaMessage ? `cursor: pointer;` : ``
@@ -650,8 +649,15 @@ function showNotification(extensionStatusJSON) {
             }
             chrome.runtime.sendMessage(message, function (responseUntyped) {
               const response = /** @type {ExtensionResponse} */ (responseUntyped)
-              console.log(response)
-              if (!response.success) {
+              if (response.success) {
+                if (response.message === "Teams and Zoom content scripts registered") {
+                  alert("Enabled! Join Teams/Zoom meetings on the browser. Refresh any existing Zoom/Teams pages.")
+                }
+                else {
+                  alert("Already enabled! Go ahead, enjoy your day!")
+                }
+              }
+              else {
                 alert(response.message)
               }
             })

extension/content.js

@@ -36,35 +36,24 @@ window.onload = function () {
   })
 
   enableBeta?.addEventListener("click", () => {
-    chrome.permissions.request({
-      origins: ["https://*.zoom.us/*", "https://teams.live.com/*", "https://teams.microsoft.com/*"],
-      permissions: ["notifications"]
-    }).then((granted) => {
-      if (granted) {
-        /** @type {ExtensionMessage} */
-        const message = {
-          type: "register_content_scripts",
+
+    /** @type {ExtensionMessage} */
+    const message = {
+      type: "enable_beta_with_notification",
+    }
+    chrome.runtime.sendMessage(message, function (responseUntyped) {
+      const response = /** @type {ExtensionResponse} */ (responseUntyped)
+      if (response.success) {
+        if (response.message === "Teams and Zoom content scripts registered") {
+          alert("Enabled! Join Teams/Zoom meetings on the browser. Refresh any existing Zoom/Teams pages")
+        }
+        else {
+          alert("Already enabled! Go ahead, enjoy your day!")
         }
-        chrome.runtime.sendMessage(message, (responseUntyped) => {
-          const response = /** @type {ExtensionResponse} */ (responseUntyped)
-          // Prevent alert as well as notification from background script
-          if (response.success) {
-            if (response.message !== "Teams and Zoom content scripts registered") {
-              alert("Already enabled! Go ahead, enjoy your day!")
-            }
-          }
-          else {
-            console.error(response.message)
-            alert("Failed to enable. Please try again.")
-          }
-        })
       }
       else {
-        alert("Permission denied")
+        alert(response.message)
       }
-    }).catch((error) => {
-      console.error(error)
-      alert("Could not enable Teams and Zoom transcripts")
     })
   })
 

extension/popup.js

@@ -108,7 +108,7 @@
 
 /**
  * @typedef {Object} ExtensionMessage Message sent by the calling script
- * @property {"new_meeting_started" | "meeting_ended" | "download_transcript_at_index" | "retry_webhook_at_index" | "recover_last_meeting" | "register_content_scripts" | "enable_beta"} type type of message
+ * @property {"new_meeting_started" | "meeting_ended" | "download_transcript_at_index" | "retry_webhook_at_index" | "recover_last_meeting" | "register_content_scripts" | "enable_beta" | "enable_beta_with_notification"} type type of message
  * @property {number} [index] index of the meeting to process
  */