Merge pull request #8 from ONLYOFFICE/develop

Release/11.0

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 11.0
+## Changed
+- manifest v3
+- change logout route for personal as appserver
+
 ## 10.1
 ## Changed
 - removed unnecessary permission

Source/js/background.js → Source/background.js

@@ -1,3 +1,5 @@
+importScripts('js/constants.js', 'js/files.js');
+
 chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
  if (request.recent && request.recent[0] == "[") {
  try {
@@ -8,7 +10,7 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
  }
 });
 
-chrome.extension.onConnect.addListener(function (port) {
+chrome.runtime.onConnect.addListener(function (port) {
  let isConnected = true;
  port.onMessage.addListener(function (msg) {
  if (msg.function && msg.args) {
@@ -30,9 +32,6 @@ chrome.extension.onConnect.addListener(function (port) {
 
 var settings = null;
 
-var platformOS;
-chrome.runtime.getPlatformInfo((p) => { platformOS = p; });
-
 function getSettings(callback) {
  callback(settings);
 }
@@ -61,7 +60,14 @@ chrome.storage.sync.get(["settings"], (result) => {
 var recent = null;
 
 function getRecent(callback) {
- callback(recent);
+ let promise = getRecentFiles(settings.protocol + ":https://" + settings.domain);
+ promise
+ .then((json) => {
+ callback(json.files);
+ })
+ .catch(() => {
+ callback(recent);
+ });
 }
 
 var currentUpload = null;

Source/js/auth.js

@@ -18,7 +18,7 @@ function checkAuth(host) {
 
 function logOut(host) {
  return new Promise((res, rej) => {
- fetch(host + "/auth.aspx?t=logout")
+ fetch(host + "/api/2.0/authentication/logout", {method: "POST"})
  .then((json) => {
  res(true);
  })

Source/js/constants.js

@@ -25,6 +25,10 @@ var uploadableFiles = {
  "odp": "application/vnd.oasis.opendocument.presentation"
 };
 
+var documentExts = ["doc", "docx", "docm", "dot", "dotx", "dotm", "odt", "fodt", "ott", "rtf", "txt", "html", "htm", "mht", "xml", "pdf", "djvu", "fb2", "epub", "xps", "oxps"];
+var slideExts = ["pps", "ppsx", "ppsm", "ppt", "pptx", "pptm", "pot", "potx", "potm", "odp", "fodp", "otp"];
+var cellExts = ["xls", "xlsx", "xlsm", "xlt", "xltx", "xltm", "ods", "fods", "ots", "csv"];
+
 function timeoutPromise(ms, promise) {
  return new Promise((res, rej) => {
  setTimeout(() => {

Source/js/files.js

@@ -24,9 +24,14 @@ function createFile(host, title) {
  });
 }
 
-function uploadFile(host, file) {
- var formData = new FormData();
- formData.append("file", file, file.name);
+function uploadFile(host, fileInfo) {
+ let array = [];
+ for (let bit in fileInfo.file) array.push(fileInfo.file[bit]);
+ let formData = new FormData();
+
+ let buffer = new Uint8Array(array);
+ let blob = new Blob([buffer], {type: fileInfo.fileType});
+ formData.append("file", blob, fileInfo.fileName);
 
  return new Promise((res, rej) => {
  fetch(host + "/api/2.0/files/@my/upload", {
@@ -44,4 +49,22 @@ function uploadFile(host, file) {
  rej(err);
  });
  });
-}
+}
+
+function getRecentFiles(host) {
+ return new Promise((res, rej) => {
+ fetch(host + `/api/2.0/files/@recent?filterType=FilesOnly`, {
+ method: "get"
+ })
+ .then((response) => {
+ if (!response.ok) rej(response.statusText);
+ return response.json();
+ })
+ .then((json) => {
+ res(json.response);
+ })
+ .catch((err) => {
+ rej(err);
+ });
+ })
+}

Source/js/inject.js

@@ -1,4 +0,0 @@
-(function () {
- var recent = localStorage.getItem("TeamLabRecentDocuments");
- chrome.runtime.sendMessage({ recent: recent });
-})();

Source/js/main.js

@@ -36,16 +36,18 @@ window.onload = function () {
  onGetSettings: onGetSettings
  };
 
- let background = chrome.extension.connect();
+ let background = chrome.runtime.connect();
  background.onMessage.addListener(function (msg) {
  if (msg.function) {
  callbacks[msg.function].apply(this, msg.args);
  }
  });
 
- if (chrome.extension.getBackgroundPage().platformOS.os == chrome.runtime.PlatformOs.LINUX) {
- uploadCont.classList.add(displayNoneClass);
- }
+ chrome.runtime.getPlatformInfo((p) => {
+ if (p.os == chrome.runtime.PlatformOs.LINUX) {
+ uploadCont.classList.add(displayNoneClass);
+ }
+ });
 
  function fillHtml() {
  background.postMessage({
@@ -85,7 +87,11 @@ window.onload = function () {
  }
 
  function handleFile(file) {
- chrome.extension.getBackgroundPage().startUpload(file, uploadingProgress);
+ background.postMessage({
+ function: "startUpload",
+ callback: "uploadingProgress",
+ args: [file]
+ });
  }
 
  function uploadingProgress(obj) {
@@ -147,7 +153,7 @@ window.onload = function () {
  switcher.onclick = switcherFunc;
  overlay.onclick = switcherFunc;
 
- uploadInput.onchange = (e) => {
+ uploadInput.onchange = async (e) => {
  if (e.target.files.length != 1) {
  ShowError(chrome.i18n.getMessage("errorFilesCount"));
  e.target.value = "";
@@ -170,8 +176,16 @@ window.onload = function () {
  return;
  }
 
- handleFile(file);
- e.target.value = "";
+ let buffer = await file.arrayBuffer();
+ let uintArray = new Uint8Array(buffer);
+ let obj = {
+ fileType: file.type,
+ fileName: file.name,
+ file: uintArray
+
+ };
+ handleFile(obj);
+ if (e.target !== null) e.target.value = "";
 
  uploadBtn.classList.add(displayNoneClass);
  uploadProgress.classList.remove(displayNoneClass);
@@ -203,6 +217,18 @@ window.onload = function () {
  return 0 <= posExt ? filename.substring(posExt + 1).trim().toLowerCase() : "";
  }
 
+ function getIconByExt(ext) {
+ if (documentExts.includes(ext)) {
+ return "text";
+ }
+ else if (cellExts.includes(ext)) {
+ return "spreadsheet";
+ }
+ else if (slideExts.includes(ext)) {
+ return "presentation";
+ }
+ }
+
  function onGetRecent(result) {
  recentFiles = result || [];
 
@@ -212,19 +238,19 @@ window.onload = function () {
 
  for (let i = 0; i < count; i++) {
  let file = recentFiles[i];
- if (!file.title || !file.url) continue;
+ if (!file.title || !file.webUrl) continue;
 
  let a = document.createElement("a");
  a.innerText = file.title;
- let ext = file.fileType || getExt(file.title);
+ let ext = getExt(file.title);
  if (ext) {
  let span = document.createElement("span");
- span.className = "ext-img " + ext;
+ span.className = "ext-img " + getIconByExt(ext);
  a.prepend(span);
  }
 
  a.onclick = () => {
- chrome.tabs.create({ url: file.url });
+ chrome.tabs.create({ url: file.webUrl });
  }
 
  recentFilesMenu.append(a);

Source/manifest.json

@@ -1,7 +1,7 @@
 {
- "manifest_version": 2,
+ "manifest_version": 3,
  "name": "__MSG_appName__",
- "version": "10.1",
+ "version": "11.0",
  "description": "__MSG_appDesc__",
  "default_locale": "en",
  "short_name": "ONLYOFFICE",
@@ -10,7 +10,7 @@
  "48": "icon_48.png",
  "128": "icon_128.png"
  },
- "browser_action": {
+ "action": {
  "default_icon": {
  "16": "icon_16.png",
  "24": "icon_24.png",
@@ -20,18 +20,18 @@
  "default_title": "__MSG_appName__"
  },
  "background": {
- "scripts": [ "js/constants.js", "js/files.js", "js/background.js" ]
+ "service_worker": "background.js"
  },
  "content_scripts": [{
  "matches": [ "https://*/favicon.ico", "https://*/favicon.ico" ],
  "all_frames": true,
  "js": [ "js/inject.js" ]
  }],
  "permissions": [
- "storage",
- "https://personal.onlyoffice.com/"
+ "storage"
  ],
- "optional_permissions": [
+ "host_permissions": [
+ "https://personal.onlyoffice.com/",
  "https://*/",
  "https://*/"
  ]