Now supports snap

Bumps [electron](https://github.com/electron/electron) from 18.2.2 to 18.2.3.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](https://github.com/electron/electron/compare/v18.2.2...v18.2.3)

---
updated-dependencies:
- dependency-name: electron
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 17
+          node-version: 18
 
       - name: Build and release with electron-builder
         run: |

.gitignore

@@ -1,3 +1,5 @@
 /node_modules/
 /.idea/
 /release/
+.DS_Store
+/assets/generated

README.md

@@ -49,9 +49,9 @@
 
 As we know that Microsoft Office is a paid service, they also have a free Web version [here](https://office.com).
 
-For those people who can't afford Microsoft Office Subscription, or don't want to pay for that, or like the web version of it, Then **MS Office - Electron** is the app you require.
+For those people who can't afford Microsoft Office Subscription, or don't want to pay for that, or like the web version of it, Then **MS-Office-Electron** is the app you require.
 
-**MS Office - Electron** is the app in which the Web Version of Microsoft Office is wrapped into a Cross-Platform App with Electron. And all the Services of Microsoft Office will work for free.
+**MS-Office-Electron** is the app in which the Web Version of Microsoft Office is wrapped into a Cross-Platform App with Electron. And all the Services of Microsoft Office will work for free.
 
 Note - Windows Hello or Sign in with Security key is not currently supported and will show you an error. You will have to manually sign in with your E-Mail and Password.
 
@@ -66,7 +66,7 @@ Supported Platforms
 5. All Distributions supporting AppImage (AppImage File)
 
 Arch Linux builds are now on AUR!<br>
-Mac OS supported now with builds for both M1 And Intel Chips . See the instructions how to install below<br>
+Mac OS is supported now! See the instructions how to install below<br>
 
 # Windows
 
@@ -89,7 +89,7 @@ For Installing this app on Windows :-
 For Installing this app on Mac :-
 
 1. Just go to the [Releases](https://github.com/agam778/MS-Office-Electron/releases) page
-2. Scroll down and click the `.dmg` file. The build with no architecture written is for Intel Macs (Will fix it soon) and the build with arm64 written in it is for M1 Macs. Download the build according to your Mac.
+2. Scroll down and click the `.dmg` file. The build is only for Intel Macs.
 3. After it downloads, click on the file and mount it on your system. Now drag my app to the Applications Folder (There will be a shortcut in the opened window too) and your app will be installed. Open from Launchpad and enjoy.
 
 # Linux
@@ -140,7 +140,7 @@ If you find any issues in using the AUR Builds, please create a [New Issue](http
 To build the app locally:<br>
 Run this script to automatically install `nodejs`, `yarn` and all the dependencies, and automatically start/build the app (it will show options) (Note: for Linux and macOS Only!):
 ```bash
-git clone --depth=1 https://github.com/agam778/MS-Office-Electron.git
+git clone https://github.com/agam778/MS-Office-Electron.git
 cd MS-Office-Electron
 bash build.sh
 ```
@@ -155,16 +155,18 @@ yarn install
 ```
 ```bash
 $ yarn run
-yarn run v1.22.17
-info Commands available from binary scripts: asar, dircompare, ejs, electron, electron-builder, electron-osx-flat, electron-osx-sign, extract-zip, install-app-deps, is-ci, jake, js-yaml, json5, mime, mkdirp, node-which, rc, rimraf, semver
+yarn run v1.22.18
+info Commands available from binary scripts: asar, dircompare, ejs, electron, electron-builder, electron-icon-maker, electron-osx-flat, electron-osx-sign, extract-zip, icon-gen, install-app-deps, is-ci, jake, js-yaml, json5, mime, mkdirp, phantomjs, pixelmatch, rc, resolve, rimraf, semver, sshpk-conv, sshpk-sign, sshpk-verify, svg2png, uuid, which
 info Project commands
    - dist
-      electron-builder
+      yarn genicon && electron-builder
+   - genicon
+      rm -rf ./assets/generated && electron-icon-maker --input=assets/icon.png --output=assets/generated
    - pack
-      electron-builder --dir
+      yarn genicon && electron-builder --dir
    - start
       electron .
-question Which command would you like to run?:
+question Which command would you like to run?: 
 ```
 
 To start the app, run `yarn start`<br>
@@ -172,4 +174,4 @@ To build the app, run `yarn dist`
 
 # 📃 MIT License
 
-#### *Disclaimer: Not affiliated with Microsoft. Office, the name, website, images/icons are the intellectual properties of Microsoft.*
+#### *Disclaimer: Not affiliated with Microsoft. Office, the name, website, images/icons are the intellectual properties of Microsoft.*

build.sh

@@ -8,6 +8,7 @@ if ! [ -x "$(command -v node)" ]; then
             if [ -f /etc/debian_version ]; then
                 curl -fsSL https://deb.nodesource.com/setup_17.x | sudo -E bash -
                 sudo apt-get install -y nodejs
+                sudo apt-get install rpm -y # for rpm build.
                 elif [ -f /etc/redhat-release ]; then
                 sudo yum install nodejs
                 elif [ -f /etc/arch-release ]; then
@@ -167,10 +168,11 @@ else
 fi
 
 clear
-echo 'Do you want to run the app or build the app?'
-echo '1. Run the app'
+echo 'What do you want to do?'
+echo '1. Run the app without building'
 echo '2. Build the app'
-echo '3. Exit'
+echo '3. Build and install the app'
+echo '4. Exit'
 echo 'Enter your choice:'; read choice;
 if [ "$choice" -eq "1" ]; then
     echo 'Running the app...'
@@ -191,6 +193,29 @@ if [ "$choice" -eq "1" ]; then
         fi
     fi
     elif [ "$choice" -eq "3" ]; then
+    echo 'Building and installing the app...'
+    if ! [ -f /etc/debian_version ]; then
+        echo 'Error: "Build and install the app" option is only supported on Debian-based systems for now.' >&2
+        exit 0
+    fi
+    if [ "$(id -u)" != "0" ]; then
+        if [ "$(uname -m)" == "arm64" ]; then
+            sudo yarn dist --arm64
+            sudo apt install -y -f ./release/MS-Office-Electron*.deb
+            elif [ "$(uname -m)" == "x86_64" ]; then
+            sudo yarn dist --x64
+            sudo apt install -y -f ./release/MS-Office-Electron*.deb
+        fi
+    else
+        if [ "$(uname -m)" == "arm64" ]; then
+            yarn dist --arm64
+            apt install -y -f ./release/MS-Office-Electron*.deb
+            elif [ "$(uname -m)" == "x86_64" ]; then
+            yarn dist --x64
+            apt install -y -f ./release/MS-Office-Electron*.deb
+        fi
+    fi
+    elif [ "$choice" -eq "4" ]; then
     echo 'Exiting...'
     exit 1
 fi

docs/index.html

@@ -6,7 +6,7 @@
 -->
 <html>
   <head>
-    <title>MS Office - Electron</title>
+    <title>MS-Office-Electron</title>
     <meta charset="utf-8" />
     <meta
       name="viewport"
@@ -22,7 +22,7 @@
           ><img src="images/logo.png" alt=""
         /></a>
         <h1>
-          <strong>MS Office - Electron</strong><br />
+          <strong>MS-Office-Electron</strong><br />
           Free Office Online Desktop Client
         </h1>
       </div>
@@ -46,7 +46,7 @@
             height="auto"
             class="floatright"
           />
-          MS Office - Electron is an app in which the Web Version of MS Office
+          MS-Office-Electron is an app in which the Web Version of MS Office
           is wrapped into a Cross-Platform App with Electron. And all the
           Services of Microsoft Office will work for free. It is available for
           Windows, Mac OS, and Linux! If you like the project, do not forget to

docs/loading/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Loading MS Office - Electron</title>
+    <title>Loading MS-Office-Electron</title>
     <link
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css"
@@ -15,7 +15,7 @@
 
     <div class="logo">
       <a href="https://github.com/agam778/MS-Office-Electron" target="_blank"
-        ><img src="./MSlogo.svg" alt="MS Office - Electron"
+        ><img src="./MSlogo.svg" alt="MS-Office-Electron"
       /></a>
     </div>
   </body>

main.js

@@ -14,9 +14,18 @@ const RPC = require("discord-rpc");
 const clientId = "942637872530460742";
 const rpc = new RPC.Client({ transport: "ipc" });
 
+const windowsuseragent =
+  "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36";
+const macuseragent =
+  "Mozilla/5.0 (Macintosh; Intel Mac OS X 12_3_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36";
+const linuxuseragent =
+  "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/101.0.4951.54 Safari/537.36";
+
 const log = require("electron-log");
 log.transports.file.level = "verbose";
 console.log = log.log;
+Object.assign(console, log.functions);
+require("electron-log");
 
 ElectronDl({
   dlPath: "./downloads",
@@ -102,12 +111,12 @@ const menulayout = [
     label: "Application",
     submenu: [
       {
-        label: "About MS Office - Electron",
+        label: "About MS-Office-Electron",
         click: () =>
           openAboutWindow({
             icon_path:
-              "https://raw.githubusercontent.com/agam778/MS-Office-Electron/main/assets/icons/icon.png",
-            product_name: "MS Office - Electron",
+              "https://raw.githubusercontent.com/agam778/MS-Office-Electron/main/assets/icon.png",
+            product_name: "MS-Office-Electron",
             copyright:
               "Copyright (c) 2022 Agampreet Singh\nOffice, the name, website, images/icons\nare the intellectual properties of Microsoft.",
             package_json_dir: __dirname,
@@ -169,24 +178,53 @@ const menulayout = [
             await shell.openPath(
               "C:\\Users\\" +
                 process.env.USERNAME +
-                "\\AppData\\Roaming\\ms-office-electron\\\\logs\\"
+                "\\AppData\\Roaming\\ms-office-electron\\logs\\"
             );
           } else if (process.platform === "darwin") {
             await shell.openPath(
-              "/Users/" +
-                process.env.USERNAME +
-                "/Library/Logs/ms-office-electron/"
+              "/Users/" + process.env.USER + "/Library/Logs/ms-office-electron/"
             );
           } else if (process.platform === "linux") {
             await shell.openPath(
-              "/home/" +
-                process.env.USERNAME +
-                "/.config/ms-office-electron/logs"
+              "/home/" + process.env.USER + "/.config/ms-office-electron/logs/"
             );
           }
         },
       },
       { type: "separator" },
+      {
+        label: "Open Normal version of MS Office",
+        type: "radio",
+        click() {
+          store.set("enterprise-or-normal", "https://office.com/?auth=1");
+          dialog.showMessageBoxSync({
+            type: "info",
+            title: "Normal version of MS Office",
+            message:
+              "The normal version of MS Office will be opened.\n\nPlease restart the app to apply the changes.",
+            buttons: ["OK"],
+          });
+        },
+        checked:
+          store.get("enterprise-or-normal") === "https://office.com/?auth=1",
+      },
+      {
+        label: "Open Enterprise version of MS Office",
+        type: "radio",
+        click() {
+          store.set("enterprise-or-normal", "https://office.com/?auth=2");
+          dialog.showMessageBoxSync({
+            type: "info",
+            title: "Enterprise version of MS Office",
+            message:
+              "The enterprise version of MS Office will be opened.\n\nPlease restart the app to apply the changes.",
+            buttons: ["OK"],
+          });
+        },
+        checked:
+          store.get("enterprise-or-normal") === "https://office.com/?auth=2",
+      },
+      { type: "separator" },
       {
         label: "Open Websites in New Windows (Recommended)",
         type: "radio",
@@ -213,7 +251,7 @@ const menulayout = [
             type: "info",
             title: "Websites in New Windows",
             message:
-              "Websites which are targeted to open in new tabs will now open in the same window.",
+              "Websites which are targeted to open in new tabs will now open in the same window.\n\nNote: This will be buggy in some cases if you are using Enterprise version of MS Office.",
             buttons: ["OK"],
           });
         },
@@ -259,6 +297,53 @@ const menulayout = [
           : false,
       },
       { type: "separator" },
+      {
+        label: "Windows Useragent",
+        type: "radio",
+        click: () => {
+          store.set("useragentstring", windowsuseragent);
+          dialog.showMessageBoxSync({
+            type: "info",
+            title: "User agent switcher",
+            message:
+              "You have switched to Windows Useragent.\n\nPlease restart the app to apply the changes.",
+            buttons: ["OK"],
+          });
+        },
+        checked:
+          store.get("useragentstring") === windowsuseragent ? true : false,
+      },
+      {
+        label: "Mac os Useragent",
+        type: "radio",
+        click: () => {
+          store.set("useragentstring", macuseragent);
+          dialog.showMessageBoxSync({
+            type: "info",
+            title: "User agent switcher",
+            message:
+              "You have switched to Mac OS Useragent.\n\nPlease restart the app to apply the changes.",
+            buttons: ["OK"],
+          });
+        },
+        checked: store.get("useragentstring") === macuseragent ? true : false,
+      },
+      {
+        label: "Linux Useragent",
+        type: "radio",
+        click: () => {
+          store.set("useragentstring", linuxuseragent);
+          dialog.showMessageBoxSync({
+            type: "info",
+            title: "User agent switcher",
+            message:
+              "You have switched to Linux Useragent.\n\nPlease restart the app to apply the changes.",
+            buttons: ["OK"],
+          });
+        },
+        checked: store.get("useragentstring") === linuxuseragent ? true : false,
+      },
+      { type: "separator" },
       {
         role: "quit",
         accelerator: process.platform === "darwin" ? "Ctrl+Q" : "Ctrl+Q",
@@ -290,7 +375,7 @@ const menulayout = [
         label: "Home",
         click: () => {
           BrowserWindow.getFocusedWindow().loadURL(
-            "https://www.office.com/?auth=1"
+            `${store.get("enterprise-or-normal")}`
           );
         },
       },
@@ -398,8 +483,6 @@ function discordrpc(title) {
       .catch((err) => {
         console.log(err);
       });
-  } else {
-    // don't do anything
   }
 }
 
@@ -422,11 +505,11 @@ function createWindow() {
   const win = new BrowserWindow({
     width: 1181,
     height: 670,
-    icon: path.join(__dirname, "/assets/icons/icon.png"),
+    icon: path.join(__dirname, "/assets/generated/icons/png/1024x1024.png"),
     show: false,
     webPreferences: {
       nodeIntegration: true,
-      devTools: false,
+      devTools: true,
     },
   });
 
@@ -442,14 +525,16 @@ function createWindow() {
     transparent: true,
     frame: false,
     alwaysOnTop: true,
-    icon: path.join(__dirname, "/assets/icons/icon.png"),
+    icon: path.join(__dirname, "/assets/generated/icons/png/1024x1024.png"),
   });
 
   splash.loadURL(`https://agam778.github.io/MS-Office-Electron/loading`);
-  win.loadURL("https://www.office.com/?auth=1", {
-    userAgent:
-      "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36",
-  });
+  win.loadURL(
+    `${store.get("enterprise-or-normal") || "https://office.com/?auth=1"}`,
+    {
+      userAgent: store.get("useragentstring") || windowsuseragent,
+    }
+  );
 
   win.webContents.on("did-finish-load", () => {
     splash.destroy();
@@ -506,5 +591,11 @@ app.on("ready", function () {
     }
   });
   autoUpdater.checkForUpdatesAndNotify();
-  rpc.login({ clientId }).catch((err) => console.error(err));
+  rpc
+    .login({ clientId })
+    .catch((err) =>
+      console.error(
+        "Oops! An Error occured while connecting to Discord RPC. Probably discord isn't installed or opened?"
+      )
+    );
 });

package.json

@@ -1,12 +1,17 @@
 {
   "name": "ms-office-electron",
-  "version": "0.5.2",
+  "version": "0.7.1",
   "description": "An Unofficial Microsoft Office Online Desktop Client. Free of Cost.",
   "main": "main.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/agam778/MS-Office-Electron.git"
   },
+  "author": {
+    "name": "Agampreet Singh",
+    "email": "agam778@zohomail.in",
+    "url": "https://agamsblog.xyz/"
+  },
   "build": {
     "extraFiles": [
       "/assets",
@@ -15,34 +20,19 @@
     "appId": "com.agampreet.ms-office-electron",
     "productName": "MS-Office-Electron",
     "artifactName": "MS-Office-Electron-Setup-v${version}-${os}-${arch}.${ext}",
-    "linux": {
-      "category": "Office",
-      "desktop": {
-        "Comment": "An Unofficial Microsoft Office Online Desktop Client. Free of Cost.",
-        "Name": "MS-Office-Electron",
-        "StartupNotify": "true",
-        "Terminal": "false",
-        "Type": "Application",
-        "Categories": "Office;"
-      },
-      "icon": "./assets/icons/icon.png",
-      "executableName": "MS-Office-Electron",
-      "maintainer": "Agampreet Singh <agam778@zohomail.in>",
-      "target": [
-        "deb",
-        "rpm",
-        "AppImage"
-      ]
-    },
-    "deb": {
-      "compression": "bzip2"
-    },
     "mac": {
+      "identity": "null",
       "category": "public.app-category.office",
       "target": [
         "dmg"
       ],
-      "icon": "./assets/icons/icon.icns"
+      "icon": "./assets/generated/icons/mac/icon.icns"
+    },
+    "win": {
+      "target": [
+        "nsis"
+      ],
+      "icon": "./assets/generated/icons/win/icon.ico"
     },
     "nsis": {
       "oneClick": false,
@@ -50,11 +40,17 @@
       "allowToChangeInstallationDirectory": false,
       "license": "LICENSE"
     },
-    "win": {
+    "linux": {
+      "category": "Office",
+      "icon": "./assets/generated/icons/png",
+      "executableName": "ms-office-electron",
+      "maintainer": "Agampreet Singh <agam778@zohomail.in>",
       "target": [
-        "nsis"
-      ],
-      "icon": "./assets/icons/icon.ico"
+        "snap",
+        "deb",
+        "rpm",
+        "AppImage"
+      ]
     },
     "directories": {
       "output": "release"
@@ -62,28 +58,25 @@
   },
   "scripts": {
     "start": "electron .",
-    "pack": "electron-builder --dir",
-    "dist": "electron-builder"
-  },
-  "author": {
-    "name": "Agampreet Singh",
-    "email": "agam778@zohomail.in",
-    "url": "https://agam778.is-a.dev/"
+    "genicon": "rm -rf ./assets/generated && electron-icon-maker --input=assets/icon.png --output=assets/generated",
+    "pack": "yarn genicon && electron-builder --dir -c.snap.publish=github",
+    "dist": "yarn genicon && electron-builder -c.snap.publish=github"
   },
   "license": "MIT",
   "devDependencies": {
-    "electron": "^17.0.0",
-    "electron-builder": "^22.14.5"
+    "electron": "^18.2.3",
+    "electron-builder": "^23.0.3"
   },
   "dependencies": {
     "about-window": "^1.15.2",
-    "axios": "^0.25.0",
+    "axios": "^0.27.2",
     "discord-rpc": "^4.0.1",
     "electron-context-menu": "^3.1.1",
-    "electron-dl": "^3.3.0",
-    "electron-log": "^4.4.5",
+    "electron-dl": "^3.3.1",
+    "electron-icon-maker": "0.0.5",
+    "electron-log": "^4.4.7",
     "electron-store": "^8.0.1",
-    "electron-updater": "^4.6.1",
+    "electron-updater": "^5.0.1",
     "is-online": "^9.0.1"
   }
 }