From ce45ed7b7f7e378f19a2be05f23c05c5c9d270cc Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Mon, 22 Aug 2022 23:03:19 +0200 Subject: [PATCH] All file imports change from commonjs to es-module --- scripts/updateRequestsInPlex.js | 13 +- src/cache/redis.js | 14 +- src/config/configuration.js | 6 +- src/config/environmentVariables.js | 2 +- src/config/field.js | 6 +- src/config/filters.js | 2 +- src/database/database.js | 8 +- src/database/sqliteDatabase.js | 8 +- src/git/gitRepository.js | 2 +- src/media_classes/media.js | 2 +- src/media_classes/mediaInfo.js | 2 +- src/media_classes/player.js | 2 +- src/media_classes/plex.js | 4 +- src/media_classes/tmdb.js | 5 +- src/media_classes/user.js | 2 +- src/notifications/sms.js | 10 +- src/pirate/pirateRepository.js | 17 +- src/plex/convertPlexToEpisode.js | 5 +- src/plex/convertPlexToMovie.js | 4 +- src/plex/convertPlexToSeasoned.js | 4 +- src/plex/convertPlexToShow.js | 4 +- src/plex/convertPlexToStream.js | 12 +- src/plex/convertStreamToMediaInfo.js | 4 +- src/plex/mailTemplate.js | 2 +- src/plex/plex.js | 10 +- src/plex/plexRepository.js | 6 +- src/plex/requestRepository.js | 11 +- src/plex/stream/convertStreamToPlayback.js | 2 +- src/plex/stream/convertStreamToPlayer.js | 4 +- src/plex/stream/convertStreamToUser.js | 4 +- src/plex/types/episode.js | 2 +- src/plex/types/movie.js | 2 +- src/plex/types/show.js | 2 +- src/request/request.js | 6 +- src/searchHistory/searchHistory.js | 4 +- src/seasoned/stray.js | 2 +- src/seasoned/strayRepository.js | 10 +- src/tmdb/cache.js | 6 +- src/tmdb/tmdb.js | 6 +- src/tmdb/types.js | 12 +- src/tmdb/types/credits.js | 6 +- src/tmdb/types/movie.js | 2 +- src/tmdb/types/person.js | 2 +- src/tmdb/types/releaseDates.js | 2 +- src/tmdb/types/show.js | 2 +- src/user/token.js | 6 +- src/user/user.js | 2 +- src/user/userRepository.js | 6 +- src/user/userSecurity.js | 6 +- src/webserver/app.js | 185 ++++++++++-------- src/webserver/controllers/git/dumpHook.js | 4 +- .../controllers/list/listController.js | 29 +-- src/webserver/controllers/misc/emoji.js | 4 +- src/webserver/controllers/movie/credits.js | 7 +- src/webserver/controllers/movie/info.js | 9 +- .../controllers/movie/releaseDates.js | 7 +- src/webserver/controllers/person/credits.js | 9 +- src/webserver/controllers/person/info.js | 7 +- src/webserver/controllers/pirate/addMagnet.js | 4 +- .../controllers/pirate/searchTheBay.js | 4 +- .../controllers/plex/fetchRequested.js | 4 +- src/webserver/controllers/plex/hookDump.js | 2 +- src/webserver/controllers/plex/plexPlaying.js | 6 +- src/webserver/controllers/plex/readRequest.js | 4 +- src/webserver/controllers/plex/search.js | 8 +- src/webserver/controllers/plex/searchMedia.js | 8 +- .../controllers/plex/searchRequest.js | 8 +- .../controllers/plex/submitRequest.js | 9 +- .../controllers/plex/updateRequested.js | 4 +- .../controllers/plex/watchDirectLink.js | 7 +- .../controllers/request/fetchAllRequests.js | 4 +- .../controllers/request/getRequest.js | 4 +- .../controllers/request/requestTmdbId.js | 9 +- .../controllers/search/movieSearch.js | 9 +- .../controllers/search/multiSearch.js | 9 +- .../controllers/search/personSearch.js | 9 +- .../controllers/search/showSearch.js | 9 +- .../controllers/seasoned/readStrays.js | 4 +- .../controllers/seasoned/strayById.js | 4 +- .../controllers/seasoned/verifyStray.js | 4 +- src/webserver/controllers/show/credits.js | 7 +- src/webserver/controllers/show/info.js | 9 +- .../user/authenticatePlexAccount.js | 35 ++-- src/webserver/controllers/user/login.js | 13 +- src/webserver/controllers/user/logout.js | 2 +- src/webserver/controllers/user/register.js | 11 +- src/webserver/controllers/user/requests.js | 4 +- .../controllers/user/searchHistory.js | 4 +- src/webserver/controllers/user/settings.js | 15 +- src/webserver/middleware/mustBeAdmin.js | 4 +- .../middleware/mustBeAuthenticated.js | 2 +- .../middleware/mustHaveAccountLinkedToPlex.js | 4 +- src/webserver/middleware/reqTokenToUser.js | 7 +- src/webserver/server.js | 8 +- 94 files changed, 410 insertions(+), 372 deletions(-) diff --git a/scripts/updateRequestsInPlex.js b/scripts/updateRequestsInPlex.js index 7f186e6..409041a 100644 --- a/scripts/updateRequestsInPlex.js +++ b/scripts/updateRequestsInPlex.js @@ -1,7 +1,12 @@ -const Plex = require("src/plex/plex"); -const configuration = require("src/config/configuration").getInstance(); -const plex = new Plex(configuration.get("plex", "ip")); -const establishedDatabase = require("src/database/database"); +import Plex from "../src/plex/plexRepository"; +import establishedDatabase from "../src/database/database"; +import Configuration from "../src/config/configuration"; + +const configuration = Configuration.getInstance(); +const plex = new Plex( + configuration.get("plex", "ip"), + configuration.get("plex", "token") +); const queries = { getRequestsNotYetInPlex: `SELECT * FROM requests WHERE status = 'requested' OR status = 'downloading'`, diff --git a/src/cache/redis.js b/src/cache/redis.js index dee6e5f..1979231 100644 --- a/src/cache/redis.js +++ b/src/cache/redis.js @@ -1,10 +1,11 @@ -const configuration = require("../config/configuration").getInstance(); +import redis from "redis"; +import Configuration from "../config/configuration"; +const configuration = Configuration.getInstance(); let client; const mockCache = {}; try { - const redis = require("redis"); // eslint-disable-line global-require console.log("Trying to connect with redis.."); // eslint-disable-line no-console const host = configuration.get("redis", "host"); const port = configuration.get("redis", "port"); @@ -37,7 +38,7 @@ try { }); } catch (e) {} -function set(key, value, TTL = 10800) { +export function set(key, value, TTL = 10800) { if (value == null || key == null) return null; const json = JSON.stringify(value); @@ -60,7 +61,7 @@ function set(key, value, TTL = 10800) { return value; } -function get(key) { +export function get(key) { return new Promise((resolve, reject) => { client.get(key, (error, reply) => { if (reply === null) { @@ -71,8 +72,3 @@ function get(key) { }); }); } - -module.exports = { - get, - set -}; diff --git a/src/config/configuration.js b/src/config/configuration.js index 175a0a7..7795919 100644 --- a/src/config/configuration.js +++ b/src/config/configuration.js @@ -1,5 +1,5 @@ -const path = require("path"); -const Field = require("./field"); +import path from "path"; +import Field from "./field"; let instance = null; @@ -45,4 +45,4 @@ class Config { } } -module.exports = Config; +export default Config; diff --git a/src/config/environmentVariables.js b/src/config/environmentVariables.js index 22d467f..84fe070 100644 --- a/src/config/environmentVariables.js +++ b/src/config/environmentVariables.js @@ -12,4 +12,4 @@ class EnvironmentVariables { } } -module.exports = EnvironmentVariables; +export default EnvironmentVariables; diff --git a/src/config/field.js b/src/config/field.js index ef4b3d1..8126f6a 100644 --- a/src/config/field.js +++ b/src/config/field.js @@ -1,5 +1,5 @@ -const Filters = require("./filters"); -const EnvironmentVariables = require("./environmentVariables"); +import Filters from "./filters"; +import EnvironmentVariables from "./environmentVariables"; class Field { constructor(rawValue, environmentVariables) { @@ -50,4 +50,4 @@ class Field { } } -module.exports = Field; +export default Field; diff --git a/src/config/filters.js b/src/config/filters.js index 8d5fad1..7a62eea 100644 --- a/src/config/filters.js +++ b/src/config/filters.js @@ -31,4 +31,4 @@ class Filters { } } -module.exports = Filters; +export default Filters; diff --git a/src/database/database.js b/src/database/database.js index e00bb70..7640c7c 100644 --- a/src/database/database.js +++ b/src/database/database.js @@ -1,5 +1,7 @@ -const configuration = require("../config/configuration").getInstance(); -const SqliteDatabase = require("./sqliteDatabase"); +import SqliteDatabase from "./sqliteDatabase"; +import Configuration from "../config/configuration"; + +const configuration = Configuration.getInstance(); const database = new SqliteDatabase(configuration.get("database", "host")); /** @@ -10,4 +12,4 @@ const database = new SqliteDatabase(configuration.get("database", "host")); */ Promise.resolve().then(() => database.setUp()); -module.exports = database; +export default database; diff --git a/src/database/sqliteDatabase.js b/src/database/sqliteDatabase.js index a6f8e53..a9fc4a7 100644 --- a/src/database/sqliteDatabase.js +++ b/src/database/sqliteDatabase.js @@ -1,6 +1,6 @@ -const fs = require("fs"); -const path = require("path"); -const sqlite3 = require("sqlite3").verbose(); +import fs from "fs"; +import path from "path"; +import sqlite3 from "sqlite3"; class SqliteDatabase { constructor(host) { @@ -115,4 +115,4 @@ class SqliteDatabase { } } -module.exports = SqliteDatabase; +export default SqliteDatabase; diff --git a/src/git/gitRepository.js b/src/git/gitRepository.js index 7659561..8265fe7 100644 --- a/src/git/gitRepository.js +++ b/src/git/gitRepository.js @@ -5,4 +5,4 @@ class GitRepository { } } -module.exports = GitRepository; +export default GitRepository; diff --git a/src/media_classes/media.js b/src/media_classes/media.js index e68f670..c456249 100644 --- a/src/media_classes/media.js +++ b/src/media_classes/media.js @@ -15,4 +15,4 @@ class Media { } } -module.exports = Media; +export default Media; diff --git a/src/media_classes/mediaInfo.js b/src/media_classes/mediaInfo.js index 663bcb8..2582351 100644 --- a/src/media_classes/mediaInfo.js +++ b/src/media_classes/mediaInfo.js @@ -12,4 +12,4 @@ class MediaInfo { } } -module.exports = MediaInfo; +export default MediaInfo; diff --git a/src/media_classes/player.js b/src/media_classes/player.js index 6f9a22f..40bb13d 100644 --- a/src/media_classes/player.js +++ b/src/media_classes/player.js @@ -9,4 +9,4 @@ class Player { } } -module.exports = Player; +export default Player; diff --git a/src/media_classes/plex.js b/src/media_classes/plex.js index 2626e39..b39a062 100644 --- a/src/media_classes/plex.js +++ b/src/media_classes/plex.js @@ -1,6 +1,6 @@ /* eslint-disable camelcase */ -const Media = require("./media"); +import Media from "./media"; class Plex extends Media { constructor( @@ -30,4 +30,4 @@ class Plex extends Media { } } -module.exports = Plex; +export default Plex; diff --git a/src/media_classes/tmdb.js b/src/media_classes/tmdb.js index 63a0c40..1b33ff5 100644 --- a/src/media_classes/tmdb.js +++ b/src/media_classes/tmdb.js @@ -1,6 +1,5 @@ /* eslint-disable camelcase */ - -const Media = require("./media"); +import Media from "./media"; class TMDB extends Media { // constructor(...args) { @@ -45,4 +44,4 @@ class TMDB extends Media { } } -module.exports = TMDB; +export default TMDB; diff --git a/src/media_classes/user.js b/src/media_classes/user.js index 62a5f3e..e4388fa 100644 --- a/src/media_classes/user.js +++ b/src/media_classes/user.js @@ -5,4 +5,4 @@ class User { } } -module.exports = User; +export default User; diff --git a/src/notifications/sms.js b/src/notifications/sms.js index 8dbb3fe..a60d135 100644 --- a/src/notifications/sms.js +++ b/src/notifications/sms.js @@ -1,4 +1,6 @@ -const configuration = require("../config/configuration").getInstance(); +import Configuration from "../config/configuration"; + +const configuration = Configuration.getInstance(); class SMSUnexpectedError extends Error { constructor(errorMessage) { @@ -9,7 +11,7 @@ class SMSUnexpectedError extends Error { } } -const sendSMS = message => { +export function sendSMS(message) { const apiKey = configuration.get("sms", "apikey"); if (!apiKey) { @@ -35,6 +37,4 @@ const sendSMS = message => { .then(response => resolve(response)) .catch(error => reject(new SMSUnexpectedError(error))); }); -}; - -module.exports = { sendSMS }; +} diff --git a/src/pirate/pirateRepository.js b/src/pirate/pirateRepository.js index 36849b2..ea2974c 100644 --- a/src/pirate/pirateRepository.js +++ b/src/pirate/pirateRepository.js @@ -1,10 +1,9 @@ -const http = require("http"); -const { URL } = require("url"); -const PythonShell = require("python-shell"); +import http from "http"; +import { URL } from "url"; +import PythonShell from "python-shell"; -const establishedDatabase = require("../database/database"); - -const cache = require("../cache/redis"); +import establishedDatabase from "../database/database"; +import cache from "../cache/redis"; function getMagnetFromURL(url) { return new Promise(resolve => { @@ -46,7 +45,7 @@ async function callPythonAddMagnet(url, callback) { }); } -async function SearchPiratebay(_query) { +export async function SearchPiratebay(_query) { let query = String(_query); if (query?.includes("+")) { @@ -76,7 +75,7 @@ async function SearchPiratebay(_query) { ); } -function AddMagnet(magnet, name, tmdbId) { +export function AddMagnet(magnet, name, tmdbId) { return new Promise((resolve, reject) => callPythonAddMagnet(magnet, (err, results) => { if (err) { @@ -98,5 +97,3 @@ function AddMagnet(magnet, name, tmdbId) { }) ); } - -module.exports = { SearchPiratebay, AddMagnet }; diff --git a/src/plex/convertPlexToEpisode.js b/src/plex/convertPlexToEpisode.js index 398724f..4c671d8 100644 --- a/src/plex/convertPlexToEpisode.js +++ b/src/plex/convertPlexToEpisode.js @@ -1,4 +1,4 @@ -const Episode = require("./types/episode"); +import Episode from "./types/episode"; function convertPlexToEpisode(plexEpisode) { const episode = new Episode( @@ -21,4 +21,5 @@ function convertPlexToEpisode(plexEpisode) { return episode; } -module.exports = convertPlexToEpisode; + +export default convertPlexToEpisode; diff --git a/src/plex/convertPlexToMovie.js b/src/plex/convertPlexToMovie.js index 96c6882..9df2fe2 100644 --- a/src/plex/convertPlexToMovie.js +++ b/src/plex/convertPlexToMovie.js @@ -1,4 +1,4 @@ -const Movie = require("./types/movie"); +import Movie from "./types/movie"; function convertPlexToMovie(plexMovie) { const movie = new Movie(plexMovie.title, plexMovie.year); @@ -12,4 +12,4 @@ function convertPlexToMovie(plexMovie) { return movie; } -module.exports = convertPlexToMovie; +export default convertPlexToMovie; diff --git a/src/plex/convertPlexToSeasoned.js b/src/plex/convertPlexToSeasoned.js index d216c23..27bf858 100644 --- a/src/plex/convertPlexToSeasoned.js +++ b/src/plex/convertPlexToSeasoned.js @@ -1,6 +1,6 @@ /* eslint-disable camelcase */ -const Plex = require("../media_classes/plex"); +import Plex from "../media_classes/plex"; function translateAdded(date_string) { return new Date(date_string * 1000); @@ -32,4 +32,4 @@ function convertPlexToSeasoned(plex) { return seasoned; } -module.exports = convertPlexToSeasoned; +export default convertPlexToSeasoned; diff --git a/src/plex/convertPlexToShow.js b/src/plex/convertPlexToShow.js index dc51474..6bf06dc 100644 --- a/src/plex/convertPlexToShow.js +++ b/src/plex/convertPlexToShow.js @@ -1,4 +1,4 @@ -const Show = require("./types/show"); +import Show from "./types/show"; function convertPlexToShow(plexShow) { const show = new Show(plexShow.title, plexShow.year); @@ -10,4 +10,4 @@ function convertPlexToShow(plexShow) { return show; } -module.exports = convertPlexToShow; +export default convertPlexToShow; diff --git a/src/plex/convertPlexToStream.js b/src/plex/convertPlexToStream.js index 3255cc7..53d2955 100644 --- a/src/plex/convertPlexToStream.js +++ b/src/plex/convertPlexToStream.js @@ -1,8 +1,8 @@ -const convertPlexToSeasoned = require("./convertPlexToSeasoned"); -const convertStreamToMediaInfo = require("./convertStreamToMediaInfo"); -const convertStreamToPlayer = require("./stream/convertStreamToPlayer"); -const convertStreamToUser = require("./stream/convertStreamToUser"); -const ConvertStreamToPlayback = require("./stream/convertStreamToPlayback"); +import convertPlexToSeasoned from "./convertPlexToSeasoned"; +import convertStreamToMediaInfo from "./convertStreamToMediaInfo"; +import convertStreamToPlayer from "./stream/convertStreamToPlayer"; +import convertStreamToUser from "./stream/convertStreamToUser"; +import ConvertStreamToPlayback from "./stream/convertStreamToPlayback"; function convertPlexToStream(plexStream) { const stream = convertPlexToSeasoned(plexStream); @@ -16,4 +16,4 @@ function convertPlexToStream(plexStream) { return stream; } -module.exports = convertPlexToStream; +export default convertPlexToStream; diff --git a/src/plex/convertStreamToMediaInfo.js b/src/plex/convertStreamToMediaInfo.js index e68f9f8..819210b 100644 --- a/src/plex/convertStreamToMediaInfo.js +++ b/src/plex/convertStreamToMediaInfo.js @@ -1,4 +1,4 @@ -const MediaInfo = require("../media_classes/mediaInfo"); +import MediaInfo from "../media_classes/mediaInfo"; function convertStreamToMediaInfo(plexStream) { const mediaInfo = new MediaInfo(); @@ -19,4 +19,4 @@ function convertStreamToMediaInfo(plexStream) { return mediaInfo; } -module.exports = convertStreamToMediaInfo; +export default convertStreamToMediaInfo; diff --git a/src/plex/mailTemplate.js b/src/plex/mailTemplate.js index fa0a355..084697b 100644 --- a/src/plex/mailTemplate.js +++ b/src/plex/mailTemplate.js @@ -22,4 +22,4 @@ class mailTemplate { } } -module.exports = mailTemplate; +export default mailTemplate; diff --git a/src/plex/plex.js b/src/plex/plex.js index 09c74e9..6cd743c 100644 --- a/src/plex/plex.js +++ b/src/plex/plex.js @@ -1,7 +1,7 @@ -const convertPlexToMovie = require("./convertPlexToMovie"); -const convertPlexToShow = require("./convertPlexToShow"); -const convertPlexToEpisode = require("./convertPlexToEpisode"); -const redisCache = require("../cache/redis"); +import convertPlexToMovie from "./convertPlexToMovie"; +import convertPlexToShow from "./convertPlexToShow"; +import convertPlexToEpisode from "./convertPlexToEpisode"; +import redisCache from "../cache/redis"; class PlexRequestTimeoutError extends Error { constructor() { @@ -227,4 +227,4 @@ class Plex { } } -module.exports = Plex; +export default Plex; diff --git a/src/plex/plexRepository.js b/src/plex/plexRepository.js index 4018ce2..36b4219 100644 --- a/src/plex/plexRepository.js +++ b/src/plex/plexRepository.js @@ -1,5 +1,5 @@ -const convertPlexToSeasoned = require("./convertPlexToSeasoned"); -const convertPlexToStream = require("./convertPlexToStream"); +import convertPlexToSeasoned from "./convertPlexToSeasoned"; +import convertPlexToStream from "./convertPlexToStream"; // eslint-disable-next-line function addAttributeIfTmdbInPlex(_tmdb, plexResult) { @@ -103,4 +103,4 @@ class PlexRepository { // } } -module.exports = PlexRepository; +export default PlexRepository; diff --git a/src/plex/requestRepository.js b/src/plex/requestRepository.js index ebe8f63..66d54a3 100644 --- a/src/plex/requestRepository.js +++ b/src/plex/requestRepository.js @@ -1,8 +1,9 @@ -const PlexRepository = require("./plexRepository"); -const configuration = require("../config/configuration").getInstance(); -const TMDB = require("../tmdb/tmdb"); -const establishedDatabase = require("../database/database"); +import PlexRepository from "./plexRepository"; +import TMDB from "../tmdb/tmdb"; +import establishedDatabase from "../database/database"; +import Configuration from "../config/configuration"; +const configuration = Configuration.getInstance(); const plexRepository = new PlexRepository( configuration.get("plex", "ip"), configuration.get("plex", "token") @@ -128,4 +129,4 @@ class RequestRepository { } } -module.exports = RequestRepository; +export default RequestRepository; diff --git a/src/plex/stream/convertStreamToPlayback.js b/src/plex/stream/convertStreamToPlayback.js index c07d439..3674032 100644 --- a/src/plex/stream/convertStreamToPlayback.js +++ b/src/plex/stream/convertStreamToPlayback.js @@ -11,4 +11,4 @@ class convertStreamToPlayback { } } -module.exports = convertStreamToPlayback; +export default convertStreamToPlayback; diff --git a/src/plex/stream/convertStreamToPlayer.js b/src/plex/stream/convertStreamToPlayer.js index 0e07b1c..06417bd 100644 --- a/src/plex/stream/convertStreamToPlayer.js +++ b/src/plex/stream/convertStreamToPlayer.js @@ -1,4 +1,4 @@ -const Player = require("../../media_classes/player"); +import Player from "../../media_classes/player"; function convertStreamToPlayer(plexStream) { const player = new Player(plexStream.device, plexStream.address); @@ -10,4 +10,4 @@ function convertStreamToPlayer(plexStream) { return player; } -module.exports = convertStreamToPlayer; +export default convertStreamToPlayer; diff --git a/src/plex/stream/convertStreamToUser.js b/src/plex/stream/convertStreamToUser.js index ee1d261..5249d34 100644 --- a/src/plex/stream/convertStreamToUser.js +++ b/src/plex/stream/convertStreamToUser.js @@ -1,7 +1,7 @@ -const User = require("../../media_classes/user"); +import User from "../../media_classes/user"; function convertStreamToUser(plexStream) { return new User(plexStream.id, plexStream.title); } -module.exports = convertStreamToUser; +export default convertStreamToUser; diff --git a/src/plex/types/episode.js b/src/plex/types/episode.js index 69ce4fe..2419498 100644 --- a/src/plex/types/episode.js +++ b/src/plex/types/episode.js @@ -13,4 +13,4 @@ class Episode { } } -module.exports = Episode; +export default Episode; diff --git a/src/plex/types/movie.js b/src/plex/types/movie.js index aa62ca6..e2bfefc 100644 --- a/src/plex/types/movie.js +++ b/src/plex/types/movie.js @@ -9,4 +9,4 @@ class Movie { } } -module.exports = Movie; +export default Movie; diff --git a/src/plex/types/show.js b/src/plex/types/show.js index 426fd7c..a22c3c0 100644 --- a/src/plex/types/show.js +++ b/src/plex/types/show.js @@ -9,4 +9,4 @@ class Show { } } -module.exports = Show; +export default Show; diff --git a/src/request/request.js b/src/request/request.js index d61f25d..2ff6e9e 100644 --- a/src/request/request.js +++ b/src/request/request.js @@ -1,7 +1,7 @@ -const assert = require("assert"); +import assert from "assert"; // const configuration = require("../config/configuration").getInstance(); // const TMDB = require("../tmdb/tmdb"); -const establishedDatabase = require("../database/database"); +import establishedDatabase from "../database/database"; // const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); @@ -156,4 +156,4 @@ class RequestRepository { } } -module.exports = RequestRepository; +export default RequestRepository; diff --git a/src/searchHistory/searchHistory.js b/src/searchHistory/searchHistory.js index 9c25380..7af2ce3 100644 --- a/src/searchHistory/searchHistory.js +++ b/src/searchHistory/searchHistory.js @@ -1,4 +1,4 @@ -const establishedDatabase = require("../database/database"); +import establishedDatabase from "../database/database"; class SearchHistoryCreateDatabaseError extends Error { constructor(message = "an unexpected error occured", errorResponse = null) { @@ -55,4 +55,4 @@ class SearchHistory { } } -module.exports = SearchHistory; +export default SearchHistory; diff --git a/src/seasoned/stray.js b/src/seasoned/stray.js index c2620fa..dd58882 100644 --- a/src/seasoned/stray.js +++ b/src/seasoned/stray.js @@ -4,4 +4,4 @@ class Stray { } } -module.exports = Stray; +export default Stray; diff --git a/src/seasoned/strayRepository.js b/src/seasoned/strayRepository.js index 9239736..ed6c6f3 100644 --- a/src/seasoned/strayRepository.js +++ b/src/seasoned/strayRepository.js @@ -1,7 +1,7 @@ -const assert = require("assert"); -const pythonShell = require("python-shell"); -const Stray = require("./stray"); -const establishedDatabase = require("../database/database"); +import assert from "assert"; +import pythonShell from "python-shell"; +import Stray from "./stray"; +import establishedDatabase from "../database/database"; class StrayRepository { constructor(database) { @@ -65,4 +65,4 @@ class StrayRepository { } } -module.exports = StrayRepository; +export default StrayRepository; diff --git a/src/tmdb/cache.js b/src/tmdb/cache.js index 0806e8c..b481218 100644 --- a/src/tmdb/cache.js +++ b/src/tmdb/cache.js @@ -1,5 +1,5 @@ -const assert = require("assert"); -const establishedDatabase = require("../database/database"); +import assert from "assert"; +import establishedDatabase from "../database/database"; class Cache { constructor(database) { @@ -45,4 +45,4 @@ class Cache { } } -module.exports = Cache; +export default Cache; diff --git a/src/tmdb/tmdb.js b/src/tmdb/tmdb.js index 054d1e8..46811ca 100644 --- a/src/tmdb/tmdb.js +++ b/src/tmdb/tmdb.js @@ -1,5 +1,5 @@ -const moviedb = require("km-moviedb"); -const redisCache = require("../cache/redis"); +import moviedb from "km-moviedb"; +import redisCache from "../cache/redis"; const { Movie, Show, Person, Credits, ReleaseDates } = require("./types"); @@ -339,4 +339,4 @@ class TMDB { } } -module.exports = TMDB; +export default TMDB; diff --git a/src/tmdb/types.js b/src/tmdb/types.js index cbf5cbc..2316ba3 100644 --- a/src/tmdb/types.js +++ b/src/tmdb/types.js @@ -1,7 +1,7 @@ -const Movie = require("./types/movie"); -const Show = require("./types/show"); -const Person = require("./types/person"); -const Credits = require("./types/credits"); -const ReleaseDates = require("./types/releaseDates"); +import Movie from "./types/movie"; +import Show from "./types/show"; +import Person from "./types/person"; +import Credits from "./types/credits"; +import ReleaseDates from "./types/releaseDates"; -module.exports = { Movie, Show, Person, Credits, ReleaseDates }; +export default { Movie, Show, Person, Credits, ReleaseDates }; diff --git a/src/tmdb/types/credits.js b/src/tmdb/types/credits.js index 8740b6d..c300839 100644 --- a/src/tmdb/types/credits.js +++ b/src/tmdb/types/credits.js @@ -1,6 +1,6 @@ /* eslint-disable camelcase */ -const Movie = require("./movie"); -const Show = require("./show"); +import Movie from "./movie"; +import Show from "./show"; class CreditedMovie extends Movie {} class CreditedShow extends Show {} @@ -113,4 +113,4 @@ class Credits { } } -module.exports = Credits; +export default Credits; diff --git a/src/tmdb/types/movie.js b/src/tmdb/types/movie.js index db78856..2a213e0 100644 --- a/src/tmdb/types/movie.js +++ b/src/tmdb/types/movie.js @@ -113,4 +113,4 @@ class Movie { } } -module.exports = Movie; +export default Movie; diff --git a/src/tmdb/types/person.js b/src/tmdb/types/person.js index 2cd24d9..cf8e166 100644 --- a/src/tmdb/types/person.js +++ b/src/tmdb/types/person.js @@ -69,4 +69,4 @@ class Person { } } -module.exports = Person; +export default Person; diff --git a/src/tmdb/types/releaseDates.js b/src/tmdb/types/releaseDates.js index 94ffa31..0464ab6 100644 --- a/src/tmdb/types/releaseDates.js +++ b/src/tmdb/types/releaseDates.js @@ -89,4 +89,4 @@ class ReleaseDates { } } -module.exports = ReleaseDates; +export default ReleaseDates; diff --git a/src/tmdb/types/show.js b/src/tmdb/types/show.js index cbbf434..a0f1113 100644 --- a/src/tmdb/types/show.js +++ b/src/tmdb/types/show.js @@ -86,4 +86,4 @@ class Show { } } -module.exports = Show; +export default Show; diff --git a/src/user/token.js b/src/user/token.js index 3f80aad..664565b 100644 --- a/src/user/token.js +++ b/src/user/token.js @@ -1,5 +1,5 @@ -const jwt = require("jsonwebtoken"); -const User = require("./user"); +import jwt from "jsonwebtoken"; +import User from "./user"; class Token { constructor(user, admin = false, settings = null) { @@ -38,4 +38,4 @@ class Token { } } -module.exports = Token; +export default Token; diff --git a/src/user/user.js b/src/user/user.js index 0c24602..ad82b79 100644 --- a/src/user/user.js +++ b/src/user/user.js @@ -5,4 +5,4 @@ class User { } } -module.exports = User; +export default User; diff --git a/src/user/userRepository.js b/src/user/userRepository.js index d23f0d4..97c8e41 100644 --- a/src/user/userRepository.js +++ b/src/user/userRepository.js @@ -1,5 +1,5 @@ -const assert = require("assert"); -const establishedDatabase = require("../database/database"); +import assert from "assert"; +import establishedDatabase from "../database/database"; class LinkPlexUserError extends Error { constructor(errorMessage = null) { @@ -263,4 +263,4 @@ class UserRepository { } } -module.exports = UserRepository; +export default UserRepository; diff --git a/src/user/userSecurity.js b/src/user/userSecurity.js index 5caef59..6042a04 100644 --- a/src/user/userSecurity.js +++ b/src/user/userSecurity.js @@ -1,5 +1,5 @@ -const bcrypt = require("bcrypt"); -const UserRepository = require("./userRepository"); +import bcrypt from "bcrypt"; +import UserRepository from "./userRepository"; class UserSecurity { constructor(database) { @@ -72,4 +72,4 @@ class UserSecurity { } } -module.exports = UserSecurity; +export default UserSecurity; diff --git a/src/webserver/app.js b/src/webserver/app.js index dcbe080..bf98d9d 100644 --- a/src/webserver/app.js +++ b/src/webserver/app.js @@ -1,19 +1,69 @@ -const express = require("express"); -const Raven = require("raven"); -const cookieParser = require("cookie-parser"); -const bodyParser = require("body-parser"); +import express from "express"; +import Raven from "raven"; +import cookieParser from "cookie-parser"; +import bodyParser from "body-parser"; -const configuration = require("../config/configuration").getInstance(); +import Configuration from "../config/configuration"; -const reqTokenToUser = require("./middleware/reqTokenToUser"); -const mustBeAuthenticated = require("./middleware/mustBeAuthenticated"); -const mustBeAdmin = require("./middleware/mustBeAdmin"); -const mustHaveAccountLinkedToPlex = require("./middleware/mustHaveAccountLinkedToPlex"); +import reqTokenToUser from "./middleware/reqTokenToUser"; +import mustBeAuthenticated from "./middleware/mustBeAuthenticated"; +import mustBeAdmin from "./middleware/mustBeAdmin"; +import mustHaveAccountLinkedToPlex from "./middleware/mustHaveAccountLinkedToPlex"; -const listController = require("./controllers/list/listController"); -const tautulli = require("./controllers/user/viewHistory"); -const SettingsController = require("./controllers/user/settings"); -const AuthenticatePlexAccountController = require("./controllers/user/authenticatePlexAccount"); +import listController from "./controllers/list/listController"; +import tautulli from "./controllers/user/viewHistory"; +import SettingsController from "./controllers/user/settings"; +import AuthenticatePlexAccountController from "./controllers/user/authenticatePlexAccount"; + +const configuration = Configuration.getInstance(); + +import UserRegisterController from "./controller/user/register"; +import UserLoginController from "./controller/user/login"; +import UserLogoutController from "./controller/user/logout"; +import UserSearchHistoryController from "./controllers/user/searchHistory"; +import UserRequestsController from "./controllers/user/requests"; + +import SearchMultiController from "./controllers/search/multiSearch"; +import SearchMovieController from "./controllers/search/movieSearch"; +import SearchShowController from "./controllers/search/showSearch"; +import SearchPersonController from "./controllers/search/personSearch"; + +import MovieCreditsController from "./controllers/movie/credits"; +import MovieReleaseDatesController from "./controllers/movie/releaseDates"; +import MovieInfoController from "./controllers/movie/info"; + +import ShowCreditsController from "./controllers/show/credits"; +import ShowInfoController from "./controllers/show/info"; + +import PersonCreditsController from "./controllers/person/credits"; +import PersonInfoController from "./controllers/person/info"; + +import SeasonedAllController from "./controllers/seasoned/readStrays"; +import SeasonedInfoController from "./controllers/seasoned/strayById"; +import SeasonedVerifyController from "./controllers/seasoned/verifyStray"; + +import PlexSearchController from "./controllers/plex/search"; +import PlexRequestsAllController from "./controllres/plex/requests/all"; +import PlexRequestsInfo from "./controllers/plex/updateRequested"; +import PlexWatchLinkController from "./controllers/plex/watchDirectLink"; +import PlexHookController from "./controllers/plex/hookDump"; +import PlexSubmitRequestController from "./controllers/plex/submitRequest"; +import PlexRequestInfo from "./controllers/plex/readRequest"; +import PlexSearchRequestController from "./controllers/plex/searchRequest"; +import PlexPlayingController from "./controllers/plex/plexPlaying"; +import PlexSearchMediaController from "./controllres/plex/searchMedia"; +import PlexUpdateRequestedController from "./controllers/plex/updateRequested"; + +import RequestFetchAllController from "./controllers/request/fetchAllRequests"; +import RequestAllController from "./controllers/plex/fetchRequested"; +import RequestInfoController from "./controllers/request/getRequest"; +import RequestSubmitController from "./controllers/request/requestTmdbId"; + +import PirateSearchController from "./controllers/pirate/search"; +import PirateAddController from "./controllers/pirate/addMagnet"; + +import GitDumpController from "./controllres/git/dump"; +import EmojiController from "./controllers/misc/emoji"; // TODO: Have our raven router check if there is a value, if not don't enable raven. Raven.config(configuration.get("raven", "DSN")).install(); @@ -65,9 +115,9 @@ router.get("/", (req, res) => { /** * User */ -router.post("/v1/user", require("./controllers/user/register")); -router.post("/v1/user/login", require("./controllers/user/login")); -router.post("/v1/user/logout", require("./controllers/user/logout")); +router.post("/v1/user", UserRegisterController); +router.post("/v1/user/login", UserLoginController); +router.post("/v1/user/logout", UserLogoutController); router.get( "/v1/user/settings", @@ -82,13 +132,9 @@ router.put( router.get( "/v1/user/search_history", mustBeAuthenticated, - require("./controllers/user/searchHistory") -); -router.get( - "/v1/user/requests", - mustBeAuthenticated, - require("./controllers/user/requests") + UserSearchHistoryController ); +router.get("/v1/user/requests", mustBeAuthenticated, UserRequestsController); router.post( "/v1/user/link_plex", @@ -125,111 +171,80 @@ router.get( /** * Seasoned */ -router.get("/v1/seasoned/all", require("./controllers/seasoned/readStrays")); -router.get( - "/v1/seasoned/:strayId", - require("./controllers/seasoned/strayById") -); -router.post( - "/v1/seasoned/verify/:strayId", - require("./controllers/seasoned/verifyStray") -); +router.get("/v1/seasoned/all", SeasonedAllController); +router.get("/v1/seasoned/:strayId", SeasonedInfoController); +router.post("/v1/seasoned/verify/:strayId", SeasonedVerifyController); -router.get("/v2/search/", require("./controllers/search/multiSearch")); -router.get("/v2/search/movie", require("./controllers/search/movieSearch")); -router.get("/v2/search/show", require("./controllers/search/showSearch")); -router.get("/v2/search/person", require("./controllers/search/personSearch")); +router.get("/v2/search/", SearchMultiController); +router.get("/v2/search/movie", SearchMovieController); +router.get("/v2/search/show", SearchShowController); +router.get("/v2/search/person", SearchPersonController); router.get("/v2/movie/now_playing", listController.nowPlayingMovies); router.get("/v2/movie/popular", listController.popularMovies); router.get("/v2/movie/top_rated", listController.topRatedMovies); router.get("/v2/movie/upcoming", listController.upcomingMovies); -router.get("/v2/movie/:id/credits", require("./controllers/movie/credits")); -router.get( - "/v2/movie/:id/release_dates", - require("./controllers/movie/releaseDates") -); -router.get("/v2/movie/:id", require("./controllers/movie/info")); - +router.get("/v2/movie/:id/credits", MovieCreditsController); +router.get("/v2/movie/:id/release_dates", MovieReleaseDatesController); +router.get("/v2/movie/:id", MovieInfoController); router.get("/v2/show/now_playing", listController.nowPlayingShows); router.get("/v2/show/popular", listController.popularShows); router.get("/v2/show/top_rated", listController.topRatedShows); -router.get("/v2/show/:id/credits", require("./controllers/show/credits")); -router.get("/v2/show/:id", require("./controllers/show/info")); +router.get("/v2/show/:id/credits", ShowCreditsController); +router.get("/v2/show/:id", ShowInfoController); -router.get("/v2/person/:id/credits", require("./controllers/person/credits")); -router.get("/v2/person/:id", require("./controllers/person/info")); +router.get("/v2/person/:id/credits", PersonCreditsController); +router.get("/v2/person/:id", PersonInfoController); /** * Plex */ -router.get("/v2/plex/search", require("./controllers/plex/search")); +router.get("/v2/plex/search", PlexSearchController); /** * List */ -router.get("/v1/plex/search", require("./controllers/plex/searchMedia")); -router.get("/v1/plex/playing", require("./controllers/plex/plexPlaying")); -router.get("/v1/plex/request", require("./controllers/plex/searchRequest")); -router.get( - "/v1/plex/request/:mediaId", - require("./controllers/plex/readRequest") -); -router.post( - "/v1/plex/request/:mediaId", - require("./controllers/plex/submitRequest") -); -router.post("/v1/plex/hook", require("./controllers/plex/hookDump")); +router.get("/v1/plex/search", PlexSearchMediaController); +router.get("/v1/plex/playing", PlexPlayingController); +router.get("/v1/plex/request", PlexSearchRequestController); +router.get("/v1/plex/request/:mediaId", PlexRequestInfo); +router.post("/v1/plex/request/:mediaId", PlexSubmitRequestController); +router.post("/v1/plex/hook", PlexHookController); -router.get( - "/v1/plex/watch-link", - mustBeAuthenticated, - require("./controllers/plex/watchDirectLink") -); +router.get("/v1/plex/watch-link", mustBeAuthenticated, PlexWatchLinkController); /** * Requests */ -router.get("/v2/request", require("./controllers/request/fetchAllRequests")); -router.get("/v2/request/:id", require("./controllers/request/getRequest")); -router.post("/v2/request", require("./controllers/request/requestTmdbId")); -router.get( - "/v1/plex/requests/all", - require("./controllers/plex/fetchRequested") -); +router.get("/v2/request", RequestFetchAllController); +router.get("/v2/request/:id", RequestInfoController); +router.post("/v2/request", RequestSubmitController); +router.get("/v1/plex/requests/all", RequestAllController); router.put( "/v1/plex/request/:requestId", mustBeAuthenticated, - require("./controllers/plex/updateRequested") + PlexUpdateRequestedController ); /** * Pirate */ -router.get( - "/v1/pirate/search", - mustBeAdmin, - require("./controllers/pirate/searchTheBay") -); -router.post( - "/v1/pirate/add", - mustBeAdmin, - require("./controllers/pirate/addMagnet") -); +router.get("/v1/pirate/search", mustBeAdmin, PirateSearchController); +router.post("/v1/pirate/add", mustBeAdmin, PirateAddController); /** * git */ -router.post("/v1/git/dump", require("./controllers/git/dumpHook")); +router.post("/v1/git/dump", GitDumpController); /** * misc */ -router.get("/v1/emoji", require("./controllers/misc/emoji")); +router.get("/v1/emoji", EmojiController); // REGISTER OUR ROUTES ------------------------------- // all of our routes will be prefixed with /api app.use("/api", router); -module.exports = app; +export default app; diff --git a/src/webserver/controllers/git/dumpHook.js b/src/webserver/controllers/git/dumpHook.js index 5016893..d7f4208 100644 --- a/src/webserver/controllers/git/dumpHook.js +++ b/src/webserver/controllers/git/dumpHook.js @@ -1,4 +1,4 @@ -const GitRepository = require("../../../git/gitRepository"); +import GitRepository from "../../../git/gitRepository"; const gitRepository = new GitRepository(); @@ -9,4 +9,4 @@ function dumpHookController(req, res) { .catch(() => res.status(500)); } -module.exports = dumpHookController; +export default dumpHookController; diff --git a/src/webserver/controllers/list/listController.js b/src/webserver/controllers/list/listController.js index 298dccf..0715103 100644 --- a/src/webserver/controllers/list/listController.js +++ b/src/webserver/controllers/list/listController.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); // there should be a translate function from query params to @@ -50,27 +51,17 @@ function fetchTmdbList(req, res, listname, type) { ); } -const nowPlayingMovies = (req, res) => +export const nowPlayingMovies = (req, res) => fetchTmdbList(req, res, "miscNowPlayingMovies", "movie"); -const popularMovies = (req, res) => +export const popularMovies = (req, res) => fetchTmdbList(req, res, "miscPopularMovies", "movie"); -const topRatedMovies = (req, res) => +export const topRatedMovies = (req, res) => fetchTmdbList(req, res, "miscTopRatedMovies", "movie"); -const upcomingMovies = (req, res) => +export const upcomingMovies = (req, res) => fetchTmdbList(req, res, "miscUpcomingMovies", "movie"); -const nowPlayingShows = (req, res) => +export const nowPlayingShows = (req, res) => fetchTmdbList(req, res, "tvOnTheAir", "show"); -const popularShows = (req, res) => +export const popularShows = (req, res) => fetchTmdbList(req, res, "miscPopularTvs", "show"); -const topRatedShows = (req, res) => +export const topRatedShows = (req, res) => fetchTmdbList(req, res, "miscTopRatedTvs", "show"); - -module.exports = { - nowPlayingMovies, - popularMovies, - topRatedMovies, - upcomingMovies, - nowPlayingShows, - popularShows, - topRatedShows -}; diff --git a/src/webserver/controllers/misc/emoji.js b/src/webserver/controllers/misc/emoji.js index fbc7086..68b2764 100644 --- a/src/webserver/controllers/misc/emoji.js +++ b/src/webserver/controllers/misc/emoji.js @@ -16,12 +16,10 @@ const randomEmoji = () => { * @param {Response} res * @returns {Callback} */ -function emojiController(req, res) { +export default function emojiController(req, res) { res.send({ success: true, emoji: randomEmoji(), message: "Happy emoji-ing! 🌝" }); } - -module.exports = emojiController; diff --git a/src/webserver/controllers/movie/credits.js b/src/webserver/controllers/movie/credits.js index ad467dd..ff4f5fd 100644 --- a/src/webserver/controllers/movie/credits.js +++ b/src/webserver/controllers/movie/credits.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const movieCreditsController = (req, res) => { @@ -19,4 +20,4 @@ const movieCreditsController = (req, res) => { }); }; -module.exports = movieCreditsController; +export default movieCreditsController; diff --git a/src/webserver/controllers/movie/info.js b/src/webserver/controllers/movie/info.js index aa6b486..3865c53 100644 --- a/src/webserver/controllers/movie/info.js +++ b/src/webserver/controllers/movie/info.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const Plex = require("../../../plex/plex"); +import TMDB from "../../../tmdb/tmdb"; +import Plex from "../../../plex/plex"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const plex = new Plex(configuration.get("plex", "ip")); @@ -52,4 +53,4 @@ async function movieInfoController(req, res) { } } -module.exports = movieInfoController; +export default movieInfoController; diff --git a/src/webserver/controllers/movie/releaseDates.js b/src/webserver/controllers/movie/releaseDates.js index 74ad3d8..fcff8f2 100644 --- a/src/webserver/controllers/movie/releaseDates.js +++ b/src/webserver/controllers/movie/releaseDates.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const movieReleaseDatesController = (req, res) => { @@ -19,4 +20,4 @@ const movieReleaseDatesController = (req, res) => { }); }; -module.exports = movieReleaseDatesController; +export default movieReleaseDatesController; diff --git a/src/webserver/controllers/person/credits.js b/src/webserver/controllers/person/credits.js index 72d9c5a..537d299 100644 --- a/src/webserver/controllers/person/credits.js +++ b/src/webserver/controllers/person/credits.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; -const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); +const configuration = Configuration.getInstance(); +const tmdb = new TMDB(Configuration.get("tmdb", "apiKey")); const personCreditsController = (req, res) => { const personId = req.params.id; @@ -19,4 +20,4 @@ const personCreditsController = (req, res) => { }); }; -module.exports = personCreditsController; +export default personCreditsController; diff --git a/src/webserver/controllers/person/info.js b/src/webserver/controllers/person/info.js index 5a00102..7543cdf 100644 --- a/src/webserver/controllers/person/info.js +++ b/src/webserver/controllers/person/info.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); /** @@ -36,4 +37,4 @@ async function personInfoController(req, res) { } } -module.exports = personInfoController; +export default personInfoController; diff --git a/src/webserver/controllers/pirate/addMagnet.js b/src/webserver/controllers/pirate/addMagnet.js index 2ff7599..3a20adf 100644 --- a/src/webserver/controllers/pirate/addMagnet.js +++ b/src/webserver/controllers/pirate/addMagnet.js @@ -5,7 +5,7 @@ * @Last Modified time: 2017-10-21 15:32:43 */ -const PirateRepository = require("../../../pirate/pirateRepository"); +import PirateRepository from "../../../pirate/pirateRepository"; function addMagnet(req, res) { const { magnet, name } = req.body; @@ -18,4 +18,4 @@ function addMagnet(req, res) { }); } -module.exports = addMagnet; +export default addMagnet; diff --git a/src/webserver/controllers/pirate/searchTheBay.js b/src/webserver/controllers/pirate/searchTheBay.js index 84516d4..2c48e09 100644 --- a/src/webserver/controllers/pirate/searchTheBay.js +++ b/src/webserver/controllers/pirate/searchTheBay.js @@ -5,7 +5,7 @@ * @Last Modified time: 2018-02-26 19:56:32 */ -const PirateRepository = require("../../../pirate/pirateRepository"); +import PirateRepository from "../../../pirate/pirateRepository"; // const pirateRepository = new PirateRepository(); /** @@ -26,4 +26,4 @@ function updateRequested(req, res) { }); } -module.exports = updateRequested; +export default updateRequested; diff --git a/src/webserver/controllers/plex/fetchRequested.js b/src/webserver/controllers/plex/fetchRequested.js index 14ba536..c562cb3 100644 --- a/src/webserver/controllers/plex/fetchRequested.js +++ b/src/webserver/controllers/plex/fetchRequested.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../plex/requestRepository"); +import RequestRepository from "../../../plex/requestRepository"; const requestRepository = new RequestRepository(); @@ -26,4 +26,4 @@ function fetchRequestedController(req, res) { }); } -module.exports = fetchRequestedController; +export default fetchRequestedController; diff --git a/src/webserver/controllers/plex/hookDump.js b/src/webserver/controllers/plex/hookDump.js index bd39fcb..12c4ea6 100644 --- a/src/webserver/controllers/plex/hookDump.js +++ b/src/webserver/controllers/plex/hookDump.js @@ -5,4 +5,4 @@ function hookDumpController(req, res) { res.status(200); } -module.exports = hookDumpController; +export default hookDumpController; diff --git a/src/webserver/controllers/plex/plexPlaying.js b/src/webserver/controllers/plex/plexPlaying.js index 4c07c17..287c945 100644 --- a/src/webserver/controllers/plex/plexPlaying.js +++ b/src/webserver/controllers/plex/plexPlaying.js @@ -1,5 +1,7 @@ -const PlexRepository = require("../../../plex/plexRepository"); -const configuration = require("../../../config/configuration").getInstance(); +import PlexRepository from "../../../plex/plexRepository"; +import Configuration from "../../../config/configuration"; + +const configuration = Configuration.getInstance(); const plexRepository = new PlexRepository( configuration.get("plex", "ip"), diff --git a/src/webserver/controllers/plex/readRequest.js b/src/webserver/controllers/plex/readRequest.js index 04d8c98..4153eda 100644 --- a/src/webserver/controllers/plex/readRequest.js +++ b/src/webserver/controllers/plex/readRequest.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../plex/requestRepository"); +import RequestRepository from "../../../plex/requestRepository"; const requestRepository = new RequestRepository(); @@ -21,4 +21,4 @@ function readRequestController(req, res) { }); } -module.exports = readRequestController; +export default readRequestController; diff --git a/src/webserver/controllers/plex/search.js b/src/webserver/controllers/plex/search.js index 50162e9..b01d469 100644 --- a/src/webserver/controllers/plex/search.js +++ b/src/webserver/controllers/plex/search.js @@ -1,5 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const Plex = require("../../../plex/plex"); +import Plex from "../../../plex/plex"; +import Configuration from "../../../config/configuration"; + +const configuration = Configuration.getInstance(); const plex = new Plex(configuration.get("plex", "ip")); @@ -28,4 +30,4 @@ function searchPlexController(req, res) { }); } -module.exports = searchPlexController; +export default searchPlexController; diff --git a/src/webserver/controllers/plex/searchMedia.js b/src/webserver/controllers/plex/searchMedia.js index 07d941d..e98d10e 100644 --- a/src/webserver/controllers/plex/searchMedia.js +++ b/src/webserver/controllers/plex/searchMedia.js @@ -1,5 +1,7 @@ -const PlexRepository = require("../../../plex/plexRepository"); -const configuration = require("../../../config/configuration").getInstance(); +import PlexRepository from "../../../plex/plexRepository"; +import Configuration from "../../../config/configuration"; + +const configuration = Configuration.getInstance(); const plexRepository = new PlexRepository( configuration.get("plex", "ip"), @@ -33,4 +35,4 @@ function searchMediaController(req, res) { }); } -module.exports = searchMediaController; +export default searchMediaController; diff --git a/src/webserver/controllers/plex/searchRequest.js b/src/webserver/controllers/plex/searchRequest.js index b7ce101..0020078 100644 --- a/src/webserver/controllers/plex/searchRequest.js +++ b/src/webserver/controllers/plex/searchRequest.js @@ -1,6 +1,6 @@ -const SearchHistory = require("../../../searchHistory/searchHistory"); -const Cache = require("../../../tmdb/cache"); -const RequestRepository = require("../../../plex/requestRepository"); +import SearchHistory from "../../../searchHistory/searchHistory"; +import Cache from "../../../tmdb/cache"; +import RequestRepository from "../../../plex/requestRepository"; const cache = new Cache(); const requestRepository = new RequestRepository(cache); @@ -21,4 +21,4 @@ function searchRequestController(req, res) { }); } -module.exports = searchRequestController; +export default searchRequestController; diff --git a/src/webserver/controllers/plex/submitRequest.js b/src/webserver/controllers/plex/submitRequest.js index 6039c47..c5b0737 100644 --- a/src/webserver/controllers/plex/submitRequest.js +++ b/src/webserver/controllers/plex/submitRequest.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const RequestRepository = require("../../../request/request"); -const TMDB = require("../../../tmdb/tmdb"); +import RequestRepository from "../../../request/request"; +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const request = new RequestRepository(); @@ -57,4 +58,4 @@ function submitRequestController(req, res) { ); } -module.exports = submitRequestController; +export default submitRequestController; diff --git a/src/webserver/controllers/plex/updateRequested.js b/src/webserver/controllers/plex/updateRequested.js index 0fd4b18..5209765 100644 --- a/src/webserver/controllers/plex/updateRequested.js +++ b/src/webserver/controllers/plex/updateRequested.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../plex/requestRepository"); +import RequestRepository from "../../../plex/requestRepository"; const requestRepository = new RequestRepository(); @@ -23,4 +23,4 @@ function updateRequested(req, res) { }); } -module.exports = updateRequested; +export default updateRequested; diff --git a/src/webserver/controllers/plex/watchDirectLink.js b/src/webserver/controllers/plex/watchDirectLink.js index dabee21..70c2d82 100644 --- a/src/webserver/controllers/plex/watchDirectLink.js +++ b/src/webserver/controllers/plex/watchDirectLink.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const Plex = require("../../../plex/plex"); +import Plex from "../../../plex/plex"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const plex = new Plex(configuration.get("plex", "ip")); /** @@ -25,4 +26,4 @@ function watchDirectLink(req, res) { }); } -module.exports = watchDirectLink; +export default watchDirectLink; diff --git a/src/webserver/controllers/request/fetchAllRequests.js b/src/webserver/controllers/request/fetchAllRequests.js index 252d76f..88fa757 100644 --- a/src/webserver/controllers/request/fetchAllRequests.js +++ b/src/webserver/controllers/request/fetchAllRequests.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../request/request"); +import RequestRepository from "../../../request/request"; const request = new RequestRepository(); @@ -24,4 +24,4 @@ function fetchAllRequests(req, res) { }); } -module.exports = fetchAllRequests; +export default fetchAllRequests; diff --git a/src/webserver/controllers/request/getRequest.js b/src/webserver/controllers/request/getRequest.js index d73f091..10b0122 100644 --- a/src/webserver/controllers/request/getRequest.js +++ b/src/webserver/controllers/request/getRequest.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../request/request"); +import RequestRepository from "../../../request/request"; const request = new RequestRepository(); @@ -37,4 +37,4 @@ function fetchAllRequests(req, res) { }); } -module.exports = fetchAllRequests; +export default fetchAllRequests; diff --git a/src/webserver/controllers/request/requestTmdbId.js b/src/webserver/controllers/request/requestTmdbId.js index 01d5c1a..d113a01 100644 --- a/src/webserver/controllers/request/requestTmdbId.js +++ b/src/webserver/controllers/request/requestTmdbId.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const RequestRepository = require("../../../request/request"); +import TMDB from "../../../tmdb/tmdb"; +import RequestRepository from "../../../request/request"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const request = new RequestRepository(); // const { sendSMS } = require("src/notifications/sms"); @@ -65,4 +66,4 @@ function requestTmdbIdController(req, res) { }); } -module.exports = requestTmdbIdController; +export default requestTmdbIdController; diff --git a/src/webserver/controllers/search/movieSearch.js b/src/webserver/controllers/search/movieSearch.js index d863cc4..01f9900 100644 --- a/src/webserver/controllers/search/movieSearch.js +++ b/src/webserver/controllers/search/movieSearch.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const SearchHistory = require("../../../searchHistory/searchHistory"); +import TMDB from "../../../tmdb/tmdb"; +import SearchHistory from "../../../searchHistory/searchHistory"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const searchHistory = new SearchHistory(); @@ -33,4 +34,4 @@ function movieSearchController(req, res) { }); } -module.exports = movieSearchController; +export default movieSearchController; diff --git a/src/webserver/controllers/search/multiSearch.js b/src/webserver/controllers/search/multiSearch.js index f16ce30..5490249 100644 --- a/src/webserver/controllers/search/multiSearch.js +++ b/src/webserver/controllers/search/multiSearch.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const SearchHistory = require("../../../searchHistory/searchHistory"); +import TMDB from "../../../tmdb/tmdb"; +import SearchHistory from "../../../searchHistory/searchHistory"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const searchHistory = new SearchHistory(); @@ -33,4 +34,4 @@ function multiSearchController(req, res) { }); } -module.exports = multiSearchController; +export default multiSearchController; diff --git a/src/webserver/controllers/search/personSearch.js b/src/webserver/controllers/search/personSearch.js index 838bed0..c44fbea 100644 --- a/src/webserver/controllers/search/personSearch.js +++ b/src/webserver/controllers/search/personSearch.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const SearchHistory = require("../../../searchHistory/searchHistory"); +import TMDB from "../../../tmdb/tmdb"; +import SearchHistory from "../../../searchHistory/searchHistory"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const searchHistory = new SearchHistory(); @@ -33,4 +34,4 @@ function personSearchController(req, res) { }); } -module.exports = personSearchController; +export default personSearchController; diff --git a/src/webserver/controllers/search/showSearch.js b/src/webserver/controllers/search/showSearch.js index 534d1d0..f349180 100644 --- a/src/webserver/controllers/search/showSearch.js +++ b/src/webserver/controllers/search/showSearch.js @@ -1,7 +1,8 @@ -const SearchHistory = require("../../../searchHistory/searchHistory"); -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import SearchHistory from "../../../searchHistory/searchHistory"; +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const searchHistory = new SearchHistory(); @@ -35,4 +36,4 @@ function showSearchController(req, res) { }); } -module.exports = showSearchController; +export default showSearchController; diff --git a/src/webserver/controllers/seasoned/readStrays.js b/src/webserver/controllers/seasoned/readStrays.js index c07e7a7..845f9c5 100644 --- a/src/webserver/controllers/seasoned/readStrays.js +++ b/src/webserver/controllers/seasoned/readStrays.js @@ -1,4 +1,4 @@ -const StrayRepository = require("../../../seasoned/strayRepository"); +import StrayRepository from "../../../seasoned/strayRepository"; const strayRepository = new StrayRepository(); @@ -14,4 +14,4 @@ function readStraysController(req, res) { }); } -module.exports = readStraysController; +export default readStraysController; diff --git a/src/webserver/controllers/seasoned/strayById.js b/src/webserver/controllers/seasoned/strayById.js index 387bce8..9f5491c 100644 --- a/src/webserver/controllers/seasoned/strayById.js +++ b/src/webserver/controllers/seasoned/strayById.js @@ -1,4 +1,4 @@ -const StrayRepository = require("../../../seasoned/strayRepository"); +import StrayRepository from "../../../seasoned/strayRepository"; const strayRepository = new StrayRepository(); @@ -15,4 +15,4 @@ function strayByIdController(req, res) { }); } -module.exports = strayByIdController; +export default strayByIdController; diff --git a/src/webserver/controllers/seasoned/verifyStray.js b/src/webserver/controllers/seasoned/verifyStray.js index cb7cf6d..7ddef74 100644 --- a/src/webserver/controllers/seasoned/verifyStray.js +++ b/src/webserver/controllers/seasoned/verifyStray.js @@ -1,4 +1,4 @@ -const StrayRepository = require("../../../seasoned/strayRepository"); +import StrayRepository from "../../../seasoned/strayRepository"; const strayRepository = new StrayRepository(); @@ -15,4 +15,4 @@ function verifyStrayController(req, res) { }); } -module.exports = verifyStrayController; +export default verifyStrayController; diff --git a/src/webserver/controllers/show/credits.js b/src/webserver/controllers/show/credits.js index 672f3e8..6a2cc2e 100644 --- a/src/webserver/controllers/show/credits.js +++ b/src/webserver/controllers/show/credits.js @@ -1,6 +1,7 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); +import TMDB from "../../../tmdb/tmdb"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const showCreditsController = (req, res) => { @@ -19,4 +20,4 @@ const showCreditsController = (req, res) => { }); }; -module.exports = showCreditsController; +export default showCreditsController; diff --git a/src/webserver/controllers/show/info.js b/src/webserver/controllers/show/info.js index 68f7301..b3ef032 100644 --- a/src/webserver/controllers/show/info.js +++ b/src/webserver/controllers/show/info.js @@ -1,7 +1,8 @@ -const configuration = require("../../../config/configuration").getInstance(); -const TMDB = require("../../../tmdb/tmdb"); -const Plex = require("../../../plex/plex"); +import TMDB from "../../../tmdb/tmdb"; +import Plex from "../../../plex/plex"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const tmdb = new TMDB(configuration.get("tmdb", "apiKey")); const plex = new Plex(configuration.get("plex", "ip")); @@ -47,4 +48,4 @@ async function showInfoController(req, res) { } } -module.exports = showInfoController; +export default showInfoController; diff --git a/src/webserver/controllers/user/authenticatePlexAccount.js b/src/webserver/controllers/user/authenticatePlexAccount.js index 8ac5896..2c7400f 100644 --- a/src/webserver/controllers/user/authenticatePlexAccount.js +++ b/src/webserver/controllers/user/authenticatePlexAccount.js @@ -1,5 +1,5 @@ -const FormData = require("form-data"); -const UserRepository = require("../../../user/userRepository"); +import FormData from "form-data"; +import UserRepository from "../../../user/userRepository"; const userRepository = new UserRepository(); @@ -67,7 +67,7 @@ function plexAuthenticate(username, password) { return fetch(url, options).then(resp => handleResponse(resp)); } -function link(req, res) { +export function link(req, res) { const user = req.loggedInUser; const { username, password } = req.body; @@ -80,10 +80,19 @@ function link(req, res) { "Successfully authenticated and linked plex account with seasoned request." }) ) - .catch(error => handleError(error, res)); + .catch(error => + res.status(error?.statusCode || 500).send({ + message: + error?.message || + "Unexptected error occured while linking plex account", + success: error?.success || false, + source: error?.source, + errorResponse: error?.errorResponse + }) + ); } -function unlink(req, res) { +export function unlink(req, res) { const username = req.loggedInUser ? req.loggedInUser.username : null; return userRepository @@ -94,10 +103,14 @@ function unlink(req, res) { message: "Successfully unlinked plex account from seasoned request." }) ) - .catch(error => handleError(error, res)); + .catch(error => + res.status(error?.statusCode || 500).send({ + message: + error?.message || + "Unexptected error occured while unlinking plex account", + success: error?.success || false, + source: error?.source, + errorResponse: error?.errorResponse + }) + ); } - -module.exports = { - link, - unlink -}; diff --git a/src/webserver/controllers/user/login.js b/src/webserver/controllers/user/login.js index 0438a89..e8a2d58 100644 --- a/src/webserver/controllers/user/login.js +++ b/src/webserver/controllers/user/login.js @@ -1,9 +1,10 @@ -const User = require("../../../user/user"); -const Token = require("../../../user/token"); -const UserSecurity = require("../../../user/userSecurity"); -const UserRepository = require("../../../user/userRepository"); -const configuration = require("../../../config/configuration").getInstance(); +import User from "../../../user/user"; +import Token from "../../../user/token"; +import UserSecurity from "../../../user/userSecurity"; +import UserRepository from "../../../user/userRepository"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const secret = configuration.get("authentication", "secret"); const userSecurity = new UserSecurity(); const userRepository = new UserRepository(); @@ -54,4 +55,4 @@ async function loginController(req, res) { } } -module.exports = loginController; +export default loginController; diff --git a/src/webserver/controllers/user/logout.js b/src/webserver/controllers/user/logout.js index 60e4e58..30aa520 100644 --- a/src/webserver/controllers/user/logout.js +++ b/src/webserver/controllers/user/logout.js @@ -13,4 +13,4 @@ async function logoutController(req, res) { }); } -module.exports = logoutController; +export default logoutController; diff --git a/src/webserver/controllers/user/register.js b/src/webserver/controllers/user/register.js index 655f920..47b5430 100644 --- a/src/webserver/controllers/user/register.js +++ b/src/webserver/controllers/user/register.js @@ -1,8 +1,9 @@ -const User = require("../../../user/user"); -const Token = require("../../../user/token"); -const UserSecurity = require("../../../user/userSecurity"); -const configuration = require("../../../config/configuration").getInstance(); +import User from "../../../user/user"; +import Token from "../../../user/token"; +import UserSecurity from "../../../user/userSecurity"; +import Configuration from "../../../config/configuration"; +const configuration = Configuration.getInstance(); const secret = configuration.get("authentication", "secret"); const userSecurity = new UserSecurity(); @@ -42,4 +43,4 @@ function registerController(req, res) { }); } -module.exports = registerController; +export default registerController; diff --git a/src/webserver/controllers/user/requests.js b/src/webserver/controllers/user/requests.js index 5fe0f22..e4c1ac6 100644 --- a/src/webserver/controllers/user/requests.js +++ b/src/webserver/controllers/user/requests.js @@ -1,4 +1,4 @@ -const RequestRepository = require("../../../plex/requestRepository"); +import RequestRepository from "../../../plex/requestRepository"; const requestRepository = new RequestRepository(); @@ -25,4 +25,4 @@ function requestsController(req, res) { }); } -module.exports = requestsController; +export default requestsController; diff --git a/src/webserver/controllers/user/searchHistory.js b/src/webserver/controllers/user/searchHistory.js index 2d6b70a..37e3193 100644 --- a/src/webserver/controllers/user/searchHistory.js +++ b/src/webserver/controllers/user/searchHistory.js @@ -1,4 +1,4 @@ -const SearchHistory = require("../../../searchHistory/searchHistory"); +import SearchHistory from "../../../searchHistory/searchHistory"; const searchHistory = new SearchHistory(); @@ -21,4 +21,4 @@ function historyController(req, res) { }); } -module.exports = historyController; +export default historyController; diff --git a/src/webserver/controllers/user/settings.js b/src/webserver/controllers/user/settings.js index adf0d8d..92fc58b 100644 --- a/src/webserver/controllers/user/settings.js +++ b/src/webserver/controllers/user/settings.js @@ -1,4 +1,4 @@ -const UserRepository = require("../../../user/userRepository"); +import UserRepository from "../../../user/userRepository"; const userRepository = new UserRepository(); /** @@ -7,7 +7,7 @@ const userRepository = new UserRepository(); * @param {Response} res * @returns {Callback} */ -const getSettingsController = (req, res) => { +export function getSettingsController(req, res) { const username = req.loggedInUser ? req.loggedInUser.username : null; userRepository @@ -18,9 +18,9 @@ const getSettingsController = (req, res) => { .catch(error => { res.status(404).send({ success: false, message: error.message }); }); -}; +} -const updateSettingsController = (req, res) => { +export function updateSettingsController(req, res) { const username = req.loggedInUser ? req.loggedInUser.username : null; // const idempotencyKey = req.headers("Idempotency-Key"); // TODO implement better transactions @@ -35,9 +35,4 @@ const updateSettingsController = (req, res) => { .catch(error => { res.status(404).send({ success: false, message: error.message }); }); -}; - -module.exports = { - getSettingsController, - updateSettingsController -}; +} diff --git a/src/webserver/middleware/mustBeAdmin.js b/src/webserver/middleware/mustBeAdmin.js index 89e82a6..a91b56e 100644 --- a/src/webserver/middleware/mustBeAdmin.js +++ b/src/webserver/middleware/mustBeAdmin.js @@ -1,4 +1,4 @@ -const establishedDatabase = require("../../database/database"); +import establishedDatabase from "../../database/database"; // eslint-disable-next-line consistent-return const mustBeAdmin = (req, res, next) => { @@ -28,4 +28,4 @@ const mustBeAdmin = (req, res, next) => { }); }; -module.exports = mustBeAdmin; +export default mustBeAdmin; diff --git a/src/webserver/middleware/mustBeAuthenticated.js b/src/webserver/middleware/mustBeAuthenticated.js index 4cbd8eb..63f664c 100644 --- a/src/webserver/middleware/mustBeAuthenticated.js +++ b/src/webserver/middleware/mustBeAuthenticated.js @@ -10,4 +10,4 @@ const mustBeAuthenticated = (req, res, next) => { next(); }; -module.exports = mustBeAuthenticated; +export default mustBeAuthenticated; diff --git a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js index 95fd3cc..219cbf7 100644 --- a/src/webserver/middleware/mustHaveAccountLinkedToPlex.js +++ b/src/webserver/middleware/mustHaveAccountLinkedToPlex.js @@ -1,4 +1,4 @@ -const establishedDatabase = require("../../database/database"); +import establishedDatabase from "../../database/database"; /* eslint-disable consistent-return */ const mustHaveAccountLinkedToPlex = (req, res, next) => { @@ -33,4 +33,4 @@ const mustHaveAccountLinkedToPlex = (req, res, next) => { }; /* eslint-enable consistent-return */ -module.exports = mustHaveAccountLinkedToPlex; +export default mustHaveAccountLinkedToPlex; diff --git a/src/webserver/middleware/reqTokenToUser.js b/src/webserver/middleware/reqTokenToUser.js index bde99f6..de37af7 100644 --- a/src/webserver/middleware/reqTokenToUser.js +++ b/src/webserver/middleware/reqTokenToUser.js @@ -1,7 +1,8 @@ /* eslint-disable no-param-reassign */ -const configuration = require("../../config/configuration").getInstance(); -const Token = require("../../user/token"); +import Configuration from "../../config/configuration"; +import Token from "../../user/token"; +const configuration = Configuration.getInstance(); const secret = configuration.get("authentication", "secret"); // Token example: @@ -25,4 +26,4 @@ const reqTokenToUser = (req, res, next) => { return next(); }; -module.exports = reqTokenToUser; +export default reqTokenToUser; diff --git a/src/webserver/server.js b/src/webserver/server.js index dae8d96..7e16439 100644 --- a/src/webserver/server.js +++ b/src/webserver/server.js @@ -1,7 +1,9 @@ -const config = require("../config/configuration").getInstance(); -const app = require("./app"); +import Configuration from "../config/configuration"; +import app from "./app"; -module.exports = app.listen(config.get("webserver", "port"), () => { +const configuration = Configuration.getInstance(); + +export default app.listen(config.get("webserver", "port"), () => { /* eslint-disable no-console */ console.log("seasonedAPI"); console.log(`Database is located at ${config.get("database", "host")}`);