From 4fbb3b59be84d9ad2dfc6e2e363eb21a9dcdb8d3 Mon Sep 17 00:00:00 2001 From: Mrigank Badola Date: Wed, 9 Oct 2024 08:57:47 +0530 Subject: [PATCH] chore: add changes in accordance to paskal/discord_poc --- backend/app/cmd/server.go | 6 ++++++ frontend/apps/remark42/app/assets/social/discord.svg | 1 + frontend/apps/remark42/app/common/types.ts | 1 + .../remark42/app/components/auth/components/oauth.consts.ts | 1 + frontend/packages/api/clients/index.ts | 1 + 5 files changed, 10 insertions(+) create mode 100644 frontend/apps/remark42/app/assets/social/discord.svg diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go index 121ed85f..c34e9374 100644 --- a/backend/app/cmd/server.go +++ b/backend/app/cmd/server.go @@ -107,6 +107,7 @@ type ServerCommand struct { Yandex AuthGroup `group:"yandex" namespace:"yandex" env-namespace:"YANDEX" description:"Yandex OAuth"` Twitter AuthGroup `group:"twitter" namespace:"twitter" env-namespace:"TWITTER" description:"Twitter OAuth"` Patreon AuthGroup `group:"patreon" namespace:"patreon" env-namespace:"PATREON" description:"Patreon OAuth"` + Discord AuthGroup `group:"discord" namespace:"discord" env-namespace:"DISCORD" description:"Discord OAuth"` Telegram bool `long:"telegram" env:"TELEGRAM" description:"Enable Telegram auth (using token from telegram.token)"` Dev bool `long:"dev" env:"DEV" description:"enable dev (local) oauth2"` Anonymous bool `long:"anon" env:"ANON" description:"enable anonymous login"` @@ -320,6 +321,7 @@ func (s *ServerCommand) Execute(_ []string) error { "AUTH_TWITTER_CSEC", "AUTH_YANDEX_CSEC", "AUTH_PATREON_CSEC", + "AUTH_DISCORD_CSEC", "TELEGRAM_TOKEN", "SMTP_PASSWORD", "ADMIN_PASSWD", @@ -944,6 +946,10 @@ func (s *ServerCommand) addAuthProviders(authenticator *auth.Service) error { authenticator.AddProvider("patreon", s.Auth.Patreon.CID, s.Auth.Patreon.CSEC) providersCount++ } + if s.Auth.Discord.CID != "" && s.Auth.Discord.CSEC != "" { + authenticator.AddProvider("discord", s.Auth.Discord.CID, s.Auth.Discord.CSEC) + providersCount++ + } if s.Auth.Dev { log.Print("[INFO] dev access enabled") diff --git a/frontend/apps/remark42/app/assets/social/discord.svg b/frontend/apps/remark42/app/assets/social/discord.svg new file mode 100644 index 00000000..bb6324e4 --- /dev/null +++ b/frontend/apps/remark42/app/assets/social/discord.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/apps/remark42/app/common/types.ts b/frontend/apps/remark42/app/common/types.ts index 173cf17e..fd18f8eb 100644 --- a/frontend/apps/remark42/app/common/types.ts +++ b/frontend/apps/remark42/app/common/types.ts @@ -99,6 +99,7 @@ export type OAuthProvider = | 'github' | 'microsoft' | 'patreon' + | 'discord' | 'telegram' | 'dev'; export type FormProvider = 'email' | 'anonymous'; diff --git a/frontend/apps/remark42/app/components/auth/components/oauth.consts.ts b/frontend/apps/remark42/app/components/auth/components/oauth.consts.ts index 61e217a1..d7d86d7f 100644 --- a/frontend/apps/remark42/app/components/auth/components/oauth.consts.ts +++ b/frontend/apps/remark42/app/components/auth/components/oauth.consts.ts @@ -9,6 +9,7 @@ export const OAUTH_DATA = { facebook: require('assets/social/facebook.svg').default as string, twitter: require('assets/social/twitter.svg').default as string, patreon: require('assets/social/patreon.svg').default as string, + discord: require('assets/social/discord.svg').default as string, google: require('assets/social/google.svg').default as string, microsoft: require('assets/social/microsoft.svg').default as string, yandex: require('assets/social/yandex.svg').default as string, diff --git a/frontend/packages/api/clients/index.ts b/frontend/packages/api/clients/index.ts index 3b648e31..a262d9ec 100644 --- a/frontend/packages/api/clients/index.ts +++ b/frontend/packages/api/clients/index.ts @@ -25,6 +25,7 @@ export type OAuthProvider = | 'github' | 'microsoft' | 'patreon' + | 'discord' | 'telegram' | 'dev' export type FormProvider = 'email' | 'anonymous'