jeffemmett
/
postiz
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: fixes

This commit is contained in:
Nevo David 2024-10-03 15:45:33 +07:00
parent d87b642ab8
commit cf9a2e6990
2 changed files with 19 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/nestjs-libraries/src/integrations/social/discord.provider.ts
View File

@ -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,

49
libraries/nestjs-libraries/src/integrations/social/slack.provider.ts
View File

@ -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,
};
}