Merge branch 'main' of github.com:Decatur-Robotics/Gearbox

Decatur-Robotics · Jul 26, 2024 · 2fa890a · 2fa890a
2 parents f4c47a1 + cd67eb7
commit 2fa890a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/components/AddToSlack.tsx b/components/AddToSlack.tsx
@@ -1,6 +1,11 @@
 export default function AddToSlack() {
   return (
-    <a className="link text-accent" href="https://slack.com/oauth/v2/authorize?client_id=10831824934.7404945710466&scope=chat:write,commands&user_scope=email,openid">
+    <a className="link text-accent" href={`
+        https://slack.com/oauth/v2/authorize
+          ?client_id=${process.env.NEXT_PUBLIC_SLACK_CLIENT_ID}
+          &scope=chat:write,commands&user_scope=email,openid
+          &redirect_uri=https%3A%2F%2Flocalhost%2Fapi%2FaddSlackBot
+    `}>
       Add Gearbox to Slack
     </a>
   );

diff --git a/enviroment.d.ts b/enviroment.d.ts
@@ -29,7 +29,7 @@ declare global {
       FILL_TEAMS: string;
 
       SLACK_BOT_TOKEN: string;
-      SLACK_CLIENT_ID: string;
+      NEXT_PUBLIC_SLACK_CLIENT_ID: string;
       SLACK_CLIENT_SECRET: string;
       SLACK_APP_TOKEN: string;
       SLACK_SIGNING_SECRET: string;

diff --git a/lib/API.ts b/lib/API.ts
@@ -112,7 +112,8 @@ export namespace API {
         }
       }
 
-      var route = req.url.replace(this.basePath, "");
+      const routeRaw = req.url.replace(this.basePath, "");
+      const route = routeRaw.substring(0, routeRaw.indexOf("?"));
 
       if (route in this.routes) {
         this.routes[route](req, res, {
@@ -1034,6 +1035,10 @@ export namespace API {
     getFtcTeamAutofillData: async (req, res, { tba, data }: RouteContents<{ teamNumber: number }>) => {
       const team = await TheOrangeAlliance.getTeam(data.teamNumber);
       return res.status(200).send(team);
+    },
+
+    addSlackBot: async (req, res, { db, data }) => {
+      return res.status(200).send({ result: "success" });
     }
   };
 }
diff --git a/lib/Auth.ts b/lib/Auth.ts
@@ -42,7 +42,7 @@ export const AuthenticationOptions: AuthOptions = {
       }),
       */
     SlackProvider({
-      clientId: process.env.SLACK_CLIENT_ID as string,
+      clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID as string,
       clientSecret: process.env.SLACK_CLIENT_SECRET as string,
       profile: async (profile) => {
         const user = new User(