switch to js :3

Author: IThundxr

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
-/index.js
 
 dist
 

package.json

@@ -2,32 +2,26 @@
   "name": "prism-linked-roles",
   "version": "1.0.0",
   "license": "GPL-3.0",
-  "main": "server.ts",
+  "main": "server.js",
+  "type": "module",
   "scripts": {
-    "dev": "NODE_ENV=development tsx watch src/index.ts",
-    "start": "tsx src/server.ts",
-    "reupload": "tsx src/_reupload.ts",
+    "dev": "NODE_ENV=development tsx watch src/index.js",
+    "start": "tsx src/server.js",
+    "reupload": "tsx src/_reupload.js",
     "lint": "eslint .",
     "preinstall": "npx only-allow yarn"
   },
   "dependencies": {
-    "@types/cookie-parser": "^1.4.3",
-    "@types/express": "^4.17.17",
-    "@types/pg": "^8.6.6",
     "cookie-parser": "^1.4.6",
     "discord-interactions": "^3.3.0",
     "express": "^4.18.2",
     "node-fetch": "^3.3.1"
   },
   "devDependencies": {
-    "@types/node": "^18.15.3",
-    "@typescript-eslint/eslint-plugin": "5.55.0",
-    "@typescript-eslint/parser": "5.55.0",
     "dotenv": "16.0.3",
     "esbuild": "0.17.11",
     "eslint": "8.36.0",
     "gray-matter": "4.0.3",
-    "prettier": "2.8.4",
-    "typescript": "4.9.5"
+    "prettier": "2.8.4"
   }
 }

src/commands.ts

@@ -0,0 +1,17 @@
+import * as dotenv from 'dotenv'
+
+/**
+ * Load environment variables from a .env file, if it exists.
+ */
+
+dotenv.config()
+
+const config = {
+  DISCORD_TOKEN: process.env.DISCORD_TOKEN,
+  DISCORD_CLIENT_ID: process.env.DISCORD_CLIENT_ID,
+  DISCORD_CLIENT_SECRET: process.env.DISCORD_CLIENT_SECRET,
+  DISCORD_REDIRECT_URI: process.env.DISCORD_REDIRECT_URI,
+  COOKIE_SECRET: process.env.COOKIE_SECRET,
+};
+
+export default config;

src/common.ts

@@ -7,41 +7,6 @@ import * as storage from './storage.js';
  * Code specific to communicating with the Discord API.
  */
 
-export interface OAuth2TokenResponse {
-  access_token: string;
-  expires_at: number;
-  expires_in: number;
-  refresh_token: string;
-  scope: string;
-  token_type: string;
-}
-
-export interface OAuth2UserInfo {
-  application: {
-    id: string;
-    name: string;
-    icon: string | null;
-    description: string;
-    summary: string;
-    type: string | null;
-    hook: boolean;
-    bot_public: boolean;
-    bot_require_code_grant: boolean;
-    verify_key: string;
-    flags: number;
-  };
-  scopes: string[];
-  expires: string;
-  user: {
-    id: string;
-    username: string;
-    avatar: string;
-    avatar_decoration: string | null;
-    discriminator: string;
-    public_flags: number;
-  };
-}
-
 /**
  * The following methods all facilitate OAuth2 communication with Discord.
  * See https://discord.com/developers/docs/topics/oauth2 for more details.
@@ -55,8 +20,8 @@ export function getOAuthUrl() {
   const state = crypto.randomUUID();
 
   const url = new URL('https://discord.com/api/oauth2/authorize');
-  url.searchParams.set('client_id', process.env.DISCORD_TOKEN!);
-  url.searchParams.set('redirect_uri', process.env.DISCORD_REDIRECT_URI!);
+  url.searchParams.set('client_id', process.env.DISCORD_CLIENT_ID);
+  url.searchParams.set('redirect_uri', process.env.DISCORD_REDIRECT_URI);
   url.searchParams.set('response_type', 'code');
   url.searchParams.set('state', state);
   url.searchParams.set('scope', 'role_connections.write identify');
@@ -68,16 +33,14 @@ export function getOAuthUrl() {
  * Given an OAuth2 code from the scope approval page, make a request to Discord's
  * OAuth2 service to retrieve an access token, refresh token, and expiration.
  */
-export async function getOAuthTokens(
-  code: string
-): Promise<OAuth2TokenResponse> {
+export async function getOAuthTokens(code) {
   const url = 'https://discord.com/api/v10/oauth2/token';
   const body = new URLSearchParams({
-    client_id: process.env.DISCORD_CLIENT_ID!,
-    client_secret: process.env.DISCORD_CLIENT_SECRET!,
+    client_id: process.env.DISCORD_CLIENT_ID,
+    client_secret: process.env.DISCORD_CLIENT_SECRET,
     grant_type: 'authorization_code',
     code,
-    redirect_uri: process.env.DISCORD_REDIRECT_URI!,
+    redirect_uri: process.env.DISCORD_REDIRECT_URI,
   });
 
   const response = await fetch(url, {
@@ -88,31 +51,26 @@ export async function getOAuthTokens(
     },
   });
   if (response.ok) {
-    const data = await response.json() as OAuth2TokenResponse;
+    const data = await response.json();
     return data;
   } else {
     throw new Error(`Error fetching OAuth tokens: [${response.status}] ${response.statusText}`);
   }
 }
 
-
 /**
  * The initial token request comes with both an access token and a refresh
  * token.  Check if the access token has expired, and if it has, use the
  * refresh token to acquire a new, fresh access token.
  */
-export async function getAccessToken(
-  userId: string,
-  data: storage.DiscordData
-) {
-  let tokens: OAuth2TokenResponse; // Define tokens outside the if block
-  if (Date.now() > data.expires_at) {
+export async function getAccessToken(userId, tokens) {
+  if (Date.now() > tokens.expires_at) {
     const url = 'https://discord.com/api/v10/oauth2/token';
     const body = new URLSearchParams({
-      client_id: process.env.DISCORD_CLIENT_ID!,
-      client_secret: process.env.DISCORD_CLIENT_SECRET!,
+      client_id: process.env.DISCORD_CLIENT_ID,
+      client_secret: process.env.DISCORD_CLIENT_SECRET,
       grant_type: 'refresh_token',
-      refresh_token: data.refresh_token,
+      refresh_token: tokens.refresh_token,
     });
     const response = await fetch(url, {
       body,
@@ -122,47 +80,21 @@ export async function getAccessToken(
       },
     });
     if (response.ok) {
-      tokens = await response.json() as OAuth2TokenResponse;
+      const tokens = await response.json();
       tokens.expires_at = Date.now() + tokens.expires_in * 1000;
       await storage.storeDiscordTokens(userId, tokens);
+      return tokens.access_token;
     } else {
       throw new Error(`Error refreshing access token: [${response.status}] ${response.statusText}`);
     }
-  } else {
-    tokens = data as OAuth2TokenResponse; // Assign the value of data to tokens
   }
   return tokens.access_token;
 }
 
-/**
- * Revoke the given user's Discord access and refresh tokens.
- * @param userId The Discord User ID
- */
-export async function revokeAccess(userId: string) {
-  const tokens = await storage.getDiscordTokens(userId);
-  const url = 'https://discord.com/api/v10/oauth2/token';
-  const body = new URLSearchParams({
-    client_id: process.env.DISCORD_CLIENT_ID!,
-    client_secret: process.env.DISCORD_CLIENT_SECRET!,
-    token: tokens.refresh_token,
-    token_type_hint: 'refresh_token',
-  });
-  await fetch(url, {
-    body,
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/x-www-form-urlencoded',
-    },
-  });
-
-  // remove the tokens from storage
-  await storage.deleteDiscordTokens(userId);
-}
-
 /**
  * Given a user based access token, fetch profile information for the current user.
  */
-export async function getUserData(tokens: OAuth2TokenResponse) {
+export async function getUserData(tokens) {
   const url = 'https://discord.com/api/v10/oauth2/@me';
   const response = await fetch(url, {
     headers: {
@@ -181,16 +113,12 @@ export async function getUserData(tokens: OAuth2TokenResponse) {
  * Given metadata that matches the schema, push that data to Discord on behalf
  * of the current user.
  */
-export async function pushMetadata(
-  userId: string, 
-  data: storage.DiscordData,
-  metadata: Record<string, string>
-) {
+export async function pushMetadata(userId, tokens, metadata) {
   // PUT /users/@me/applications/:id/role-connection
   const url = `https://discord.com/api/v10/users/@me/applications/${process.env.DISCORD_CLIENT_ID}/role-connection`;
-  const accessToken = await getAccessToken(userId, data);
+  const accessToken = await getAccessToken(userId, tokens);
   const body = {
-    platform_name: 'PrismBot Linked Roles',
+    platform_name: 'Prism Linked Roles',
     metadata,
   };
   const response = await fetch(url, {
@@ -210,13 +138,10 @@ export async function pushMetadata(
  * Fetch the metadata currently pushed to Discord for the currently logged
  * in user, for this specific bot.
  */
-export async function getMetadata(  
-  userId: string, 
-  data: storage.DiscordData
-) {
+export async function getMetadata(userId, tokens) {
   // GET /users/@me/applications/:id/role-connection
   const url = `https://discord.com/api/v10/users/@me/applications/${process.env.DISCORD_CLIENT_ID}/role-connection`;
-  const accessToken = await getAccessToken(userId, data);
+  const accessToken = await getAccessToken(userId, tokens);
   const response = await fetch(url, {
     headers: {
       Authorization: `Bearer ${accessToken}`,
@@ -228,4 +153,4 @@ export async function getMetadata(
   } else {
     throw new Error(`Error getting discord metadata: [${response.status}] ${response.statusText}`);
   }
-}
+}

src/config.js

@@ -8,28 +8,22 @@ const url = `https://discord.com/api/v10/applications/${process.env.DISCORD_CLIE
 // supported types: number_lt=1, number_gt=2, number_eq=3 number_neq=4, datetime_lt=5, datetime_gt=6, boolean_eq=7, boolean_neq=8
 const body = [
   {
-    key: 'ispackager',
-    name: 'Is Packager',
-    description: 'Is a Prism Packager',
-    type: 7,
+    key: 'cookieseaten',
+    name: 'Cookies Eaten',
+    description: 'Cookies Eaten Greater Than',
+    type: 2,
   },
   {
-    key: 'iscoder',
-    name: 'Is Coder',
-    description: 'Is a Prism Code Contributor',
+    key: 'allergictonuts',
+    name: 'Allergic To Nuts',
+    description: 'Is Allergic To Nuts',
     type: 7,
   },
   {
-    key: 'isdocumentation',
-    name: 'Is Documentation',
-    description: 'Is a Prism Documentation Contributor',
-    type: 7,
-  },
-  {
-    key: 'istranslator',
-    name: 'Is Translator',
-    description: 'Is a Prism Translations Contributor',
-    type: 7,
+    key: 'bakingsince',
+    name: 'Baking Since',
+    description: 'Days since baking their first cookie',
+    type: 6,
   },
 ];
 
@@ -48,4 +42,4 @@ if (response.ok) {
   //throw new Error(`Error pushing discord metadata schema: [${response.status}] ${response.statusText}`);
   const data = await response.text();
   console.log(data);
-}
+}