Dashboard styling; don't allow login if you have no guild perms; allow logging out

src/api/auth.ts

@@ -7,6 +7,8 @@ import pick from "lodash.pick";
 import https from "https";
 import { ApiUserInfo } from "../data/ApiUserInfo";
 import { ApiUserInfoData } from "../data/entities/ApiUserInfo";
+import { ApiPermissions } from "../data/ApiPermissions";
+import { ok } from "./responses";
 
 const DISCORD_API_URL = "https://discordapp.com/api";
 
@@ -57,6 +59,7 @@ export function initAuth(app: express.Express) {
 
   const apiLogins = new ApiLogins();
   const apiUserInfo = new ApiUserInfo();
+  const apiPermissions = new ApiPermissions();
 
   // Initialize API tokens
   passport.use(
@@ -67,7 +70,7 @@ export function initAuth(app: express.Express) {
 
       const userId = await apiLogins.getUserIdByApiKey(apiKey);
       if (userId) {
-        return cb(null, { userId });
+        return cb(null, { apiKey, userId });
       }
 
       cb();
@@ -88,6 +91,15 @@ export function initAuth(app: express.Express) {
       },
       async (accessToken, refreshToken, profile, cb) => {
         const user = await simpleDiscordAPIRequest(accessToken, "users/@me");
+
+        // Make sure the user is able to access at least 1 guild
+        const permissions = await apiPermissions.getByUserId(user.id);
+        if (permissions.length === 0) {
+          cb(null, {});
+          return;
+        }
+
+        // Generate API key
         const apiKey = await apiLogins.addLogin(user.id);
         const userData = pick(user, ["username", "discriminator", "avatar"]) as ApiUserInfoData;
         await apiUserInfo.update(user.id, userData);
@@ -102,12 +114,15 @@ export function initAuth(app: express.Express) {
     "/auth/oauth-callback",
     passport.authenticate("oauth2", { failureRedirect: "/", session: false }),
     (req, res) => {
-      console.log("redirecting to a non-existent page haHAA");
-      res.redirect(`${process.env.DASHBOARD_URL}/login-callback/?apiKey=${req.user.apiKey}`);
+      if (req.user && req.user.apiKey) {
+        res.redirect(`${process.env.DASHBOARD_URL}/login-callback/?apiKey=${req.user.apiKey}`);
+      } else {
+        res.redirect(`${process.env.DASHBOARD_URL}/login-callback/?error=noaccess`);
+      }
     },
   );
   app.post("/auth/validate-key", async (req: Request, res: Response) => {
-    const key = req.params.key || req.query.key;
+    const key = req.body.key;
     if (!key) {
       return res.status(400).json({ error: "No key supplied" });
     }
@@ -119,10 +134,21 @@ export function initAuth(app: express.Express) {
 
     res.json({ valid: true });
   });
+  app.post("/auth/logout", ...getRequireAPITokenHandlers(), async (req: Request, res: Response) => {
+    await apiLogins.expireApiKey(req.user.apiKey);
+    return ok(res);
+  });
+}
+
+function getRequireAPITokenHandlers() {
+  return [
+    passport.authenticate("api-token", { failWithError: true }),
+    (err, req, res, next) => {
+      return res.json({ error: err.message });
+    },
+  ];
 }
 
 export function requireAPIToken(router: express.Router) {
-  router.use(passport.authenticate("api-token", { failWithError: true }), (err, req, res, next) => {
-    return res.json({ error: err.message });
-  });
+  router.use(...getRequireAPITokenHandlers());
 }

src/api/index.ts

@@ -1,7 +1,4 @@
 import { error, notFound } from "./responses";
-
-require("dotenv").config({ path: path.resolve(__dirname, "..", "..", "api.env") });
-
 import express from "express";
 import cors from "cors";
 import { initAuth } from "./auth";
@@ -10,6 +7,8 @@ import { initArchives } from "./archives";
 import { connect } from "../data/db";
 import path from "path";
 
+require("dotenv").config({ path: path.resolve(__dirname, "..", "..", "api.env") });
+
 console.log("Connecting to database...");
 connect().then(() => {
   const app = express();

src/data/ApiLogins.ts

@@ -75,4 +75,16 @@ export class ApiLogins extends BaseRepository {
 
     return `${loginId}.${token}`;
   }
+
+  expireApiKey(apiKey) {
+    const [loginId, token] = apiKey.split(".");
+    if (!loginId || !token) return;
+
+    return this.apiLogins.update(
+      { id: loginId },
+      {
+        expires_at: moment().format(DBDateFormat),
+      },
+    );
+  }
 }

src/data/ApiPermissions.ts

@@ -10,6 +10,14 @@ export class ApiPermissions extends BaseRepository {
     this.apiPermissions = getRepository(ApiPermission);
   }
 
+  getByUserId(userId) {
+    return this.apiPermissions.find({
+      where: {
+        user_id: userId,
+      },
+    });
+  }
+
   getByGuildAndUserId(guildId, userId) {
     return this.apiPermissions.findOne({
       where: {