From c1d095b8d939e994b2ee7f2ee1d0d964cd31c081 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sun, 12 Sep 2021 09:56:14 -0400 Subject: [PATCH] Renamed wiiu/3ds services to account/nasc --- src/server.js | 8 ++++---- src/services/{wiiu => account}/index.js | 6 +++--- src/services/{wiiu => account}/routes/admin.js | 0 src/services/{wiiu => account}/routes/content.js | 0 src/services/{wiiu => account}/routes/devices.js | 0 src/services/{wiiu => account}/routes/index.js | 0 src/services/{wiiu => account}/routes/miis.js | 0 src/services/{wiiu => account}/routes/oauth.js | 0 src/services/{wiiu => account}/routes/people.js | 0 .../{wiiu => account}/routes/provider.js | 0 src/services/{wiiu => account}/routes/support.js | 0 src/services/{wiiu => account}/timezones.json | 0 src/services/datastore/index.js | 4 ++-- src/services/{3ds => nasc}/index.js | 16 ++++++++-------- src/services/{3ds => nasc}/routes/ac.js | 0 src/services/{3ds => nasc}/routes/index.js | 0 16 files changed, 17 insertions(+), 17 deletions(-) rename src/services/{wiiu => account}/index.js (79%) rename src/services/{wiiu => account}/routes/admin.js (100%) rename src/services/{wiiu => account}/routes/content.js (100%) rename src/services/{wiiu => account}/routes/devices.js (100%) rename src/services/{wiiu => account}/routes/index.js (100%) rename src/services/{wiiu => account}/routes/miis.js (100%) rename src/services/{wiiu => account}/routes/oauth.js (100%) rename src/services/{wiiu => account}/routes/people.js (100%) rename src/services/{wiiu => account}/routes/provider.js (100%) rename src/services/{wiiu => account}/routes/support.js (100%) rename src/services/{wiiu => account}/timezones.json (100%) rename src/services/{3ds => nasc}/index.js (72%) rename src/services/{3ds => nasc}/routes/ac.js (100%) rename src/services/{3ds => nasc}/routes/index.js (100%) diff --git a/src/server.js b/src/server.js index 985df32..713c453 100644 --- a/src/server.js +++ b/src/server.js @@ -11,8 +11,8 @@ const config = require('./config.json'); const { http: { port } } = config; const app = express(); -const accountWiiU = require('./services/wiiu'); -const account3DS = require('./services/3ds'); +const account = require('./services/account'); +const nasc = require('./services/nasc'); const datastore = require('./services/datastore'); // START APPLICATION @@ -29,8 +29,8 @@ app.use(express.urlencoded({ app.use(xmlparser); // import the servers into one -app.use(accountWiiU); -app.use(account3DS); +app.use(account); +app.use(nasc); app.use(datastore); // 404 handler diff --git a/src/services/wiiu/index.js b/src/services/account/index.js similarity index 79% rename from src/services/wiiu/index.js rename to src/services/account/index.js index 54f6efc..713944f 100644 --- a/src/services/wiiu/index.js +++ b/src/services/account/index.js @@ -9,11 +9,11 @@ const routes = require('./routes'); // Router to handle the subdomain restriction const account = express.Router(); -logger.info('[ACCOUNT - WiiU] Importing middleware'); +logger.info('[ACCOUNT] Importing middleware'); account.use(pnidMiddleware); // Setup routes -logger.info('[ACCOUNT - WiiU] Applying imported routes'); +logger.info('[ACCOUNT] Applying imported routes'); account.use('/v1/api/admin', routes.ADMIN); account.use('/v1/api/content', routes.CONTENT); account.use('/v1/api/devices', routes.DEVICES); @@ -27,7 +27,7 @@ account.use('/v1/api/support', routes.SUPPORT); const router = express.Router(); // Create subdomains -logger.info('[ACCOUNT - WiiU] Creating \'account\' subdomain'); +logger.info('[ACCOUNT] Creating \'account\' subdomain'); router.use(subdomain('account', account)); module.exports = router; \ No newline at end of file diff --git a/src/services/wiiu/routes/admin.js b/src/services/account/routes/admin.js similarity index 100% rename from src/services/wiiu/routes/admin.js rename to src/services/account/routes/admin.js diff --git a/src/services/wiiu/routes/content.js b/src/services/account/routes/content.js similarity index 100% rename from src/services/wiiu/routes/content.js rename to src/services/account/routes/content.js diff --git a/src/services/wiiu/routes/devices.js b/src/services/account/routes/devices.js similarity index 100% rename from src/services/wiiu/routes/devices.js rename to src/services/account/routes/devices.js diff --git a/src/services/wiiu/routes/index.js b/src/services/account/routes/index.js similarity index 100% rename from src/services/wiiu/routes/index.js rename to src/services/account/routes/index.js diff --git a/src/services/wiiu/routes/miis.js b/src/services/account/routes/miis.js similarity index 100% rename from src/services/wiiu/routes/miis.js rename to src/services/account/routes/miis.js diff --git a/src/services/wiiu/routes/oauth.js b/src/services/account/routes/oauth.js similarity index 100% rename from src/services/wiiu/routes/oauth.js rename to src/services/account/routes/oauth.js diff --git a/src/services/wiiu/routes/people.js b/src/services/account/routes/people.js similarity index 100% rename from src/services/wiiu/routes/people.js rename to src/services/account/routes/people.js diff --git a/src/services/wiiu/routes/provider.js b/src/services/account/routes/provider.js similarity index 100% rename from src/services/wiiu/routes/provider.js rename to src/services/account/routes/provider.js diff --git a/src/services/wiiu/routes/support.js b/src/services/account/routes/support.js similarity index 100% rename from src/services/wiiu/routes/support.js rename to src/services/account/routes/support.js diff --git a/src/services/wiiu/timezones.json b/src/services/account/timezones.json similarity index 100% rename from src/services/wiiu/timezones.json rename to src/services/account/timezones.json diff --git a/src/services/datastore/index.js b/src/services/datastore/index.js index 0c0e09e..ab263d2 100644 --- a/src/services/datastore/index.js +++ b/src/services/datastore/index.js @@ -7,14 +7,14 @@ const routes = require('./routes'); const datastore = express.Router(); // Setup routes -logger.info('[CDN] Applying imported routes'); +logger.info('[DATASTORE] Applying imported routes'); datastore.use(routes.UPLOAD); // Main router for endpoints const router = express.Router(); // Create subdomains -logger.info('[CDN] Creating \'datastore\' subdomain'); +logger.info('[DATASTORE] Creating \'datastore\' subdomain'); router.use(subdomain('datastore', datastore)); module.exports = router; \ No newline at end of file diff --git a/src/services/3ds/index.js b/src/services/nasc/index.js similarity index 72% rename from src/services/3ds/index.js rename to src/services/nasc/index.js index bd35618..22d1e48 100644 --- a/src/services/3ds/index.js +++ b/src/services/nasc/index.js @@ -5,18 +5,18 @@ const subdomain = require('express-subdomain'); const logger = require('../../../logger'); const routes = require('./routes'); -// Main router for endpoints -const router = express.Router(); - // Router to handle the subdomain restriction const nasc = express.Router(); -// Create subdomains -logger.info('[ACCOUNT - 3DS] Creating \'nasc\' subdomain'); -router.use(subdomain('nasc', nasc)); - // Setup routes -logger.info('[ACCOUNT - 3DS] Applying imported routes'); +logger.info('[NASC] Applying imported routes'); nasc.use('/ac', routes.AC); +// Main router for endpoints +const router = express.Router(); + +// Create subdomains +logger.info('[NASC] Creating \'nasc\' subdomain'); +router.use(subdomain('nasc', nasc)); + module.exports = router; \ No newline at end of file diff --git a/src/services/3ds/routes/ac.js b/src/services/nasc/routes/ac.js similarity index 100% rename from src/services/3ds/routes/ac.js rename to src/services/nasc/routes/ac.js diff --git a/src/services/3ds/routes/index.js b/src/services/nasc/routes/index.js similarity index 100% rename from src/services/3ds/routes/index.js rename to src/services/nasc/routes/index.js