Merge pull request #61 from rtCamp/develop

Release v1.1.1

Author: ayushnirwal

package.json

@@ -1,6 +1,6 @@
 {
   "name": "godam-extension",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "GoDAM Chrome Extension",
   "scripts": {
     "build": "node utils/build.js",

src/assets/helper/backup.png

@@ -2,8 +2,9 @@
   "manifest_version": 3,
   "name": "__MSG_extName__",
   "description": "__MSG_extDesc__",
+  "key":"MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6ug7k8VXtIZgMEyZUPwsn1ubPUnwkIpcQy9bqh7qsCMHLD+p+exSPM0dxIZrV1j/DzhLCMwh5I5K6STycyL5eNficKK7LQeB/IzGbxRCGbDcdmY+nCNLyilwuEDOJ1zCFMKwZ3X2gX1++vfWi64XGAcBi+aM//sREyIaeGsjsIwxwOUrY1eOaiAPQQJw9O7tQ9/zO4D7YOUC00GVasrLysEuJGMwRuj5tL7Rh5gH9o6uEXvR0F95kDPVbOJykjBuNua1Cv7V7sfTw0TXBgOlCpiDX1/m3o63xLmUGGWUWpKmFSFzVSoWTr1xgOm6EMRO9amSQZj7CZicfmVqSo/YQwIDAQAB",
   "default_locale": "en",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "background": {
     "service_worker": "background.bundle.js"
   },

src/manifest.json

@@ -1583,14 +1583,14 @@ const checkAvailableMemory = (sendResponse) => {
 };
 
 // Add this function to handle sign out from GoDAM
-const handleSignOutGoDAM = async () => {
+const handleSignOutGoDAM = async (sendResponse) => {
     const { godamToken } = await chrome.storage.local.get(["godamToken"]);
+    let revokeToken = false;
     if (godamToken) {
         // Revoke token on the server
         const baseUrl = process.env.GODAM_BASE_URL || 'https://app.godam.io';
 
         try {
-
             await fetch(`${baseUrl}/api/method/frappe.integrations.oauth2.revoke_token`, {
                 method: 'POST',
                 headers: {
@@ -1601,17 +1601,22 @@ const handleSignOutGoDAM = async () => {
                     token: godamToken
                 }),
             });
+
+            revokeToken = true;
         } catch (error) {
+            revokeToken = false;
             console.error("Error revoking GoDAM token:", error);
+        } finally {
+            await chrome.storage.local.remove([
+                'godamToken',
+                'godamRefreshToken',
+                'godamTokenExpiration'
+            ]);
+            return sendResponse({status: 'success', revokeToken});
         }
     }
 
-    // Clear token from storage
-    chrome.storage.local.set({
-        godamToken: null,
-        godamRefreshToken: null,
-        godamTokenExpiration: null
-    });
+
 };
 
 // Function to handle saving to GoDAM
@@ -1653,8 +1658,10 @@ const handleSaveToGoDAM = async (sendResponse, request, fallback = false) => {
 
 const handleSignInGoDAM = async (sendResponse) => {
     const signInGoDAM = require('./modules/signInGoDAM').default;
+    const setOrgList = require('./modules/setOrgList').default;
 
     const token = await signInGoDAM();
+    await setOrgList();
 
     if (token) {
         sendResponse({ status: "ok", token: token });
@@ -1900,6 +1907,10 @@ chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
         const setOrgs = require('./modules/setOrgList').default;
         setOrgs();
         return true;
+    } else if (request.type === "get-organisations") {
+        const getOrgList = require('./modules/getOrgList').default;
+        getOrgList(sendResponse);
+        return true;
     }
 });
 

src/pages/Background/index.js

@@ -0,0 +1,70 @@
+import signInGoDAM from "./signInGoDAM";
+
+// GoDAM OAuth configuration
+const clientId = process.env.GODAM_OAUTH_CLIENT_ID;
+
+async function getGoDAMAuthToken() {
+    const { godamToken, godamRefreshToken, godamTokenExpiration } = await chrome.storage.local.get(["godamToken", "godamRefreshToken", "godamTokenExpiration"]);
+
+    // Token is not set, trigger sign-in
+    if (!godamToken) {
+        const newToken = await signInGoDAM();
+        return newToken
+    }
+    // Token is set, check if it has expired
+    const currentTime = Date.now();
+
+    if (currentTime < godamTokenExpiration) {
+        return godamToken
+    }
+
+    const baseUrl = process.env.GODAM_BASE_URL || 'https://app.godam.io';
+
+    try {
+        const refreshResponse = await fetch(`${baseUrl}/api/method/frappe.integrations.oauth2.get_token`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'Accept': 'application/json',
+            },
+            credentials: 'omit',
+            body: new URLSearchParams({
+                grant_type: 'authorization_code',
+                refresh_token: godamRefreshToken,
+                client_id: clientId,
+            }),
+        });
+
+        if (!refreshResponse.ok) {
+            // Refresh token failed, try to sign in again
+            const newToken = await signInGoDAM();
+            if (!newToken) {
+                throw new Error("GoDAM token refresh and sign-in failed");
+            }
+            return newToken;
+        }
+
+        const tokenData = await refreshResponse.json();
+        const newToken = tokenData.access_token;
+        const expiresIn = tokenData.expires_in || 3600;
+        const expirationTime = Date.now() + expiresIn * 1000;
+
+        // Save new token to storage
+        await chrome.storage.local.set({
+            godamToken: newToken,
+            godamRefreshToken: tokenData.refresh_token || godamRefreshToken,
+            godamTokenExpiration: expirationTime
+        })
+
+        return newToken;
+    } catch (error) {
+        // If refresh fails, try to sign in again
+        const newToken = await signInGoDAM();
+        if (!newToken) {
+            throw new Error("GoDAM token refresh and sign-in failed");
+        }
+        return newToken
+    }
+}
+
+export default getGoDAMAuthToken

src/pages/Background/modules/getGoDAMAuthToken.js

@@ -0,0 +1,11 @@
+const getOrgList = async (sendResponse) => {
+    const { orgList } = await chrome.storage.local.get(["orgList"])
+    
+    if (orgList){
+        sendResponse(JSON.parse(orgList))
+    }else{
+        sendResponse([])
+    }
+};
+
+export default getOrgList;

src/pages/Background/modules/getOrgList.js

@@ -1,144 +1,52 @@
-import signInGoDAM from "./signInGoDAM";
-
-// GoDAM OAuth configuration
-const clientId = process.env.GODAM_OAUTH_CLIENT_ID;
+import getGoDAMAuthToken from "./getGoDAMAuthToken";
 
 // Function to upload a video to GoDAM
 const saveToGoDAM = async (videoBlob, fileName, sendResponse) => {
-  // Function to get an access token from Chrome storage
-  async function getGoDAMAuthToken() {
-    return new Promise((resolve, reject) => {
-      chrome.storage.local.get(["godamToken", "godamRefreshToken", "godamTokenExpiration"], async (result) => {
-        if (chrome.runtime.lastError) {
-          reject(new Error(chrome.runtime.lastError));
-        } else {
-          const { godamToken, godamRefreshToken, godamTokenExpiration } = result;
-          
-          if (!godamToken) {
-            // Token is not set, trigger sign-in
-            const newToken = await signInGoDAM();
-            if (!newToken) {
-              // Sign-in failed, throw an error
-              reject(new Error("GoDAM sign-in failed"));
+    try {
+        const token = await getGoDAMAuthToken();
+        const formData = new FormData();
+        formData.append('file', videoBlob, fileName);
+
+        const uploadUrl = process.env.GODAM_UPLOAD_URL || 'https://upload.godam.io'; // Todo: Replace the option with production URL
+
+        const url = uploadUrl + '/upload-file';
+
+        const uploadResponse = await fetch(
+            url,
+            {
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                },
+                body: formData,
             }
-            resolve(newToken);
-          } else {
-            // Token is set, check if it has expired
-            const currentTime = Date.now();
-            if (currentTime >= godamTokenExpiration) {
-              // Token has expired, refresh it
-              const baseUrl = process.env.GODAM_BASE_URL || 'https://app.godam.io';
-                try {
-                    const refreshResponse = await fetch(`${baseUrl}/api/method/frappe.integrations.oauth2.get_token`, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/x-www-form-urlencoded',
-                            'Accept': 'application/json',
-                        },
-                        credentials: 'omit',
-                        body: new URLSearchParams({
-                            grant_type: 'authorization_code',
-                            refresh_token: godamRefreshToken,
-                            client_id: clientId,
-                        }),
-                    });
-
-                if (!refreshResponse.ok) {
-                  // Refresh token failed, try to sign in again
-                  const newToken = await signInGoDAM();
-                  if (!newToken) {
-                    reject(new Error("GoDAM token refresh and sign-in failed"));
-                  }
-                  resolve(newToken);
-                  return;
-                }
-
-                const tokenData = await refreshResponse.json();
-                const newToken = tokenData.access_token;
-                const expiresIn = tokenData.expires_in || 3600;
-                const expirationTime = Date.now() + expiresIn * 1000;
+        );
 
-                // Save new token to storage
-                await new Promise((resolve) =>
-                  chrome.storage.local.set({ 
-                    godamToken: newToken,
-                    godamRefreshToken: tokenData.refresh_token || godamRefreshToken,
-                    godamTokenExpiration: expirationTime
-                  }, () => resolve())
-                );
-
-                resolve(newToken);
-              } catch (error) {
-                // If refresh fails, try to sign in again
-                const newToken = await signInGoDAM();
-                if (!newToken) {
-                  reject(new Error("GoDAM token refresh and sign-in failed"));
-                }
-                resolve(newToken);
-              }
+        let message = 'An error occurred while saving to GoDAM!';
+        if (!uploadResponse.ok) {
+            // error message
+            if (uploadResponse.status === 400) {
+                message = 'An error occurred while saving to GoDAM! <br> Looks like you are not logged in to GoDAM. Please log in again.';
             } else {
-              // Token is still valid
-              resolve(godamToken);
+                message = 'An error occurred while saving to GoDAM! <br> Please try again later, if the problem persists, please contact <a href="https://app.godam.io/helpdesk/my-tickets" target="blank">support team</a>.';
             }
-          }
+            throw new Error(message);
         }
-      });
-    });
-  }
-
-  return new Promise(async (resolve, reject) => {
-    try {
-      // Get the access token from Chrome storage
-      let token = await getGoDAMAuthToken();
 
-      if (!token) {
-        throw new Error("GoDAM sign-in failed");
-      }
-      
-      const formData = new FormData();
-      formData.append('file', videoBlob, fileName);
+        const responseData = await uploadResponse.json();
+        const videoName = responseData?.file_informations?.name;
 
-      const uploadUrl =  process.env.GODAM_UPLOAD_URL || 'https://upload.godam.io'; // Todo: Replace the option with production URL
+        const baseURL = process.env.GODAM_BASE_URL || 'https://app.godam.io';
 
-      const url = uploadUrl + '/upload-file';
+        sendResponse({ status: "ok", url: `${baseURL}/web/video/${videoName}` });
 
-      const uploadResponse = await fetch(
-        url,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-          body: formData,
-        }
-      );
+    } catch (error) {
+        sendResponse({ status: "error", url: null, message: error.message });
 
-      let message = 'An error occurred while saving to GoDAM!';
-      if (!uploadResponse.ok) {
-        // error message
-        if (uploadResponse.status === 400) {
-          message = 'An error occurred while saving to GoDAM! <br> Looks like you are not logged in to GoDAM. Please log in again.';
-        } else {
-          message = 'An error occurred while saving to GoDAM! <br> Please try again later, if the problem persists, please contact <a href="https://app.godam.io/helpdesk/my-tickets" target="blank">support team</a>.';
-        }
-        throw new Error(message);
-      }
+    }
 
-      const responseData = await uploadResponse.json();
-      const filename = responseData.filename;
-      const location = responseData.location;
-      const videoName = responseData?.file_informations?.name;
 
-      const baseURL = process.env.GODAM_BASE_URL || 'https://app.godam.io';
-    
-      sendResponse({ status: "ok", url: `${baseURL}/web/video/${videoName}` }); 
 
-      resolve(`${baseURL}/${location}`);
-    } catch (error) {
-      sendResponse({ status: "error", url: null, message: error.message });
-      reject(error);
-    }
-  });
 };
 
 export default saveToGoDAM;