Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-08-22 16:47:16 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #444 from suprstarrd/fix/connections-grpc
Some checks failed
Build and Publish Docker Image / build-publish (push) Has been cancelled
Details

Browse Source 
fix: handle Discord connections over gRPC
This commit is contained in:
mrjvs
2026-08-06 14:23:02 +02:00
committed by GitHub
parent fbe96b026c 2128bf230a
commit 13db47f0fe
3 changed files with 255 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

558
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@@ -45,7 +45,7 @@
"mii-js": "github:PretendoNetwork/mii-js#v1.0.4",
"mongoose": "^6.4.0",
"morgan": "^1.10.0",
"nice-grpc": "^2.1.13",
"nice-grpc": "^2.1.16",
"nodemailer": "^6.7.5",
"stripe": "^9.9.0"
},

55
src/util.js
View File

@@ -5,6 +5,8 @@ const got = require('got');
const { marked } = require('marked');
const { REST: DiscordRest } = require('@discordjs/rest');
const { Routes: DiscordRoutes } = require('discord-api-types/v10');
const { createChannel, createClient, Metadata } = require('nice-grpc');
const { ApiServiceDefinition } = require('@pretendonetwork/grpc/api/v2/api_service');
const merge = require('lodash.merge');
const config = require('./config');
const logger = require('./logger');
@@ -12,6 +14,9 @@ const baseLocale = require(`${__dirname}/../locales/en_US.json`);
const discordRest = new DiscordRest({ version: '10' }).setToken(config.discord.bot_token);
const gRPCApiChannel = createChannel(`${config.grpc.api.host}:${config.grpc.api.port}`);
const gRPCApiClient = createClient(ApiServiceDefinition, gRPCApiChannel);
function fullUrl(request) {
return `${request.protocol}://${request.hostname}${request.originalUrl}`;
}
@@ -180,38 +185,40 @@ async function getUserAccountData(request, response, fromRetry = false) {
}
async function updateDiscordConnection(discordUser, request, response, fromRetry = false) {
const apiResponse = await apiPostRequest('/v1/connections/add/discord', {
Authorization: `${request.cookies.token_type} ${request.cookies.access_token}`
}, {
data: {
try {
return await gRPCApiClient.setDiscordConnectionData({
id: discordUser.id
}, {
metadata: Metadata({
'X-API-Key': config.grpc.api.api_key,
'X-Token': request.cookies.access_token
})
});
} catch {
if (fromRetry === true) {
throw new Error('Bad');
}
});
if (apiResponse.statusCode !== 200 && fromRetry === true) {
// TODO: Error message
throw new Error('Bad');
}
if (apiResponse.statusCode !== 200) {
await refreshLogin(request, response);
await updateDiscordConnection(discordUser, request, response, true);
return await updateDiscordConnection(discordUser, request, response, true);
}
}
async function removeDiscordConnection(request, response, fromRetry = false) {
const apiResponse = await apiDeleteRequest('/v1/connections/remove/discord', {
Authorization: `${request.cookies.token_type} ${request.cookies.access_token}`
});
if (apiResponse.statusCode !== 200 && fromRetry === true) {
// TODO: Error message
throw new Error('Bad');
}
if (apiResponse.statusCode !== 200) {
try {
return await gRPCApiClient.setDiscordConnectionData({
id: ''
}, {
metadata: Metadata({
'X-API-Key': config.grpc.api.api_key,
'X-Token': request.cookies.access_token
})
});
} catch {
if (fromRetry === true) {
throw new Error('Bad');
}
await refreshLogin(request, response);
await removeDiscordConnection(request, response, true);
return await removeDiscordConnection(request, response, true);
}
}