Merge pull request #445 from Authenticator-Extension/eslint

Eslint

Author: mymindstorm

.eslintignore

@@ -0,0 +1,9 @@
+node_modules
+dist
+firefox
+chrome
+scripts
+webpack.config.js
+webpack.prod.js
+src/test
+src/models/credentials.ts

.eslintrc.js

@@ -0,0 +1,23 @@
+module.exports = {
+  root: true,
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+       "ecmaVersion": 6
+  },
+  plugins: [
+    '@typescript-eslint',
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+  ],
+  env: {
+    "amd": true,
+    "node": true  
+  },
+  rules: {
+    "@typescript-eslint/no-use-before-define": "off",
+    "@typescript-eslint/explicit-function-return-type": "off"
+  }
+};

package-lock.json

@@ -24,17 +24,20 @@
     "@types/chrome": "^0.0.86",
     "@types/crypto-js": "^3.1.43",
     "@types/uuid": "^3.4.5",
+    "@typescript-eslint/eslint-plugin": "^2.23.0",
+    "@typescript-eslint/parser": "^2.23.0",
     "base64-loader": "^1.0.0",
-    "fork-ts-checker-webpack-plugin": "^1.3.5",
+    "eslint": "^6.8.0",
+    "fork-ts-checker-webpack-plugin": "^4.1.1",
     "prettier": "1.18.2",
-    "sass": "^1.21.0",
+    "sass": "^1.26.3",
     "ts-loader": "^6.0.2",
     "typescript": "^3.5.1",
     "url-loader": "^2.0.1",
     "vue-loader": "^15.7.0",
     "vue-svg-loader": "^0.12.0",
     "vue-template-compiler": "^2.6.10",
-    "webpack": "^4.38.0",
+    "webpack": "^4.42.1",
     "webpack-cli": "^3.3.3",
     "webpack-merge": "^4.2.1"
   },

package.json

@@ -21,12 +21,15 @@ fi
 echo "Removing old build files..."
 rm -rf build dist
 rm -rf firefox chrome release
-if ./node_modules/prettier/bin-prettier.js --check $STYLEFILES 1> /dev/null ; then
+echo "Checking style..."
+if ./node_modules/.bin/prettier --check $STYLEFILES 1> /dev/null ; then
     true
 else
-    ./node_modules/prettier/bin-prettier.js --check $STYLEFILES --write
+    ./node_modules/.bin/prettier --check $STYLEFILES --write
 fi
 
+./node_modules/.bin/eslint . --ext .js,.ts
+
 if ! [[ $CREDS =~ $CREDREGEX ]] ; then
     if [[ $PLATFORM = "prod" ]]; then
         echo -e "\e[7m\033[33mError: Missing info in credentials.ts\033[0m"

scripts/build.sh

@@ -10,13 +10,13 @@ window.addEventListener("message", event => {
 
   switch (message.action) {
     case "hash":
-      argon.hash(message.value).then(hash => {
+      Argon.hash(message.value).then(hash => {
         source.postMessage({ response: hash }, event.origin);
       });
       break;
 
     case "verify":
-      argon.compareHash(message.hash, message.value).then(result => {
+      Argon.compareHash(message.hash, message.value).then(result => {
         source.postMessage({ response: result }, event.origin);
       });
       break;
@@ -27,7 +27,7 @@ window.addEventListener("message", event => {
   return;
 });
 
-class argon {
+class Argon {
   static async hash(value: string) {
     const salt = window.crypto.getRandomValues(new Uint8Array(16));
     const hash = await argon2.hash({

src/argon.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 // @ts-ignore
 import QRCode from "qrcode-reader";
 
@@ -157,8 +158,8 @@ async function getTotp(text: string) {
           }
           issuer = issuer.replace(/\+/g, " ");
         } else if (parameter[0].toLowerCase() === "counter") {
-          let counter = Number(parameter[1]);
-          counter = isNaN(counter) || counter < 0 ? 0 : counter;
+          // let counter = Number(parameter[1]);
+          // counter = isNaN(counter) || counter < 0 ? 0 : counter;
         } else if (parameter[0].toLowerCase() === "period") {
           period = Number(parameter[1]);
           period =
@@ -426,18 +427,15 @@ async function uploadBackup(service: string) {
 
   switch (service) {
     case "dropbox":
-      const dbox = new Dropbox();
-      await dbox.upload(encryption);
+      await new Dropbox().upload(encryption);
       break;
 
     case "drive":
-      const drive = new Drive();
-      await drive.upload(encryption);
+      await new Drive().upload(encryption);
       break;
 
     case "onedrive":
-      const onedrive = new OneDrive();
-      await onedrive.upload(encryption);
+      await new OneDrive().upload(encryption);
       break;
 
     default:

src/background.ts

@@ -59,7 +59,7 @@ export default Vue.extend({
   }
 });
 
-function shouldShowPassphrase(entries: IOTPEntry[]) {
+function shouldShowPassphrase(entries: OTPEntryInterface[]) {
   for (const entry of entries) {
     if (!entry.secret) {
       return true;

src/components/Import.vue

@@ -68,7 +68,7 @@ export default Vue.extend({
         this.$store.commit("menu/setHighContrast", useHighContrast);
       }
     },
-    encryption(): IEncryption {
+    encryption(): EncryptionInterface {
       return this.$store.state.accounts.encryption;
     },
     enforceAutolock() {

src/components/Popup/PrefrencesPage.vue

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
 // @ts-ignore
 import scanGIF from "../images/scan.gif";
 
@@ -26,7 +27,7 @@ if (!document.getElementById("__ga_grayLayout__")) {
       case "pastecode":
         pasteCode(message.code);
         break;
-      case "stopCapture":
+      case "stopCapture": {
         const captureBox = document.getElementById("__ga_captureBox__");
         if (captureBox) {
           captureBox.style.display = "none";
@@ -37,6 +38,7 @@ if (!document.getElementById("__ga_grayLayout__")) {
           grayLayout.style.display = "none";
         }
         break;
+      }
       default:
         // invalid command, ignore it
         break;