From 1083863354bc3e98e02856a66847247e35929373 Mon Sep 17 00:00:00 2001
From: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date: Tue, 9 Nov 2021 12:19:05 +0100
Subject: [PATCH] Upgrade linting to 2.0.0-0 (#3280)

* Upgrade linting to 2.0.0-0

* Adjust so we can pass without error

* Fix linting

* Update header-blacklist.js

* Update index.js

* Update Uppy.js

* Update Components.js

* Update StatusBar.js

* Update Assembly.js

* Upgrade to linting 2.0.0 (final release)
---
 src/companion.js                      | 2 +-
 src/server/Uploader.js                | 2 +-
 src/server/controllers/s3.js          | 2 +-
 src/server/header-blacklist.js        | 3 +--
 src/server/helpers/request.js         | 2 +-
 src/server/provider/drive/index.js    | 2 +-
 src/server/provider/unsplash/index.js | 3 +--
 src/server/s3-client.js               | 2 +-
 src/standalone/index.js               | 2 +-
 9 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/companion.js b/src/companion.js
index 302b453116..6dc790cfa4 100644
--- a/src/companion.js
+++ b/src/companion.js
@@ -237,7 +237,7 @@ const validateConfig = (companionOptions) => {
     fs.accessSync(`${companionOptions.filePath}`, fs.R_OK | fs.W_OK) // eslint-disable-line no-bitwise
   } catch (err) {
     throw new Error(
-      `No access to "${companionOptions.filePath}". Please ensure the directory exists and with read/write permissions.`
+      `No access to "${companionOptions.filePath}". Please ensure the directory exists and with read/write permissions.`,
     )
   }
 
diff --git a/src/server/Uploader.js b/src/server/Uploader.js
index a5266dc446..259b752dad 100644
--- a/src/server/Uploader.js
+++ b/src/server/Uploader.js
@@ -403,7 +403,7 @@ class Uploader {
     logger.debug(
       `${combinedBytes} ${bytesTotal} ${formattedPercentage}%`,
       'uploader.total.progress',
-      this.shortToken
+      this.shortToken,
     )
 
     if (this._paused || this.uploadStopped) {
diff --git a/src/server/controllers/s3.js b/src/server/controllers/s3.js
index f7bc8723fe..7dd5849c83 100644
--- a/src/server/controllers/s3.js
+++ b/src/server/controllers/s3.js
@@ -248,7 +248,7 @@ module.exports = function s3 (config) {
           Body: '',
           Expires: config.expires,
         })
-      })
+      }),
     ).then((urls) => {
       const presignedUrls = Object.create(null)
       for (let index = 0; index < partNumbersArray.length; index++) {
diff --git a/src/server/header-blacklist.js b/src/server/header-blacklist.js
index 1c7ac5a7aa..08e0e4b817 100644
--- a/src/server/header-blacklist.js
+++ b/src/server/header-blacklist.js
@@ -40,8 +40,7 @@ const forbiddenRegex = [/^proxy-.*$/, /^sec-.*$/]
  */
 const isForbiddenHeader = (header) => {
   const headerLower = header.toLowerCase()
-  const forbidden
-    = forbiddenNames.indexOf(headerLower) >= 0
+  const forbidden = forbiddenNames.indexOf(headerLower) >= 0
     || forbiddenRegex.findIndex((regex) => regex.test(headerLower)) >= 0
 
   if (forbidden) {
diff --git a/src/server/helpers/request.js b/src/server/helpers/request.js
index aa0b83565c..bdd5bb4a23 100644
--- a/src/server/helpers/request.js
+++ b/src/server/helpers/request.js
@@ -98,7 +98,7 @@ module.exports.getRedirectEvaluator = (rawRequestURL, blockPrivateIPs) => {
     const shouldRedirect = redirectURL.protocol === requestURL.protocol
     if (!shouldRedirect) {
       logger.info(
-        `blocking redirect from ${requestURL} to ${redirectURL}`, 'redirect.protection'
+        `blocking redirect from ${requestURL} to ${redirectURL}`, 'redirect.protection',
       )
     }
 
diff --git a/src/server/provider/drive/index.js b/src/server/provider/drive/index.js
index fc412d36da..f2673d2742 100644
--- a/src/server/provider/drive/index.js
+++ b/src/server/provider/drive/index.js
@@ -173,7 +173,7 @@ class Drive extends Provider {
       sharedDrives,
       directory,
       query,
-      isRoot && !query.cursor // we can only show it on the first page request, or else we will have duplicates of it
+      isRoot && !query.cursor, // we can only show it on the first page request, or else we will have duplicates of it
     )
   }
 
diff --git a/src/server/provider/unsplash/index.js b/src/server/provider/unsplash/index.js
index 424f85e0ca..d3b14648af 100644
--- a/src/server/provider/unsplash/index.js
+++ b/src/server/provider/unsplash/index.js
@@ -142,8 +142,7 @@ class Unsplash extends SearchProvider {
   error (err, resp) {
     if (resp) {
       const fallbackMessage = `request to Unsplash returned ${resp.statusCode}`
-      const msg
-        = resp.body && resp.body.errors ? `${resp.body.errors}` : fallbackMessage
+      const msg = resp.body && resp.body.errors ? `${resp.body.errors}` : fallbackMessage
       return new ProviderApiError(msg, resp.statusCode)
     }
 
diff --git a/src/server/s3-client.js b/src/server/s3-client.js
index 015f93ac52..b7d09a79c2 100644
--- a/src/server/s3-client.js
+++ b/src/server/s3-client.js
@@ -35,7 +35,7 @@ module.exports = (companionOptions) => {
       s3ClientOptions.credentials = new AWS.Credentials(
         s3ProviderOptions.key,
         s3ProviderOptions.secret,
-        s3ProviderOptions.sessionToken
+        s3ProviderOptions.sessionToken,
       )
     }
     s3Client = new S3(s3ClientOptions)
diff --git a/src/standalone/index.js b/src/standalone/index.js
index 2d36b5256e..4d0349905f 100644
--- a/src/standalone/index.js
+++ b/src/standalone/index.js
@@ -119,7 +119,7 @@ module.exports = function server (inputCompanionOptions = {}) {
   if (companionOptions.redisUrl) {
     const RedisStore = require('connect-redis')(session)
     const redisClient = redis.client(
-      merge({ url: companionOptions.redisUrl }, companionOptions.redisOptions)
+      merge({ url: companionOptions.redisUrl }, companionOptions.redisOptions),
     )
     sessionOptions.store = new RedisStore({ client: redisClient })
   }