From cf8a676e850b3beb665736ddd56cdf08472f242a Mon Sep 17 00:00:00 2001
From: Daniel Shields <d.shieldsuk@gmail.com>
Date: Sun, 9 Jan 2022 14:39:05 +0000
Subject: [PATCH] fix: replace express.Router references with nodecg.Router

---
 services/nodecg-io-googleapis/extension/index.ts | 3 +--
 services/nodecg-io-googleapis/package.json       | 1 -
 services/nodecg-io-spotify/extension/index.ts    | 4 +---
 services/nodecg-io-spotify/package.json          | 1 -
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/nodecg-io-googleapis/extension/index.ts b/services/nodecg-io-googleapis/extension/index.ts
index 755a742d4..b799ad53b 100644
--- a/services/nodecg-io-googleapis/extension/index.ts
+++ b/services/nodecg-io-googleapis/extension/index.ts
@@ -3,7 +3,6 @@ import { Result, emptySuccess, success, error, ServiceBundle, Logger } from "nod
 import { google, GoogleApis } from "googleapis";
 import type { Credentials } from "google-auth-library/build/src/auth/credentials";
 import type { OAuth2Client } from "google-auth-library/build/src/auth/oauth2client";
-import * as express from "express";
 import opn = require("open");
 
 interface GoogleApisServiceConfig {
@@ -49,7 +48,7 @@ class GoogleApisService extends ServiceBundle<GoogleApisServiceConfig, GoogleApi
         });
 
         return new Promise((resolve, reject) => {
-            const router = express.Router();
+            const router = this.nodecg.Router();
 
             router.get("/nodecg-io-googleapis/oauth2callback", async (req, res) => {
                 try {
diff --git a/services/nodecg-io-googleapis/package.json b/services/nodecg-io-googleapis/package.json
index 62fda9360..43d2868c4 100644
--- a/services/nodecg-io-googleapis/package.json
+++ b/services/nodecg-io-googleapis/package.json
@@ -38,7 +38,6 @@
     },
     "dependencies": {
         "@types/gapi": "^0.0.41",
-        "express": "^4.17.2",
         "googleapis": "^92.0.0",
         "nodecg-io-core": "^0.3.0",
         "open": "^8.4.0"
diff --git a/services/nodecg-io-spotify/extension/index.ts b/services/nodecg-io-spotify/extension/index.ts
index c7e01c903..bdc41e0b1 100644
--- a/services/nodecg-io-spotify/extension/index.ts
+++ b/services/nodecg-io-spotify/extension/index.ts
@@ -1,7 +1,5 @@
 import { NodeCG } from "nodecg-types/types/server";
 import { Result, emptySuccess, success, error, ServiceBundle, Logger } from "nodecg-io-core";
-import * as express from "express";
-import { Router } from "express";
 import SpotifyWebApi = require("spotify-web-api-node");
 import open = require("open");
 
@@ -77,7 +75,7 @@ class SpotifyService extends ServiceBundle<SpotifyServiceConfig, SpotifyServiceC
 
     private mountCallBackURL(spotifyApi: SpotifyWebApi, logger: Logger) {
         return new Promise((resolve) => {
-            const router: Router = express.Router();
+            const router = this.nodecg.Router();
 
             router.get(callbackEndpoint, (req, res) => {
                 // Get auth code with is returned as url query parameter if everything was successful
diff --git a/services/nodecg-io-spotify/package.json b/services/nodecg-io-spotify/package.json
index fa063bed6..30605b2bf 100644
--- a/services/nodecg-io-spotify/package.json
+++ b/services/nodecg-io-spotify/package.json
@@ -38,7 +38,6 @@
     },
     "dependencies": {
         "@types/spotify-web-api-node": "^5.0.3",
-        "express": "^4.17.2",
         "nodecg-io-core": "^0.3.0",
         "open": "^8.4.0",
         "spotify-web-api-node": "^5.0.2"