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

Jump to bottom

Enable to set callback_url via environment variables #5533

Merged
merged 8 commits into from
Jan 16, 2023
Merged

Enable to set callback_url via environment variables #5533

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b478805
add env for callback_url
mats16 Dec 29, 2022
4a60d79
Merge branch 'develop' into feature/oauth-redirect-env
nmanovic Dec 31, 2022
4f91efc
Merge branch 'develop' into feature/oauth-redirect-env
nmanovic Jan 1, 2023
90a69e3
Update base.py
mats16 Jan 11, 2023
f8a0631
Merge branch 'develop' into feature/oauth-redirect-env
nmanovic Jan 11, 2023
4d81a1d
Update cvat/settings/base.py
nmanovic Jan 11, 2023
15642be
remove spaces
mats16 Jan 13, 2023
5ca715a
Merge branch 'develop' into feature/oauth-redirect-env
nmanovic Jan 13, 2023
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
10 changes: 6 additions & 4 deletions cvat/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,9 @@ class CVAT_QUEUES(Enum):
ACCOUNT_USERNAME_MIN_LENGTH = 5
ACCOUNT_LOGOUT_ON_PASSWORD_CHANGE = True

CVAT_HOST = os.getenv('CVAT_HOST', 'localhost')
CVAT_BASE_URL = os.getenv('CVAT_BASE_URL', f'http://{CVAT_HOST}:8080').rstrip('/')

if USE_ALLAUTH_SOCIAL_ACCOUNTS:
SOCIALACCOUNT_ADAPTER = 'cvat.apps.iam.adapters.SocialAccountAdapterEx'
SOCIALACCOUNT_GITHUB_ADAPTER = 'cvat.apps.iam.adapters.GitHubAdapter'
Expand All @@ -641,17 +644,16 @@ class CVAT_QUEUES(Enum):
SOCIALACCOUNT_QUERY_EMAIL = True
SOCIALACCOUNT_CALLBACK_CANCELLED_URL = '/auth/login'
# custom variable because by default LOGIN_REDIRECT_URL will be used
SOCIAL_APP_LOGIN_REDIRECT_URL = 'http://localhost:8080/auth/login-with-social-app'
SOCIAL_APP_LOGIN_REDIRECT_URL = f'{CVAT_BASE_URL}/auth/login-with-social-app'

GITHUB_CALLBACK_URL = 'http://localhost:8080/api/auth/github/login/callback/'
GOOGLE_CALLBACK_URL = 'http://localhost:8080/api/auth/google/login/callback/'
GITHUB_CALLBACK_URL = f'{CVAT_BASE_URL}/api/auth/github/login/callback/'
GOOGLE_CALLBACK_URL = f'{CVAT_BASE_URL}/api/auth/google/login/callback/'

SOCIAL_AUTH_GOOGLE_CLIENT_ID = os.getenv('SOCIAL_AUTH_GOOGLE_CLIENT_ID')
SOCIAL_AUTH_GOOGLE_CLIENT_SECRET = os.getenv('SOCIAL_AUTH_GOOGLE_CLIENT_SECRET')

SOCIAL_AUTH_GITHUB_CLIENT_ID = os.getenv('SOCIAL_AUTH_GITHUB_CLIENT_ID')
SOCIAL_AUTH_GITHUB_CLIENT_SECRET = os.getenv('SOCIAL_AUTH_GITHUB_CLIENT_SECRET')

SOCIALACCOUNT_PROVIDERS = {
'google': {
'APP': {
Expand Down