Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(social-login): rename env.vars for social login #7232

Merged
merged 3 commits into from
Mar 13, 2025
+12 −12
Merged

chore(social-login): rename env.vars for social login #7232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe8c1db
chore: social auth is algo in sign-up page
paabloLC Mar 13, 2025
2c70f29
chore: rename env vars for social login
paabloLC Mar 13, 2025
67fa1ad
chore: rename env.var for social login
paabloLC Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions api/src/backend/config/settings/social_login.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from config.env import env

# Google Oauth settings
GOOGLE_OAUTH_CLIENT_ID = env("DJANGO_GOOGLE_OAUTH_CLIENT_ID", default="")
GOOGLE_OAUTH_CLIENT_SECRET = env("DJANGO_GOOGLE_OAUTH_CLIENT_SECRET", default="")
GOOGLE_OAUTH_CALLBACK_URL = env("DJANGO_GOOGLE_OAUTH_CALLBACK_URL", default="")
# Provider Oauth settings
GOOGLE_OAUTH_CLIENT_ID = env("SOCIAL_GOOGLE_OAUTH_CLIENT_ID", default="")
GOOGLE_OAUTH_CLIENT_SECRET = env("SOCIAL_GOOGLE_OAUTH_CLIENT_SECRET", default="")
GOOGLE_OAUTH_CALLBACK_URL = env("SOCIAL_GOOGLE_OAUTH_CALLBACK_URL", default="")

GITHUB_OAUTH_CLIENT_ID = env("DJANGO_GITHUB_OAUTH_CLIENT_ID", default="")
GITHUB_OAUTH_CLIENT_SECRET = env("DJANGO_GITHUB_OAUTH_CLIENT_SECRET", default="")
GITHUB_OAUTH_CALLBACK_URL = env("DJANGO_GITHUB_OAUTH_CALLBACK_URL", default="")
GITHUB_OAUTH_CLIENT_ID = env("SOCIAL_GITHUB_OAUTH_CLIENT_ID", default="")
GITHUB_OAUTH_CLIENT_SECRET = env("SOCIAL_GITHUB_OAUTH_CLIENT_SECRET", default="")
GITHUB_OAUTH_CALLBACK_URL = env("SOCIAL_GITHUB_OAUTH_CALLBACK_URL", default="")

# Allauth settings
ACCOUNT_LOGIN_METHODS = {"email"} # Use Email / Password authentication
Expand Down
2 changes: 1 addition & 1 deletion ui/components/auth/oss/auth-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ export const AuthForm = ({
</form>
</Form>

{type === "sign-in" && (
{!invitationToken && (
<>
<div className="flex items-center gap-4 py-2">
<Divider className="flex-1" />
Expand Down
8 changes: 4 additions & 4 deletions ui/lib/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ export const getAuthUrl = (provider: AuthSocialProvider) => {
google: {
baseUrl: "https://accounts.google.com/o/oauth2/v2/auth",
params: {
redirect_uri: process.env.NEXT_PUBLIC_GOOGLE_CALLBACK_URI,
redirect_uri: process.env.SOCIAL_GOOGLE_OAUTH_CALLBACK_URL,
prompt: "consent",
response_type: "code",
client_id: process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID,
client_id: process.env.SOCIAL_GOOGLE_OAUTH_CLIENT_ID,
scope: "openid email profile",
access_type: "offline",
},
},
github: {
baseUrl: "https://github.com/login/oauth/authorize",
params: {
client_id: process.env.NEXT_PUBLIC_GITHUB_OAUTH_CLIENT_ID,
redirect_uri: process.env.NEXT_PUBLIC_GITHUB_OAUTH_CALLBACK_URL,
client_id: process.env.SOCIAL_GITHUB_OAUTH_CLIENT_ID,
redirect_uri: process.env.SOCIAL_GITHUB_OAUTH_CALLBACK_URL,
scope: "user:email",
},
},
Expand Down
Loading