xonecas.io
4436
Sl

sesame-labs-coding-assignment / commit 2fb0121

Adds Discord authorization flow start

- Update the UI to be more functional

Sean2023-01-15 2fb0121635f8ba90e97cb7609762274425f4f18b parent 6d7fe9a

12 files changed

api/dist/discord/index.js+49−0
@@ -0,0 +1,49 @@
1+"use strict";
2+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4+ return new (P || (P = Promise))(function (resolve, reject) {
5+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9+ });
10+};
11+var __importDefault = (this && this.__importDefault) || function (mod) {
12+ return (mod && mod.__esModule) ? mod : { "default": mod };
13+};
14+Object.defineProperty(exports, "__esModule", { value: true });
15+const koa_router_1 = __importDefault(require("koa-router"));
16+const router = new koa_router_1.default({ prefix: "/discord" });
17+// TODO: Consider using something `disco-oauth2`
18+router.get("/join", (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
19+ // Front end will send the user here, and then from here into the authorization flow:
20+ //https://discord.com/api/oauth2/authorize?client_id=1064167640148476004&redirect_uri=http%3A%2F%2Flocalhost%3A3001%2Fdiscord%2Fcallback&response_type=code&scope=guilds.join%20guilds.members.read
21+ // TODO: Add `state` url param for extra security
22+ const authorize_url = "https://discord.com/api/oauth2/authorize" +
23+ `?client_id=${process.env.DISCORD_CLIENT_ID}` +
24+ `&redirect_uri=${encodeURI(process.env.DISCORD_REDIRECT_URL || "")}` +
25+ `&response_type=code` +
26+ `&scope=guilds.join guilds.members.read`;
27+ ctx.redirect(authorize_url);
28+ yield next();
29+}));
30+router.get("/callback", (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
31+ // OAuth callback
32+ // TODO: use the token to get the user ID and join the server.
33+ // https://discordapp.com/api/guilds/${SERVER_ID}/members/${userID}
34+ var _a;
35+ const code = (_a = ctx.request.query) === null || _a === void 0 ? void 0 : _a.code;
36+ if (code) {
37+ // Success, we should exchange the code for a token:
38+ // https://discord.com/developers/docs/topics/oauth2#authorization-code-grant-access-token-exchange-example
39+ }
40+ else {
41+ // error?
42+ }
43+ yield next();
44+}));
45+router.get("/verify", (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
46+ // use the discord api to see the list of members and check if user is in the list
47+ // Needs to use the token generated in the callback route
48+}));
49+exports.default = router;
api/dist/routes.js+4−1
@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
1414 Object.defineProperty(exports, "__esModule", { value: true });
1515 const koa_router_1 = __importDefault(require("koa-router"));
1616 const authentication_1 = __importDefault(require("./authentication"));
17+const discord_1 = __importDefault(require("./discord"));
1718 const router = new koa_router_1.default();
1819 router.all("/health-check", (ctx, next) => __awaiter(void 0, void 0, void 0, function* () {
1920 // Check if server is healthy and has connection to db:
@@ -23,5 +24,7 @@ router.all("/health-check", (ctx, next) => __awaiter(void 0, void 0, void 0, fun
2324 }));
2425 router
2526 .use(authentication_1.default.routes())
26- .use(authentication_1.default.allowedMethods());
27+ .use(authentication_1.default.allowedMethods())
28+ .use(discord_1.default.routes())
29+ .use(discord_1.default.allowedMethods());
2730 exports.default = router;
api/package-lock.json+339−0
@@ -29,6 +29,7 @@
2929 "@types/koa-logger": "^3.1.2",
3030 "@types/koa-router": "^7.4.4",
3131 "@types/node": "^18.11.18",
32+ "nodemon": "^2.0.20",
3233 "prisma": "^4.8.1",
3334 "typescript": "^4.9.4"
3435 }
@@ -269,6 +270,12 @@
269270 "@types/node": "*"
270271 }
271272 },
273+ "node_modules/abbrev": {
274+ "version": "1.1.1",
275+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
276+ "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
277+ "dev": true
278+ },
272279 "node_modules/accepts": {
273280 "version": "1.3.8",
274281 "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -292,6 +299,25 @@
292299 "node": ">=4"
293300 }
294301 },
302+ "node_modules/anymatch": {
303+ "version": "3.1.3",
304+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
305+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
306+ "dev": true,
307+ "dependencies": {
308+ "normalize-path": "^3.0.0",
309+ "picomatch": "^2.0.4"
310+ },
311+ "engines": {
312+ "node": ">= 8"
313+ }
314+ },
315+ "node_modules/balanced-match": {
316+ "version": "1.0.2",
317+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
318+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
319+ "dev": true
320+ },
295321 "node_modules/base64-js": {
296322 "version": "1.5.1",
297323 "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -311,6 +337,37 @@
311337 }
312338 ]
313339 },
340+ "node_modules/binary-extensions": {
341+ "version": "2.2.0",
342+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
343+ "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
344+ "dev": true,
345+ "engines": {
346+ "node": ">=8"
347+ }
348+ },
349+ "node_modules/brace-expansion": {
350+ "version": "1.1.11",
351+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
352+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
353+ "dev": true,
354+ "dependencies": {
355+ "balanced-match": "^1.0.0",
356+ "concat-map": "0.0.1"
357+ }
358+ },
359+ "node_modules/braces": {
360+ "version": "3.0.2",
361+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
362+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
363+ "dev": true,
364+ "dependencies": {
365+ "fill-range": "^7.0.1"
366+ },
367+ "engines": {
368+ "node": ">=8"
369+ }
370+ },
314371 "node_modules/buffer": {
315372 "version": "5.7.1",
316373 "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -379,6 +436,33 @@
379436 "node": ">=4"
380437 }
381438 },
439+ "node_modules/chokidar": {
440+ "version": "3.5.3",
441+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
442+ "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
443+ "dev": true,
444+ "funding": [
445+ {
446+ "type": "individual",
447+ "url": "https://paulmillr.com/funding/"
448+ }
449+ ],
450+ "dependencies": {
451+ "anymatch": "~3.1.2",
452+ "braces": "~3.0.2",
453+ "glob-parent": "~5.1.2",
454+ "is-binary-path": "~2.1.0",
455+ "is-glob": "~4.0.1",
456+ "normalize-path": "~3.0.0",
457+ "readdirp": "~3.6.0"
458+ },
459+ "engines": {
460+ "node": ">= 8.10.0"
461+ },
462+ "optionalDependencies": {
463+ "fsevents": "~2.3.2"
464+ }
465+ },
382466 "node_modules/co": {
383467 "version": "4.6.0",
384468 "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -412,6 +496,12 @@
412496 "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
413497 "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
414498 },
499+ "node_modules/concat-map": {
500+ "version": "0.0.1",
501+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
502+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
503+ "dev": true
504+ },
415505 "node_modules/content-disposition": {
416506 "version": "0.5.4",
417507 "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -538,6 +628,18 @@
538628 "node": ">=0.8.0"
539629 }
540630 },
631+ "node_modules/fill-range": {
632+ "version": "7.0.1",
633+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
634+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
635+ "dev": true,
636+ "dependencies": {
637+ "to-regex-range": "^5.0.1"
638+ },
639+ "engines": {
640+ "node": ">=8"
641+ }
642+ },
541643 "node_modules/fresh": {
542644 "version": "0.5.2",
543645 "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
@@ -546,6 +648,20 @@
546648 "node": ">= 0.6"
547649 }
548650 },
651+ "node_modules/fsevents": {
652+ "version": "2.3.2",
653+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
654+ "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
655+ "dev": true,
656+ "hasInstallScript": true,
657+ "optional": true,
658+ "os": [
659+ "darwin"
660+ ],
661+ "engines": {
662+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
663+ }
664+ },
549665 "node_modules/function-bind": {
550666 "version": "1.1.1",
551667 "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -564,6 +680,18 @@
564680 "url": "https://github.com/sponsors/ljharb"
565681 }
566682 },
683+ "node_modules/glob-parent": {
684+ "version": "5.1.2",
685+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
686+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
687+ "dev": true,
688+ "dependencies": {
689+ "is-glob": "^4.0.1"
690+ },
691+ "engines": {
692+ "node": ">= 6"
693+ }
694+ },
567695 "node_modules/has": {
568696 "version": "1.0.3",
569697 "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -678,6 +806,12 @@
678806 }
679807 ]
680808 },
809+ "node_modules/ignore-by-default": {
810+ "version": "1.0.1",
811+ "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz",
812+ "integrity": "sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==",
813+ "dev": true
814+ },
681815 "node_modules/inflation": {
682816 "version": "2.0.0",
683817 "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz",
@@ -691,11 +825,32 @@
691825 "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
692826 "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
693827 },
828+ "node_modules/is-binary-path": {
829+ "version": "2.1.0",
830+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
831+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
832+ "dev": true,
833+ "dependencies": {
834+ "binary-extensions": "^2.0.0"
835+ },
836+ "engines": {
837+ "node": ">=8"
838+ }
839+ },
694840 "node_modules/is-class-hotfix": {
695841 "version": "0.0.6",
696842 "resolved": "https://registry.npmjs.org/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz",
697843 "integrity": "sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ=="
698844 },
845+ "node_modules/is-extglob": {
846+ "version": "2.1.1",
847+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
848+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
849+ "dev": true,
850+ "engines": {
851+ "node": ">=0.10.0"
852+ }
853+ },
699854 "node_modules/is-generator-function": {
700855 "version": "1.0.10",
701856 "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
@@ -710,6 +865,27 @@
710865 "url": "https://github.com/sponsors/ljharb"
711866 }
712867 },
868+ "node_modules/is-glob": {
869+ "version": "4.0.3",
870+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
871+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
872+ "dev": true,
873+ "dependencies": {
874+ "is-extglob": "^2.1.1"
875+ },
876+ "engines": {
877+ "node": ">=0.10.0"
878+ }
879+ },
880+ "node_modules/is-number": {
881+ "version": "7.0.0",
882+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
883+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
884+ "dev": true,
885+ "engines": {
886+ "node": ">=0.12.0"
887+ }
888+ },
713889 "node_modules/is-type-of": {
714890 "version": "1.2.1",
715891 "resolved": "https://registry.npmjs.org/is-type-of/-/is-type-of-1.2.1.tgz",
@@ -922,6 +1098,18 @@
9221098 "node": ">= 0.6"
9231099 }
9241100 },
1101+ "node_modules/minimatch": {
1102+ "version": "3.1.2",
1103+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
1104+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
1105+ "dev": true,
1106+ "dependencies": {
1107+ "brace-expansion": "^1.1.7"
1108+ },
1109+ "engines": {
1110+ "node": "*"
1111+ }
1112+ },
9251113 "node_modules/ms": {
9261114 "version": "2.1.2",
9271115 "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -935,6 +1123,67 @@
9351123 "node": ">= 0.6"
9361124 }
9371125 },
1126+ "node_modules/nodemon": {
1127+ "version": "2.0.20",
1128+ "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
1129+ "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
1130+ "dev": true,
1131+ "dependencies": {
1132+ "chokidar": "^3.5.2",
1133+ "debug": "^3.2.7",
1134+ "ignore-by-default": "^1.0.1",
1135+ "minimatch": "^3.1.2",
1136+ "pstree.remy": "^1.1.8",
1137+ "semver": "^5.7.1",
1138+ "simple-update-notifier": "^1.0.7",
1139+ "supports-color": "^5.5.0",
1140+ "touch": "^3.1.0",
1141+ "undefsafe": "^2.0.5"
1142+ },
1143+ "bin": {
1144+ "nodemon": "bin/nodemon.js"
1145+ },
1146+ "engines": {
1147+ "node": ">=8.10.0"
1148+ },
1149+ "funding": {
1150+ "type": "opencollective",
1151+ "url": "https://opencollective.com/nodemon"
1152+ }
1153+ },
1154+ "node_modules/nodemon/node_modules/debug": {
1155+ "version": "3.2.7",
1156+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
1157+ "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
1158+ "dev": true,
1159+ "dependencies": {
1160+ "ms": "^2.1.1"
1161+ }
1162+ },
1163+ "node_modules/nopt": {
1164+ "version": "1.0.10",
1165+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
1166+ "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
1167+ "dev": true,
1168+ "dependencies": {
1169+ "abbrev": "1"
1170+ },
1171+ "bin": {
1172+ "nopt": "bin/nopt.js"
1173+ },
1174+ "engines": {
1175+ "node": "*"
1176+ }
1177+ },
1178+ "node_modules/normalize-path": {
1179+ "version": "3.0.0",
1180+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
1181+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
1182+ "dev": true,
1183+ "engines": {
1184+ "node": ">=0.10.0"
1185+ }
1186+ },
9381187 "node_modules/object-inspect": {
9391188 "version": "1.12.3",
9401189 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -977,6 +1226,18 @@
9771226 "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz",
9781227 "integrity": "sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="
9791228 },
1229+ "node_modules/picomatch": {
1230+ "version": "2.3.1",
1231+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
1232+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
1233+ "dev": true,
1234+ "engines": {
1235+ "node": ">=8.6"
1236+ },
1237+ "funding": {
1238+ "url": "https://github.com/sponsors/jonschlinkert"
1239+ }
1240+ },
9801241 "node_modules/prisma": {
9811242 "version": "4.8.1",
9821243 "resolved": "https://registry.npmjs.org/prisma/-/prisma-4.8.1.tgz",
@@ -999,6 +1260,12 @@
9991260 "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
10001261 "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
10011262 },
1263+ "node_modules/pstree.remy": {
1264+ "version": "1.1.8",
1265+ "resolved": "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz",
1266+ "integrity": "sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==",
1267+ "dev": true
1268+ },
10021269 "node_modules/qs": {
10031270 "version": "6.11.0",
10041271 "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
@@ -1069,6 +1336,18 @@
10691336 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
10701337 "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
10711338 },
1339+ "node_modules/readdirp": {
1340+ "version": "3.6.0",
1341+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
1342+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
1343+ "dev": true,
1344+ "dependencies": {
1345+ "picomatch": "^2.2.1"
1346+ },
1347+ "engines": {
1348+ "node": ">=8.10.0"
1349+ }
1350+ },
10721351 "node_modules/safe-buffer": {
10731352 "version": "5.2.1",
10741353 "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1093,6 +1372,15 @@
10931372 "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
10941373 "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
10951374 },
1375+ "node_modules/semver": {
1376+ "version": "5.7.1",
1377+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
1378+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
1379+ "dev": true,
1380+ "bin": {
1381+ "semver": "bin/semver"
1382+ }
1383+ },
10961384 "node_modules/setprototypeof": {
10971385 "version": "1.2.0",
10981386 "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -1111,6 +1399,27 @@
11111399 "url": "https://github.com/sponsors/ljharb"
11121400 }
11131401 },
1402+ "node_modules/simple-update-notifier": {
1403+ "version": "1.1.0",
1404+ "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz",
1405+ "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==",
1406+ "dev": true,
1407+ "dependencies": {
1408+ "semver": "~7.0.0"
1409+ },
1410+ "engines": {
1411+ "node": ">=8.10.0"
1412+ }
1413+ },
1414+ "node_modules/simple-update-notifier/node_modules/semver": {
1415+ "version": "7.0.0",
1416+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
1417+ "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
1418+ "dev": true,
1419+ "bin": {
1420+ "semver": "bin/semver.js"
1421+ }
1422+ },
11141423 "node_modules/statuses": {
11151424 "version": "1.5.0",
11161425 "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -1152,6 +1461,18 @@
11521461 "node": ">=4"
11531462 }
11541463 },
1464+ "node_modules/to-regex-range": {
1465+ "version": "5.0.1",
1466+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
1467+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
1468+ "dev": true,
1469+ "dependencies": {
1470+ "is-number": "^7.0.0"
1471+ },
1472+ "engines": {
1473+ "node": ">=8.0"
1474+ }
1475+ },
11551476 "node_modules/toidentifier": {
11561477 "version": "1.0.1",
11571478 "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -1160,6 +1481,18 @@
11601481 "node": ">=0.6"
11611482 }
11621483 },
1484+ "node_modules/touch": {
1485+ "version": "3.1.0",
1486+ "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
1487+ "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==",
1488+ "dev": true,
1489+ "dependencies": {
1490+ "nopt": "~1.0.10"
1491+ },
1492+ "bin": {
1493+ "nodetouch": "bin/nodetouch.js"
1494+ }
1495+ },
11631496 "node_modules/tsscmp": {
11641497 "version": "1.0.6",
11651498 "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz",
@@ -1193,6 +1526,12 @@
11931526 "node": ">=4.2.0"
11941527 }
11951528 },
1529+ "node_modules/undefsafe": {
1530+ "version": "2.0.5",
1531+ "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz",
1532+ "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
1533+ "dev": true
1534+ },
11961535 "node_modules/unpipe": {
11971536 "version": "1.0.0",
11981537 "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
api/package.json+1−0
@@ -18,6 +18,7 @@
1818 "@types/koa-logger": "^3.1.2",
1919 "@types/koa-router": "^7.4.4",
2020 "@types/node": "^18.11.18",
21+ "nodemon": "^2.0.20",
2122 "prisma": "^4.8.1",
2223 "typescript": "^4.9.4"
2324 },
api/src/discord/index.ts+49−0
@@ -0,0 +1,49 @@
1+import Router from "koa-router";
2+import Koa from "koa";
3+
4+const router = new Router({ prefix: "/discord" });
5+
6+// TODO: Consider using something `disco-oauth2`
7+
8+router.get("/join", async (ctx: Koa.ParameterizedContext, next: Koa.Next) => {
9+ // Front end will send the user here, and then from here into the authorization flow:
10+ //https://discord.com/api/oauth2/authorize?client_id=1064167640148476004&redirect_uri=http%3A%2F%2Flocalhost%3A3001%2Fdiscord%2Fcallback&response_type=code&scope=guilds.join%20guilds.members.read
11+ // TODO: Add `state` url param for extra security
12+ const authorize_url =
13+ "https://discord.com/api/oauth2/authorize" +
14+ `?client_id=${process.env.DISCORD_CLIENT_ID}` +
15+ `&redirect_uri=${encodeURI(process.env.DISCORD_REDIRECT_URL || "")}` +
16+ `&response_type=code` +
17+ `&scope=guilds.join guilds.members.read`;
18+
19+ ctx.redirect(authorize_url);
20+
21+ await next();
22+});
23+
24+router.get(
25+ "/callback",
26+ async (ctx: Koa.ParameterizedContext, next: Koa.Next) => {
27+ // OAuth callback
28+ // TODO: use the token to get the user ID and join the server.
29+ // https://discordapp.com/api/guilds/${SERVER_ID}/members/${userID}
30+
31+ const code = ctx.request.query?.code;
32+
33+ if (code) {
34+ // Success, we should exchange the code for a token:
35+ // https://discord.com/developers/docs/topics/oauth2#authorization-code-grant-access-token-exchange-example
36+ } else {
37+ // error?
38+ }
39+
40+ await next();
41+ }
42+);
43+
44+router.get("/verify", async (ctx: Koa.ParameterizedContext, next: Koa.Next) => {
45+ // use the discord api to see the list of members and check if user is in the list
46+ // Needs to use the token generated in the callback route
47+});
48+
49+export default router;
api/src/routes.ts+4−1
@@ -1,6 +1,7 @@
11 import Koa from "koa";
22 import Router from "koa-router";
33 import authenticationRouter from "./authentication";
4+import discordRouter from "./discord";
45
56 const router = new Router();
67
@@ -17,6 +18,8 @@ router.all(
1718
1819 router
1920 .use(authenticationRouter.routes())
20- .use(authenticationRouter.allowedMethods());
21+ .use(authenticationRouter.allowedMethods())
22+ .use(discordRouter.routes())
23+ .use(discordRouter.allowedMethods());
2124
2225 export default router;
ui/src/components/AuthenticationForm/index.tsx+15−5
@@ -1,5 +1,6 @@
11 import React, { useState, useContext } from "react";
22 import axios from "axios";
3+import styled from "styled-components";
34 import { useNavigate } from "react-router-dom";
45 import { PageContext } from "../Page";
56
@@ -20,7 +21,6 @@ export async function AuthenticationLoader() {
2021 return user;
2122 }
2223
23-// TODO: This form should show the logout button when logged in
2424 export function AuthenticationForm() {
2525 const [isLoading, setIsLoading] = useState(false);
2626 const [error, setError] = useState("");
@@ -77,14 +77,24 @@ export function AuthenticationForm() {
7777 {isLoading ? (
7878 <div>Loading...</div>
7979 ) : context?.user ? (
80- <button onClick={handleDeauthenticateClick}>Sign out</button>
80+ <StyledButton onClick={handleDeauthenticateClick}>
81+ Sign out
82+ </StyledButton>
8183 ) : (
82- <button onClick={handleAuthenticateClick}>
83- Connect to your wallet via MetaMask
84- </button>
84+ <StyledButton onClick={handleAuthenticateClick}>
85+ Connect with your wallet via MetaMask
86+ </StyledButton>
8587 )}
8688
8789 {error && <p>{error}</p>}
8890 </div>
8991 );
9092 }
93+
94+const StyledButton = styled.button`
95+ padding: 0.5em 1em;
96+ background: ${(props) => props.theme.colors.background};
97+ color: ${(props) => props.theme.colors.foreground};
98+ border: 2px solid ${(props) => props.theme.colors.highlight};
99+ border-radius: 4px;
100+`;
ui/src/components/Header/index.tsx+43−0
@@ -0,0 +1,43 @@
1+import React from "react";
2+import styled from "styled-components";
3+
4+import { AuthenticationForm } from "../AuthenticationForm";
5+
6+export default function Header({ children }: { children?: React.ReactNode }) {
7+ return (
8+ <StyledHeader>
9+ {children ? (
10+ children
11+ ) : (
12+ <>
13+ <h1>Sesame Labs Coding Assignment</h1>
14+ <div>{/* TODO: navigation links go here */}</div>
15+ <div>
16+ <AuthenticationForm />
17+ </div>
18+ </>
19+ )}
20+ </StyledHeader>
21+ );
22+}
23+
24+const StyledHeader = styled.div`
25+ width: 100%;
26+ height: 60px;
27+ display: grid;
28+ grid-template-columns: 600px 1fr 200px;
29+
30+ > * {
31+ padding: 0.5em 1em;
32+ }
33+
34+ > h1 {
35+ margin: 0;
36+ font-size: 1.5em;
37+ }
38+
39+ > :last-child {
40+ display: flex;
41+ justify-content: right;
42+ }
43+`;
ui/src/components/Page/index.tsx+2−0
@@ -35,7 +35,9 @@ export default function Page({
3535
3636 const StyledPage = styled.div`
3737 display: flex;
38+ flex-wrap: wrap;
3839 justify-content: center;
40+ width: 100%;
3941 height: 100%;
4042 color: ${(props) => props.theme.colors.foreground};
4143 background-color: ${(props) => props.theme.colors.background};
ui/src/index.tsx+8−1
@@ -8,6 +8,7 @@ import {
88 AuthenticationLoader,
99 } from "./components/AuthenticationForm";
1010 import axios from "axios";
11+import Header from "./components/Header";
1112
1213 axios.defaults.baseURL = "http://localhost:3001/";
1314 axios.defaults.headers["Content-Type"] = "application/json";
@@ -18,7 +19,13 @@ const router = createBrowserRouter([
1819 path: "/",
1920 element: (
2021 <Page requiresAuthentication={true} redirectTarget="/sign-in">
21- Sean was here
22+ <>
23+ <Header />
24+ <p>
25+ Click this link to join discord server:{" "}
26+ <a href="http://localhost:3001/discord/join">Authorize</a>
27+ </p>
28+ </>
2229 </Page>
2330 ),
2431 loader: AuthenticationLoader,
ui/src/theme.ts+3−3
@@ -1,6 +1,6 @@
1-const theme: {
2- colors: { background: string; foreground: string; highlight: string };
3-} = {
1+import { ThemeType } from "./types";
2+
3+const theme: ThemeType = {
44 colors: {
55 background: "#02020a",
66 foreground: "#e1e2ef",
ui/src/types.ts+4−0
@@ -6,3 +6,7 @@ export interface UserType {
66 export interface PageContextType {
77 user: UserType | unknown;
88 }
9+
10+export interface ThemeType {
11+ colors: { background: string; foreground: string; highlight: string };
12+}