|
@@ -1,14 +1,14 @@
|
|
import { Request as ExpressRequest, Response as ExpressResponse } from "express";
|
|
import { Request as ExpressRequest, Response as ExpressResponse } from "express";
|
|
import { DiscordAPI } from "src/utils/util";
|
|
import { DiscordAPI } from "src/utils/util";
|
|
-import { ENVIRONMENT } from "src/utils/environment";
|
|
|
|
import { Option, tryDo } from "@shared/common/async_utils";
|
|
import { Option, tryDo } from "@shared/common/async_utils";
|
|
import { logger } from "src/utils/logging";
|
|
import { logger } from "src/utils/logging";
|
|
import { rpcClient } from "src/utils/rpc";
|
|
import { rpcClient } from "src/utils/rpc";
|
|
|
|
+import { ENV } from "src/utils/environment";
|
|
|
|
|
|
export const get = async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
|
|
export const get = async (req: ExpressRequest, res: ExpressResponse): Promise<void> => {
|
|
res.redirect(DiscordAPI.getAuthUrl({
|
|
res.redirect(DiscordAPI.getAuthUrl({
|
|
- client_id: ENVIRONMENT.clientId,
|
|
|
|
- redirect_url: ENVIRONMENT.redirectUrl,
|
|
|
|
|
|
+ client_id: ENV.BOT_CLIENT_ID,
|
|
|
|
+ redirect_url: ENV.WEB_AUTH_URI,
|
|
response_type: "code",
|
|
response_type: "code",
|
|
scope: "identify",
|
|
scope: "identify",
|
|
}));
|
|
}));
|
|
@@ -33,12 +33,12 @@ export const post = async (req: ExpressRequest, res: ExpressResponse):
|
|
});
|
|
});
|
|
}
|
|
}
|
|
const tokenResult = await DiscordAPI.getToken({
|
|
const tokenResult = await DiscordAPI.getToken({
|
|
- client_id: ENVIRONMENT.clientId,
|
|
|
|
- client_secret: ENVIRONMENT.clientSecret,
|
|
|
|
|
|
+ client_id: ENV.BOT_CLIENT_ID,
|
|
|
|
+ client_secret: ENV.BOT_CLIENT_SECRET,
|
|
grant_type: "authorization_code",
|
|
grant_type: "authorization_code",
|
|
code: req.session.authTokenCode,
|
|
code: req.session.authTokenCode,
|
|
scope: "identify",
|
|
scope: "identify",
|
|
- redirect_uri: ENVIRONMENT.redirectUrl,
|
|
|
|
|
|
+ redirect_uri: ENV.WEB_AUTH_URI,
|
|
});
|
|
});
|
|
if (!tokenResult.ok) {
|
|
if (!tokenResult.ok) {
|
|
return res.json(tokenResult);
|
|
return res.json(tokenResult);
|