From 6d3f516612f78cd7ff226eb0304c1726e7ce65d5 Mon Sep 17 00:00:00 2001 From: Jonathan Barrow Date: Sun, 14 Apr 2024 19:19:37 -0400 Subject: [PATCH] chore: update Id -> ID --- src/middleware/client-header.ts | 8 ++++---- src/nintendo-certificate.ts | 6 +++--- src/server.ts | 16 ++++++++-------- src/services/nnas/routes/people.ts | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/middleware/client-header.ts b/src/middleware/client-header.ts index 851317f..483f8dc 100644 --- a/src/middleware/client-header.ts +++ b/src/middleware/client-header.ts @@ -14,14 +14,14 @@ function nintendoClientHeaderCheck(request: express.Request, response: express.R response.set('Server', 'Nintendo 3DS (http)'); response.set('X-Nintendo-Date', new Date().getTime().toString()); - const clientId = getValueFromHeaders(request.headers, 'x-nintendo-client-id'); + const clientID = getValueFromHeaders(request.headers, 'x-nintendo-client-id'); const clientSecret = getValueFromHeaders(request.headers, 'x-nintendo-client-secret'); if ( - !clientId || + !clientID || !clientSecret || - !VALID_CLIENT_ID_SECRET_PAIRS[clientId] || - clientSecret !== VALID_CLIENT_ID_SECRET_PAIRS[clientId] + !VALID_CLIENT_ID_SECRET_PAIRS[clientID] || + clientSecret !== VALID_CLIENT_ID_SECRET_PAIRS[clientID] ) { response.send(xmlbuilder.create({ errors: { diff --git a/src/nintendo-certificate.ts b/src/nintendo-certificate.ts index da1741c..8d5dce8 100644 --- a/src/nintendo-certificate.ts +++ b/src/nintendo-certificate.ts @@ -77,7 +77,7 @@ class NintendoCertificate { issuer: string; keyType: number; certificateName: string; - ngKeyId: number; + ngKeyID: number; publicKey: Buffer; valid: boolean; publicKeyData: Buffer; @@ -91,7 +91,7 @@ class NintendoCertificate { this.issuer = ''; this.keyType = 0; this.certificateName = ''; - this.ngKeyId = 0; + this.ngKeyID = 0; this.publicKey = Buffer.alloc(0); this.valid = false; this.publicKeyData = Buffer.alloc(0); @@ -128,7 +128,7 @@ class NintendoCertificate { this.issuer = this._certificate.subarray(0x80, 0xC0).toString().split('\0')[0]; this.keyType = this._certificate.readUInt32BE(0xC0); this.certificateName = this._certificate.subarray(0xC4, 0x104).toString().split('\0')[0]; - this.ngKeyId = this._certificate.readUInt32BE(0x104); + this.ngKeyID = this._certificate.readUInt32BE(0x104); this.publicKeyData = this._certificate.subarray(0x108); if (this.issuer === 'Root-CA00000003-MS00000012') { diff --git a/src/server.ts b/src/server.ts index e496b74..4d90d63 100644 --- a/src/server.ts +++ b/src/server.ts @@ -52,13 +52,13 @@ app.use(assets); LOG_INFO('Creating 404 status handler'); app.use((request: express.Request, response: express.Response): void => { const url = fullUrl(request); - let deviceId = getValueFromHeaders(request.headers, 'X-Nintendo-Device-ID'); + let deviceID = getValueFromHeaders(request.headers, 'X-Nintendo-Device-ID'); - if (!deviceId) { - deviceId = 'Unknown'; + if (!deviceID) { + deviceID = 'Unknown'; } - LOG_WARN(`HTTP 404 at ${url} from ${deviceId}`); + LOG_WARN(`HTTP 404 at ${url} from ${deviceID}`); response.set('Content-Type', 'text/xml'); response.set('Server', 'Nintendo 3DS (http)'); @@ -80,13 +80,13 @@ LOG_INFO('Creating non-404 status handler'); app.use((error: any, request: express.Request, response: express.Response, _next: express.NextFunction): void => { const status = error.status || 500; const url = fullUrl(request); - let deviceId = getValueFromHeaders(request.headers, 'X-Nintendo-Device-ID'); + let deviceID = getValueFromHeaders(request.headers, 'X-Nintendo-Device-ID'); - if (!deviceId) { - deviceId = 'Unknown'; + if (!deviceID) { + deviceID = 'Unknown'; } - LOG_WARN(`HTTP ${status} at ${url} from ${deviceId}: ${error.message}`); + LOG_WARN(`HTTP ${status} at ${url} from ${deviceID}: ${error.message}`); response.status(status).json({ app: 'api', diff --git a/src/services/nnas/routes/people.ts b/src/services/nnas/routes/people.ts index ee3d9ba..5d0bf3d 100644 --- a/src/services/nnas/routes/people.ts +++ b/src/services/nnas/routes/people.ts @@ -321,14 +321,14 @@ router.get('/@me/devices', async (request: express.Request, response: express.Re response.set('X-Nintendo-Date', new Date().getTime().toString()); const pnid = request.pnid; - const deviceId = getValueFromHeaders(request.headers, 'x-nintendo-device-id'); + const deviceID = getValueFromHeaders(request.headers, 'x-nintendo-device-id'); const acceptLanguage = getValueFromHeaders(request.headers, 'accept-language'); - const platformId = getValueFromHeaders(request.headers, 'x-nintendo-platform-id'); + const platformID = getValueFromHeaders(request.headers, 'x-nintendo-platform-id'); const region = getValueFromHeaders(request.headers, 'x-nintendo-region'); const serialNumber = getValueFromHeaders(request.headers, 'x-nintendo-serial-number'); const systemVersion = getValueFromHeaders(request.headers, 'x-nintendo-system-version'); - if (!deviceId || !acceptLanguage || !platformId || !region || !serialNumber || !systemVersion) { + if (!deviceID || !acceptLanguage || !platformID || !region || !serialNumber || !systemVersion) { // TODO - Research these error more response.status(400).send(xmlbuilder.create({ errors: { @@ -362,11 +362,11 @@ router.get('/@me/devices', async (request: express.Request, response: express.Re devices: [ { device: { - device_id: deviceId, + device_id: deviceID, language: acceptLanguage, updated: moment().format('YYYY-MM-DDTHH:MM:SS'), pid: pnid.pid, - platform_id: platformId, + platform_id: platformID, region: region, serial_number: serialNumber, status: 'ACTIVE',