From cf9a2e69904e231b8e504fcbdc253c64ab8c2616 Mon Sep 17 00:00:00 2001
From: Nevo David <nevo@notu.co>
Date: Thu, 3 Oct 2024 15:45:33 +0700
Subject: [PATCH] feat: fixes

---
 .../integrations/social/discord.provider.ts   |  7 ++-
 .../src/integrations/social/slack.provider.ts | 49 ++++++-------------
 2 files changed, 19 insertions(+), 37 deletions(-)

diff --git a/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts b/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
index f5667a52..d03ea417 100644
--- a/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
@@ -69,12 +69,11 @@ export class DiscordProvider extends SocialAbstract implements SocialProvider {
     codeVerifier: string;
     refresh?: string;
   }) {
-    const [newCode, guild] = params.code.split(':');
-    const { access_token, expires_in, refresh_token, scope } = await (
+    const { access_token, expires_in, refresh_token, scope, guild } = await (
       await this.fetch('https://discord.com/api/oauth2/token', {
         method: 'POST',
         body: new URLSearchParams({
-          code: newCode,
+          code: params.code,
           grant_type: 'authorization_code',
           redirect_uri: `${process.env.FRONTEND_URL}/integrations/social/discord`,
         }),
@@ -100,7 +99,7 @@ export class DiscordProvider extends SocialAbstract implements SocialProvider {
     ).json();
 
     return {
-      id: guild,
+      id: guild.id,
       name: application.name,
       accessToken: access_token,
       refreshToken: refresh_token,
diff --git a/libraries/nestjs-libraries/src/integrations/social/slack.provider.ts b/libraries/nestjs-libraries/src/integrations/social/slack.provider.ts
index da34b898..675bee99 100644
--- a/libraries/nestjs-libraries/src/integrations/social/slack.provider.ts
+++ b/libraries/nestjs-libraries/src/integrations/social/slack.provider.ts
@@ -13,40 +13,21 @@ export class SlackProvider extends SocialAbstract implements SocialProvider {
   identifier = 'slack';
   name = 'Slack';
   isBetweenSteps = false;
-  scopes = ['identify', 'guilds'];
+  scopes = [
+    'channels:read',
+    'chat:write',
+    'users:read',
+    'groups:read',
+    'channels:join',
+    'chat:write.customize',
+  ];
   async refreshToken(refreshToken: string): Promise<AuthTokenDetails> {
-    const { access_token, expires_in, refresh_token } = await (
-      await this.fetch('https://discord.com/api/oauth2/token', {
-        method: 'POST',
-        body: new URLSearchParams({
-          refresh_token: refreshToken,
-          grant_type: 'refresh_token',
-        }),
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          Authorization: `Basic ${Buffer.from(
-            process.env.DISCORD_CLIENT_ID +
-              ':' +
-              process.env.DISCORD_CLIENT_SECRET
-          ).toString('base64')}`,
-        },
-      })
-    ).json();
-
-    const { application } = await (
-      await fetch('https://discord.com/api/oauth2/@me', {
-        headers: {
-          Authorization: `Bearer ${access_token}`,
-        },
-      })
-    ).json();
-
     return {
-      refreshToken: refresh_token,
-      expiresIn: expires_in,
-      accessToken: access_token,
+      refreshToken: '',
+      expiresIn: 1000000,
+      accessToken: '',
       id: '',
-      name: application.name,
+      name: '',
       picture: '',
       username: '',
     };
@@ -76,7 +57,7 @@ export class SlackProvider extends SocialAbstract implements SocialProvider {
     codeVerifier: string;
     refresh?: string;
   }) {
-    const { access_token, team, bot_user_id, authed_user, ...all } = await (
+    const { access_token, team, bot_user_id, scope } = await (
       await this.fetch(`https://slack.com/api/oauth.v2.access`, {
         method: 'POST',
         headers: {
@@ -97,6 +78,8 @@ export class SlackProvider extends SocialAbstract implements SocialProvider {
       })
     ).json();
 
+    this.checkScopes(this.scopes, scope.split(','));
+
     const { user } = await (
       await fetch(`https://slack.com/api/users.info?user=${bot_user_id}`, {
         method: 'GET',
@@ -112,7 +95,7 @@ export class SlackProvider extends SocialAbstract implements SocialProvider {
       accessToken: access_token,
       refreshToken: 'null',
       expiresIn: dayjs().add(100, 'years').unix() - dayjs().unix(),
-      picture: user.profile.image_48,
+      picture: user.profile.image_original,
       username: user.name,
     };
   }