From d92d4f3e89581c8f37ab7e21d8188b3b88f7f4f8 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sun, 6 Feb 2022 18:01:18 -0500 Subject: [PATCH] renamed "account" service to "nnid" --- src/server.js | 4 +- src/services/account/index.js | 38 ------------------- src/services/nnid/index.js | 38 +++++++++++++++++++ .../{account => nnid}/routes/admin.js | 0 .../{account => nnid}/routes/content.js | 0 .../{account => nnid}/routes/devices.js | 0 .../{account => nnid}/routes/index.js | 0 src/services/{account => nnid}/routes/miis.js | 0 .../{account => nnid}/routes/oauth.js | 0 .../{account => nnid}/routes/people.js | 0 .../{account => nnid}/routes/provider.js | 0 .../{account => nnid}/routes/support.js | 0 src/services/{account => nnid}/timezones.json | 0 13 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 src/services/account/index.js create mode 100644 src/services/nnid/index.js rename src/services/{account => nnid}/routes/admin.js (100%) rename src/services/{account => nnid}/routes/content.js (100%) rename src/services/{account => nnid}/routes/devices.js (100%) rename src/services/{account => nnid}/routes/index.js (100%) rename src/services/{account => nnid}/routes/miis.js (100%) rename src/services/{account => nnid}/routes/oauth.js (100%) rename src/services/{account => nnid}/routes/people.js (100%) rename src/services/{account => nnid}/routes/provider.js (100%) rename src/services/{account => nnid}/routes/support.js (100%) rename src/services/{account => nnid}/timezones.json (100%) diff --git a/src/server.js b/src/server.js index 4a9c2f9..e62ee49 100644 --- a/src/server.js +++ b/src/server.js @@ -12,7 +12,7 @@ const { http: { port } } = config; const app = express(); const conntest = require('./services/conntest'); -const account = require('./services/account'); +const nnid = require('./services/nnid'); const nasc = require('./services/nasc'); const datastore = require('./services/datastore'); const api = require('./services/api'); @@ -32,7 +32,7 @@ app.use(xmlparser); // import the servers into one app.use(conntest); -app.use(account); +app.use(nnid); app.use(nasc); app.use(datastore); app.use(api); diff --git a/src/services/account/index.js b/src/services/account/index.js deleted file mode 100644 index 86fe036..0000000 --- a/src/services/account/index.js +++ /dev/null @@ -1,38 +0,0 @@ -// handles "account.nintendo.net" endpoints - -const express = require('express'); -const subdomain = require('express-subdomain'); -const cemuMiddleware = require('../../middleware/cemu'); -const pnidMiddleware = require('../../middleware/pnid'); -const logger = require('../../../logger'); -const routes = require('./routes'); - -// Router to handle the subdomain restriction -const account = express.Router(); - -logger.info('[ACCOUNT] Importing middleware'); -account.use(cemuMiddleware); -account.use(pnidMiddleware); - -// Setup 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); -account.use('/v1/api/miis', routes.MIIS); -account.use('/v1/api/oauth20', routes.OAUTH); -account.use('/v1/api/people', routes.PEOPLE); -account.use('/v1/api/provider', routes.PROVIDER); -account.use('/v1/api/support', routes.SUPPORT); - -// Main router for endpoints -const router = express.Router(); - -// Create subdomains -logger.info('[ACCOUNT] Creating \'account\' subdomain'); -router.use(subdomain('account', account)); - -logger.info('[ACCOUNT] Creating \'c.account\' subdomain'); -router.use(subdomain('c.account', account)); - -module.exports = router; \ No newline at end of file diff --git a/src/services/nnid/index.js b/src/services/nnid/index.js new file mode 100644 index 0000000..33d7073 --- /dev/null +++ b/src/services/nnid/index.js @@ -0,0 +1,38 @@ +// handles "account.nintendo.net" endpoints + +const express = require('express'); +const subdomain = require('express-subdomain'); +const cemuMiddleware = require('../../middleware/cemu'); +const pnidMiddleware = require('../../middleware/pnid'); +const logger = require('../../../logger'); +const routes = require('./routes'); + +// Router to handle the subdomain restriction +const nnid = express.Router(); + +logger.info('[NNID] Importing middleware'); +nnid.use(cemuMiddleware); +nnid.use(pnidMiddleware); + +// Setup routes +logger.info('[NNID] Applying imported routes'); +nnid.use('/v1/api/admin', routes.ADMIN); +nnid.use('/v1/api/content', routes.CONTENT); +nnid.use('/v1/api/devices', routes.DEVICES); +nnid.use('/v1/api/miis', routes.MIIS); +nnid.use('/v1/api/oauth20', routes.OAUTH); +nnid.use('/v1/api/people', routes.PEOPLE); +nnid.use('/v1/api/provider', routes.PROVIDER); +nnid.use('/v1/api/support', routes.SUPPORT); + +// Main router for endpoints +const router = express.Router(); + +// Create subdomains +logger.info('[NNID] Creating \'account\' subdomain'); +router.use(subdomain('account', nnid)); + +logger.info('[NNID] Creating \'c.account\' subdomain'); +router.use(subdomain('c.account', nnid)); + +module.exports = router; \ No newline at end of file diff --git a/src/services/account/routes/admin.js b/src/services/nnid/routes/admin.js similarity index 100% rename from src/services/account/routes/admin.js rename to src/services/nnid/routes/admin.js diff --git a/src/services/account/routes/content.js b/src/services/nnid/routes/content.js similarity index 100% rename from src/services/account/routes/content.js rename to src/services/nnid/routes/content.js diff --git a/src/services/account/routes/devices.js b/src/services/nnid/routes/devices.js similarity index 100% rename from src/services/account/routes/devices.js rename to src/services/nnid/routes/devices.js diff --git a/src/services/account/routes/index.js b/src/services/nnid/routes/index.js similarity index 100% rename from src/services/account/routes/index.js rename to src/services/nnid/routes/index.js diff --git a/src/services/account/routes/miis.js b/src/services/nnid/routes/miis.js similarity index 100% rename from src/services/account/routes/miis.js rename to src/services/nnid/routes/miis.js diff --git a/src/services/account/routes/oauth.js b/src/services/nnid/routes/oauth.js similarity index 100% rename from src/services/account/routes/oauth.js rename to src/services/nnid/routes/oauth.js diff --git a/src/services/account/routes/people.js b/src/services/nnid/routes/people.js similarity index 100% rename from src/services/account/routes/people.js rename to src/services/nnid/routes/people.js diff --git a/src/services/account/routes/provider.js b/src/services/nnid/routes/provider.js similarity index 100% rename from src/services/account/routes/provider.js rename to src/services/nnid/routes/provider.js diff --git a/src/services/account/routes/support.js b/src/services/nnid/routes/support.js similarity index 100% rename from src/services/account/routes/support.js rename to src/services/nnid/routes/support.js diff --git a/src/services/account/timezones.json b/src/services/nnid/timezones.json similarity index 100% rename from src/services/account/timezones.json rename to src/services/nnid/timezones.json