From 2bc1d9cf8e81485babc8ad013e2219db0ef66873 Mon Sep 17 00:00:00 2001
From: Jonathan Barrow <jonbarrow1998@gmail.com>
Date: Sun, 14 Apr 2024 18:02:01 -0400
Subject: [PATCH] nnas: renamed nnid service to nnas

---
 package.json                                  |  2 +-
 src/database.ts                               |  2 +-
 src/server.ts                                 |  4 +-
 src/services/nnas/index.ts                    | 48 +++++++++++++++++++
 src/services/{nnid => nnas}/routes/admin.ts   |  0
 src/services/{nnid => nnas}/routes/content.ts |  6 +--
 src/services/{nnid => nnas}/routes/devices.ts |  0
 src/services/{nnid => nnas}/routes/miis.ts    |  0
 src/services/{nnid => nnas}/routes/oauth.ts   |  0
 src/services/{nnid => nnas}/routes/people.ts  | 10 ++--
 .../{nnid => nnas}/routes/provider.ts         |  0
 src/services/{nnid => nnas}/routes/support.ts |  0
 src/services/{nnid => nnas}/timezones.json    |  0
 src/services/nnid/index.ts                    | 48 -------------------
 src/types/services/{nnid => nnas}/person.ts   |  0
 .../services/{nnid => nnas}/pnid-profile.ts   |  0
 .../{nnid => nnas}/region-languages.ts        |  2 +-
 .../{nnid => nnas}/region-timezones.ts        |  0
 18 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100644 src/services/nnas/index.ts
 rename src/services/{nnid => nnas}/routes/admin.ts (100%)
 rename src/services/{nnid => nnas}/routes/content.ts (94%)
 rename src/services/{nnid => nnas}/routes/devices.ts (100%)
 rename src/services/{nnid => nnas}/routes/miis.ts (100%)
 rename src/services/{nnid => nnas}/routes/oauth.ts (100%)
 rename src/services/{nnid => nnas}/routes/people.ts (95%)
 rename src/services/{nnid => nnas}/routes/provider.ts (100%)
 rename src/services/{nnid => nnas}/routes/support.ts (100%)
 rename src/services/{nnid => nnas}/timezones.json (100%)
 delete mode 100644 src/services/nnid/index.ts
 rename src/types/services/{nnid => nnas}/person.ts (100%)
 rename src/types/services/{nnid => nnas}/pnid-profile.ts (100%)
 rename src/types/services/{nnid => nnas}/region-languages.ts (55%)
 rename src/types/services/{nnid => nnas}/region-timezones.ts (100%)

diff --git a/package.json b/package.json
index b1359b7..b945ec9 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
     "clean": "rimraf ./dist",
     "copy-static": "npm run copy-assets && npm run copy-timezones",
     "copy-assets": "cp -r ./src/assets ./dist/assets",
-    "copy-timezones": "cp ./src/services/nnid/timezones.json ./dist/services/nnid/timezones.json",
+    "copy-timezones": "cp ./src/services/nnas/timezones.json ./dist/services/nnas/timezones.json",
     "start": "node .",
     "start:dev": "NODE_ENV=development node ."
   },
diff --git a/src/database.ts b/src/database.ts
index a301b92..656e547 100644
--- a/src/database.ts
+++ b/src/database.ts
@@ -11,7 +11,7 @@ import { IDevice } from '@/types/mongoose/device';
 import { IDeviceAttribute } from '@/types/mongoose/device-attribute';
 import { HydratedServerDocument } from '@/types/mongoose/server';
 import { Token } from '@/types/common/token';
-import { PNIDProfile } from '@/types/services/nnid/pnid-profile';
+import { PNIDProfile } from '@/types/services/nnas/pnid-profile';
 import { ConnectionData } from '@/types/services/api/connection-data';
 import { ConnectionResponse } from '@/types/services/api/connection-response';
 import { DiscordConnectionData } from '@/types/services/api/discord-connection-data';
diff --git a/src/server.ts b/src/server.ts
index 0050b1a..ad5bd83 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -16,7 +16,7 @@ import { LOG_INFO, LOG_SUCCESS, LOG_WARN } from '@/logger';
 
 import conntest from '@/services/conntest';
 import cbvc from '@/services/cbvc';
-import nnid from '@/services/nnid';
+import nnas from '@/services/nnas';
 import nasc from '@/services/nasc';
 import datastore from '@/services/datastore';
 import api from '@/services/api';
@@ -41,7 +41,7 @@ app.use(xmlparser);
 // import the servers into one
 app.use(conntest);
 app.use(cbvc);
-app.use(nnid);
+app.use(nnas);
 app.use(nasc);
 app.use(datastore);
 app.use(api);
diff --git a/src/services/nnas/index.ts b/src/services/nnas/index.ts
new file mode 100644
index 0000000..c90d5eb
--- /dev/null
+++ b/src/services/nnas/index.ts
@@ -0,0 +1,48 @@
+// handles "account.nintendo.net" endpoints
+
+import express from 'express';
+import subdomain from 'express-subdomain';
+import clientHeaderCheck from '@/middleware/client-header';
+import cemuMiddleware from '@/middleware/cemu';
+import pnidMiddleware from '@/middleware/pnid';
+import { LOG_INFO } from '@/logger';
+
+import admin from '@/services/nnas/routes/admin';
+import content from '@/services/nnas/routes/content';
+import devices from '@/services/nnas/routes/devices';
+import miis from '@/services/nnas/routes/miis';
+import oauth from '@/services/nnas/routes/oauth';
+import people from '@/services/nnas/routes/people';
+import provider from '@/services/nnas/routes/provider';
+import support from '@/services/nnas/routes/support';
+
+// Router to handle the subdomain restriction
+const nnas: express.Router = express.Router();
+
+LOG_INFO('[NNAS] Importing middleware');
+nnas.use(clientHeaderCheck);
+nnas.use(cemuMiddleware);
+nnas.use(pnidMiddleware);
+
+// Setup routes
+LOG_INFO('[NNAS] Applying imported routes');
+nnas.use('/v1/api/admin', admin);
+nnas.use('/v1/api/content', content);
+nnas.use('/v1/api/devices', devices);
+nnas.use('/v1/api/miis', miis);
+nnas.use('/v1/api/oauth20', oauth);
+nnas.use('/v1/api/people', people);
+nnas.use('/v1/api/provider', provider);
+nnas.use('/v1/api/support', support);
+
+// Main router for endpoints
+const router = express.Router();
+
+// Create subdomains
+LOG_INFO('[NNAS] Creating \'account\' subdomain');
+router.use(subdomain('account', nnas));
+
+LOG_INFO('[NNAS] Creating \'c.account\' subdomain');
+router.use(subdomain('c.account', nnas));
+
+export default router;
\ No newline at end of file
diff --git a/src/services/nnid/routes/admin.ts b/src/services/nnas/routes/admin.ts
similarity index 100%
rename from src/services/nnid/routes/admin.ts
rename to src/services/nnas/routes/admin.ts
diff --git a/src/services/nnid/routes/content.ts b/src/services/nnas/routes/content.ts
similarity index 94%
rename from src/services/nnid/routes/content.ts
rename to src/services/nnas/routes/content.ts
index b4d1ac3..db5100d 100644
--- a/src/services/nnid/routes/content.ts
+++ b/src/services/nnas/routes/content.ts
@@ -1,8 +1,8 @@
 import express from 'express';
 import xmlbuilder from 'xmlbuilder';
-import timezones from '@/services/nnid/timezones.json';
-import { RegionLanguages } from '@/types/services/nnid/region-languages';
-import { RegionTimezones } from '@/types/services/nnid/region-timezones';
+import timezones from '@/services/nnas/timezones.json';
+import { RegionLanguages } from '@/types/services/nnas/region-languages';
+import { RegionTimezones } from '@/types/services/nnas/region-timezones';
 
 const router: express.Router = express.Router();
 
diff --git a/src/services/nnid/routes/devices.ts b/src/services/nnas/routes/devices.ts
similarity index 100%
rename from src/services/nnid/routes/devices.ts
rename to src/services/nnas/routes/devices.ts
diff --git a/src/services/nnid/routes/miis.ts b/src/services/nnas/routes/miis.ts
similarity index 100%
rename from src/services/nnid/routes/miis.ts
rename to src/services/nnas/routes/miis.ts
diff --git a/src/services/nnid/routes/oauth.ts b/src/services/nnas/routes/oauth.ts
similarity index 100%
rename from src/services/nnid/routes/oauth.ts
rename to src/services/nnas/routes/oauth.ts
diff --git a/src/services/nnid/routes/people.ts b/src/services/nnas/routes/people.ts
similarity index 95%
rename from src/services/nnid/routes/people.ts
rename to src/services/nnas/routes/people.ts
index 8b95850..c4b8bcd 100644
--- a/src/services/nnid/routes/people.ts
+++ b/src/services/nnas/routes/people.ts
@@ -12,14 +12,14 @@ import { PNID } from '@/models/pnid';
 import { NEXAccount } from '@/models/nex-account';
 import { LOG_ERROR } from '@/logger';
 
-import timezones from '@/services/nnid/timezones.json';
+import timezones from '@/services/nnas/timezones.json';
 
 import { HydratedPNIDDocument } from '@/types/mongoose/pnid';
 import { HydratedNEXAccountDocument } from '@/types/mongoose/nex-account';
-import { RegionLanguages } from '@/types/services/nnid/region-languages';
-import { RegionTimezone, RegionTimezones } from '@/types/services/nnid/region-timezones';
-import { Person } from '@/types/services/nnid/person';
-import { PNIDProfile } from '@/types/services/nnid/pnid-profile';
+import { RegionLanguages } from '@/types/services/nnas/region-languages';
+import { RegionTimezone, RegionTimezones } from '@/types/services/nnas/region-timezones';
+import { Person } from '@/types/services/nnas/person';
+import { PNIDProfile } from '@/types/services/nnas/pnid-profile';
 
 const router: express.Router = express.Router();
 
diff --git a/src/services/nnid/routes/provider.ts b/src/services/nnas/routes/provider.ts
similarity index 100%
rename from src/services/nnid/routes/provider.ts
rename to src/services/nnas/routes/provider.ts
diff --git a/src/services/nnid/routes/support.ts b/src/services/nnas/routes/support.ts
similarity index 100%
rename from src/services/nnid/routes/support.ts
rename to src/services/nnas/routes/support.ts
diff --git a/src/services/nnid/timezones.json b/src/services/nnas/timezones.json
similarity index 100%
rename from src/services/nnid/timezones.json
rename to src/services/nnas/timezones.json
diff --git a/src/services/nnid/index.ts b/src/services/nnid/index.ts
deleted file mode 100644
index 726b95c..0000000
--- a/src/services/nnid/index.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// handles "account.nintendo.net" endpoints
-
-import express from 'express';
-import subdomain from 'express-subdomain';
-import clientHeaderCheck from '@/middleware/client-header';
-import cemuMiddleware from '@/middleware/cemu';
-import pnidMiddleware from '@/middleware/pnid';
-import { LOG_INFO } from '@/logger';
-
-import admin from '@/services/nnid/routes/admin';
-import content from '@/services/nnid/routes/content';
-import devices from '@/services/nnid/routes/devices';
-import miis from '@/services/nnid/routes/miis';
-import oauth from '@/services/nnid/routes/oauth';
-import people from '@/services/nnid/routes/people';
-import provider from '@/services/nnid/routes/provider';
-import support from '@/services/nnid/routes/support';
-
-// Router to handle the subdomain restriction
-const nnid: express.Router = express.Router();
-
-LOG_INFO('[NNID] Importing middleware');
-nnid.use(clientHeaderCheck);
-nnid.use(cemuMiddleware);
-nnid.use(pnidMiddleware);
-
-// Setup routes
-LOG_INFO('[NNID] Applying imported routes');
-nnid.use('/v1/api/admin', admin);
-nnid.use('/v1/api/content', content);
-nnid.use('/v1/api/devices', devices);
-nnid.use('/v1/api/miis', miis);
-nnid.use('/v1/api/oauth20', oauth);
-nnid.use('/v1/api/people', people);
-nnid.use('/v1/api/provider', provider);
-nnid.use('/v1/api/support', support);
-
-// Main router for endpoints
-const router = express.Router();
-
-// Create subdomains
-LOG_INFO('[NNID] Creating \'account\' subdomain');
-router.use(subdomain('account', nnid));
-
-LOG_INFO('[NNID] Creating \'c.account\' subdomain');
-router.use(subdomain('c.account', nnid));
-
-export default router;
\ No newline at end of file
diff --git a/src/types/services/nnid/person.ts b/src/types/services/nnas/person.ts
similarity index 100%
rename from src/types/services/nnid/person.ts
rename to src/types/services/nnas/person.ts
diff --git a/src/types/services/nnid/pnid-profile.ts b/src/types/services/nnas/pnid-profile.ts
similarity index 100%
rename from src/types/services/nnid/pnid-profile.ts
rename to src/types/services/nnas/pnid-profile.ts
diff --git a/src/types/services/nnid/region-languages.ts b/src/types/services/nnas/region-languages.ts
similarity index 55%
rename from src/types/services/nnid/region-languages.ts
rename to src/types/services/nnas/region-languages.ts
index e25307d..fd4bbf9 100644
--- a/src/types/services/nnid/region-languages.ts
+++ b/src/types/services/nnas/region-languages.ts
@@ -1,4 +1,4 @@
-import { RegionTimezones } from '@/types/services/nnid/region-timezones';
+import { RegionTimezones } from '@/types/services/nnas/region-timezones';
 
 export interface RegionLanguages {
 	[myKey: string]: RegionTimezones
diff --git a/src/types/services/nnid/region-timezones.ts b/src/types/services/nnas/region-timezones.ts
similarity index 100%
rename from src/types/services/nnid/region-timezones.ts
rename to src/types/services/nnas/region-timezones.ts