Fix: Tests lint and src folder (#138)

* Automaticly fixable eslint issues, mostly 3 -> 2 space indentation

* fix: updated plex_userid to camelcase

* Linted and some consistency refactor on middleware

* eslint uses ecmaversion 2020 & allow empty catch rule

* Started linting source files

* Fixed eslint errors & improved a lot of error handling

* Set 2 eslint rules as warning temporarly

* Updated all import statements to be relative

* Updated mocha & nyc, resolved all lint issues in tests/

* Updated mocha & nyc. Removed production config. Updated gitignore

* Updated test commands to omit system tests, no exit code

* Updated test configuration w/ missing keys

* Chai modules defined in package.json & resolved linting errors

* Dockerfile copies development.example -> production.json. Simplified commands

* All api calls from tests use same chaiHttp implementation

Removes a list of fetch alternatives after being replaced by chaiHttp:
 - request
 - request-promise
 - supertest
 - supertest-as-promised

* Tests should use redis (mock) cache, not tmdb sqlite cache

* Disabled test asADeveloperIWantTheServerToStart

* Re-enable tests/system

* Use chaiHttp in asAUserIWantToRequestAMovie.

* Fixed redis expire & mock implmentation

* Replaced all fetch alternatives from source code and package.json

* Pass error from tmdb api back to client as errorMessage

* Updated authentication middleware to handle checks consitenctly

* Prevent assert error when checking request status, returns success 200

* Resolved merge conflicts

* Only build and publish docker container when branch master

src/cache/redis.js

@@ -1,6 +1,7 @@
 const configuration = require("../config/configuration").getInstance();
 
 let client;
+const mockCache = {};
 
 try {
   const redis = require("redis"); // eslint-disable-line global-require
@@ -8,7 +9,6 @@ try {
   const host = configuration.get("redis", "host");
   const port = configuration.get("redis", "port");
 
-  console.log(`redis://${host}:${port}`); // eslint-disable-line no-console
   client = redis.createClient({
     url: `redis://${host}:${port}`
   });
@@ -20,13 +20,18 @@ try {
     console.error("Unable to connect to redis, setting up redis-mock."); // eslint-disable-line no-console
 
     client = {
-      get(command) {
-        console.log(`redis-dummy get: ${command}`); // eslint-disable-line no-console
-        return Promise.resolve();
+      get(key, callback) {
+        console.log(`redis-dummy get: ${key}`); // eslint-disable-line no-console
+        const hit = mockCache[key];
+        return Promise.resolve().then(callback(null, hit));
       },
-      set(command) {
-        console.log(`redis-dummy set: ${command}`); // eslint-disable-line no-console
-        return Promise.resolve();
+      set(key, json, callback) {
+        console.log(`redis-dummy set: ${key}`); // eslint-disable-line no-console
+        mockCache[key] = JSON.stringify(json);
+        return Promise.resolve().then(callback(null, "OK"));
+      },
+      expire(key, TTL) {
+        console.log(`redis-dummy expire: ${key} with TTL ${TTL}`); // eslint-disable-line no-console
       }
     };
   });
@@ -39,7 +44,7 @@ function set(key, value, TTL = 10800) {
   client.set(key, json, (error, reply) => {
     if (reply === "OK") {
       // successfully set value with key, now set TTL for key
-      client.expire(key, TTL, e => {
+      client.expire(key, TTL, "NX", e => {
         if (e)
           // eslint-disable-next-line no-console
           console.error(

src/notifications/sms.js

@@ -1,4 +1,3 @@
-const request = require("request");
 const configuration = require("../config/configuration").getInstance();
 
 class SMSUnexpectedError extends Error {
@@ -20,23 +19,21 @@ const sendSMS = message => {
 
   const sender = configuration.get("sms", "sender");
   const recipient = configuration.get("sms", "recipient");
+  const smsRequestHeaders = { "Content-Type": "application/json" };
+  const smsRequestBody = {
+    sender,
+    message,
+    recipients: [{ msisdn: `47${recipient}` }]
+  };
 
   return new Promise((resolve, reject) => {
-    request.post(
-      {
-        url: `https://gatewayapi.com/rest/mtsms?token=${apiKey}`,
-        json: true,
-        body: {
-          sender,
-          message,
-          recipients: [{ msisdn: `47${recipient}` }]
-        }
-      },
-      (err, r, body) => {
-        if (err) reject(new SMSUnexpectedError(err || body));
-        resolve(body);
-      }
-    );
+    fetch(`https://gatewayapi.com/rest/mtsms?token=${apiKey}`, {
+      body: JSON.stringify(smsRequestBody),
+      headers: smsRequestHeaders
+    })
+      .then(resp => resp.json())
+      .then(response => resolve(response))
+      .catch(error => reject(new SMSUnexpectedError(error)));
   });
 };
 

src/plex/plex.js

@@ -1,4 +1,3 @@
-const fetch = require("node-fetch");
 const convertPlexToMovie = require("./convertPlexToMovie");
 const convertPlexToShow = require("./convertPlexToShow");
 const convertPlexToEpisode = require("./convertPlexToEpisode");

src/plex/plexRepository.js

@@ -1,4 +1,3 @@
-const rp = require("request-promise");
 const convertPlexToSeasoned = require("./convertPlexToSeasoned");
 const convertPlexToStream = require("./convertPlexToStream");
 
@@ -35,8 +34,9 @@ function mapResults(response) {
 }
 
 class PlexRepository {
-  constructor(plexIP) {
+  constructor(plexIP, plexToken) {
     this.plexIP = plexIP;
+    this.plexToken = plexToken;
   }
 
   inPlex(_tmdbResult) {
@@ -56,19 +56,17 @@ class PlexRepository {
   }
 
   search(query) {
-    const queryUri = encodeURIComponent(query);
-    const uri = encodeURI(
-      `http://${this.plexIP}:32400/search?query=${queryUri}`
+    const url = encodeURI(
+      `http://${this.plexIP}:32400/search?query=${encodeURIComponent(
+        query
+      )}&X-Plex-Token=${this.plexToken}`
     );
     const options = {
-      uri,
-      headers: {
-        Accept: "application/json"
-      },
-      json: true
+      headers: { Accept: "application/json" }
     };
 
-    return rp(options)
+    return fetch(url, options)
+      .then(resp => resp.json())
       .then(result => mapResults(result))
       .then(([mappedResults, resultCount]) => ({
         results: mappedResults,
@@ -77,15 +75,13 @@ class PlexRepository {
   }
 
   nowPlaying() {
+    const url = `http://${this.plexIP}:32400/status/sessions?X-Plex-Token=${this.plexToken}`;
     const options = {
-      uri: `http://${this.plexIP}:32400/status/sessions`,
-      headers: {
-        Accept: "application/json"
-      },
-      json: true
+      headers: { Accept: "application/json" }
     };
 
-    return rp(options)
+    return fetch(url, options)
+      .then(resp => resp.json())
       .then(result => {
         if (result.MediaContainer.size > 0) {
           const playing =

src/plex/requestRepository.js

@@ -3,7 +3,10 @@ const configuration = require("../config/configuration").getInstance();
 const TMDB = require("../tmdb/tmdb");
 const establishedDatabase = require("../database/database");
 
-const plexRepository = new PlexRepository(configuration.get("plex", "ip"));
+const plexRepository = new PlexRepository(
+  configuration.get("plex", "ip"),
+  configuration.get("plex", "token")
+);
 const tmdb = new TMDB(configuration.get("tmdb", "apiKey"));
 
 class RequestRepository {

src/request/request.js

@@ -83,7 +83,8 @@ class RequestRepository {
     return this.database
       .get(this.queries.readWithoutUserData, [id, type])
       .then(row => {
-        assert(row, "Could not find request item with that id and type");
+        if (!row) return null;
+
         return {
           id: row.id,
           title: row.title,
@@ -122,10 +123,7 @@ class RequestRepository {
     return this.database
       .all(fetchQuery, fetchParams)
       .then(async rows => {
-        const sqliteResponse = await this.database.get(
-          fetchTotalResults,
-          filter || null
-        );
+        const sqliteResponse = await this.database.get(fetchTotalResults);
         const { totalRequests } = sqliteResponse;
         const totalPages = Math.ceil(totalRequests / 26);
 

src/tautulli/tautulli.js

@@ -1,5 +1,3 @@
-const fetch = require("node-fetch");
-
 class TautulliUnexpectedError extends Error {
   constructor(errorMessage) {
     const message = "Unexpected error fetching from tautulli.";

src/tmdb/tmdb.js

@@ -38,17 +38,17 @@ class TMDBNotReachableError extends Error {
 }
 
 const tmdbErrorResponse = (error, type = null) => {
-  if (error.status === 404) {
-    const message = error.response.body.status_message;
+  if (error?.status === 404) {
+    const message = error?.response?.body?.status_message;
 
     throw new TMDBNotFoundError(`${message.slice(0, -1)} in tmdb.`);
-  } else if (error.status === 401) {
+  } else if (error?.status === 401) {
     throw new TMDBUnauthorizedError(error?.response?.body?.status_message);
   } else if (error?.code === "ENOTFOUND") {
     throw new TMDBNotReachableError();
   }
 
-  throw new TMDBUnexpectedError(type, error);
+  throw new TMDBUnexpectedError(type, error.message);
 };
 
 /**

src/webserver/controllers/movie/info.js

@@ -44,6 +44,7 @@ async function movieInfoController(req, res) {
   } catch (error) {
     return res.status(error?.statusCode || 500).send({
       success: false,
+      errorMessage: error?.errorMessage,
       message:
         error?.message ||
         `An unexpected error occured while requesting info for with id: ${movieId}`

src/webserver/controllers/plex/plexPlaying.js

@@ -1,7 +1,10 @@
 const PlexRepository = require("../../../plex/plexRepository");
 const configuration = require("../../../config/configuration").getInstance();
 
-const plexRepository = new PlexRepository(configuration.get("plex", "ip"));
+const plexRepository = new PlexRepository(
+  configuration.get("plex", "ip"),
+  configuration.get("plex", "token")
+);
 
 function playingController(req, res) {
   plexRepository

src/webserver/controllers/plex/searchMedia.js

@@ -1,7 +1,10 @@
 const PlexRepository = require("../../../plex/plexRepository");
 const configuration = require("../../../config/configuration").getInstance();
 
-const plexRepository = new PlexRepository(configuration.get("plex", "ip"));
+const plexRepository = new PlexRepository(
+  configuration.get("plex", "ip"),
+  configuration.get("plex", "token")
+);
 
 /**
  * Controller: Search for media and check existence

src/webserver/controllers/request/getRequest.js

@@ -14,7 +14,19 @@ function fetchAllRequests(req, res) {
 
   request
     .getRequestByIdAndType(id, type)
-    .then(result => res.send(result))
+    .then(result => {
+      if (!result) {
+        return res.send({
+          success: false,
+          message: `Item ${type} with id ${id} has not been requested`
+        });
+      }
+
+      return res.send({
+        success: true,
+        result
+      });
+    })
     .catch(error => {
       return res.status(error?.statusCode || 500).send({
         success: false,

src/webserver/middleware/mustBeAdmin.js

@@ -4,8 +4,8 @@ const establishedDatabase = require("../../database/database");
 const mustBeAdmin = (req, res, next) => {
   const database = establishedDatabase;
 
-  if (req.loggedInUser === undefined) {
-    res.status(401).send({
+  if (!req.loggedInUser) {
+    return res.status(401).send({
       success: false,
       message: "You must be logged in."
     });

src/webserver/middleware/mustBeAuthenticated.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line consistent-return
 const mustBeAuthenticated = (req, res, next) => {
-  if (req.loggedInUser === undefined) {
+  if (!req.loggedInUser) {
     return res.status(401).send({
       success: false,
       message: "You must be logged in."

src/webserver/middleware/mustHaveAccountLinkedToPlex.js

@@ -3,9 +3,9 @@ const establishedDatabase = require("../../database/database");
 /* eslint-disable consistent-return */
 const mustHaveAccountLinkedToPlex = (req, res, next) => {
   const database = establishedDatabase;
-  const { loggedInUser } = req;
 
-  if (loggedInUser === null) {
+  // TODO use mustByAuthenticated middleware
+  if (!req.loggedInUser) {
     return res.status(401).send({
       success: false,
       message: "You must have your account linked to a plex account."
@@ -15,7 +15,7 @@ const mustHaveAccountLinkedToPlex = (req, res, next) => {
   database
     .get(
       `SELECT plex_userid FROM settings WHERE user_name IS ?`,
-      loggedInUser.username
+      req.loggedInUser.username
     )
     .then(row => {
       const plexUserId = row.plex_userid;

src/webserver/server.js

@@ -4,8 +4,6 @@ const app = require("./app");
 module.exports = app.listen(config.get("webserver", "port"), () => {
   /* eslint-disable no-console */
   console.log("seasonedAPI");
-  /* eslint-disable no-console */
   console.log(`Database is located at ${config.get("database", "host")}`);
-  /* eslint-disable no-console */
   console.log(`Webserver is listening on ${config.get("webserver", "port")}`);
 });