Self hosted FLOSS fitness/workout, nutrition and weight tracker
feat(oauth): add USE_GOOGLE_AUTH setting for allauth, auto-derive USE_SOCIAL_AUTH
pankaj-basnetb3044dad07c0
diff --git a/settings/ci.py b/settings/ci.pyindex 8231437de..319a976b3 100644--- a/settings/ci.py+++ b/settings/ci.py@@ -49,9 +49,8 @@ WGER_SETTINGS['ALLOW_GUEST_USERS'] = TrueWGER_SETTINGS['ALLOW_UPLOAD_VIDEOS'] = FalseWGER_SETTINGS['MIN_ACCOUNT_AGE_TO_TRUST'] = 21 # in daysWGER_SETTINGS['EXERCISE_CACHE_TTL'] = 3600 # in seconds+WGER_SETTINGS['USE_GOOGLE_AUTH'] = FalseWGER_SETTINGS['USE_SOCIAL_AUTH'] = False-WGER_SETTINGS['USE_GITHUB_AUTH'] = False-WGER_SETTINGS['USE_FACEBOOK_AUTH'] = FalseDATABASES = {'default': {diff --git a/settings/local_dev.py b/settings/local_dev.pyindex d2845409c..e4f5d2c64 100644--- a/settings/local_dev.py+++ b/settings/local_dev.py@@ -38,9 +38,8 @@ WGER_SETTINGS['USE_CELERY'] = FalseWGER_SETTINGS['CACHE_API_EXERCISES_CELERY'] = TrueWGER_SETTINGS['CACHE_API_EXERCISES_CELERY_FORCE_UPDATE'] = TrueWGER_SETTINGS['ROUTINE_CACHE_TTL'] = 500+WGER_SETTINGS['USE_GOOGLE_AUTH'] = TrueWGER_SETTINGS['USE_SOCIAL_AUTH'] = True-WGER_SETTINGS['USE_GITHUB_AUTH'] = True-WGER_SETTINGS['USE_FACEBOOK_AUTH'] = TrueDEFAULT_FROM_EMAIL = WGER_SETTINGS['EMAIL_FROM']diff --git a/settings/main.py b/settings/main.pyindex c9c791d86..0aef9e56d 100644--- a/settings/main.py+++ b/settings/main.py@@ -264,8 +264,6 @@ AXES_IPWARE_META_PRECEDENCE_ORDER = env.list(# Dj-rest-auth#WGER_SETTINGS['USE_SOCIAL_AUTH'] = env.bool('USE_SOCIAL_AUTH', False)-WGER_SETTINGS['USE_GITHUB_AUTH'] = env.bool('USE_GITHUB_AUTH', False)-WGER_SETTINGS['USE_FACEBOOK_AUTH'] = env.bool('USE_FACEBOOK_AUTH', False)## Django Rest Framework SimpleJWT#diff --git a/settings/settings_global.py b/settings/settings_global.pyindex 259c5ea50..62828331c 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -283,22 +283,6 @@ SOCIALACCOUNT_PROVIDERS = {},'OAUTH_PKCE_ENABLED': True,},- 'github': {- 'SCOPE': ['user:email'],- 'APP': {- 'client_id': '',- 'secret': '',- 'key': '',- },- },- 'facebook': {- 'METHOD': 'oauth2',- 'SCOPE': ['email', 'public_profile'],- 'FIELDS': ['id', 'email', 'name', 'first_name', 'last_name'],- 'EXCHANGE_TOKEN': True,- 'LOCALE_FUNC': lambda request: 'en_US',- 'VERSION': 'v18.0',- },}ACCOUNT_LOGOUT_ON_GET = True@@ -588,11 +572,15 @@ WGER_SETTINGS = {'TROPHIES_ENABLED': True,'TROPHIES_INACTIVE_USER_DAYS': 30, # Days of inactivity before skipping trophy evaluation# Social authentication/Oauth- 'USE_SOCIAL_AUTH': True, # GOOGLE- 'USE_GITHUB_AUTH': True,- 'USE_FACEBOOK_AUTH': False,+ 'USE_GOOGLE_AUTH': True, # GOOGLE}+WGER_SETTINGS['USE_SOCIAL_AUTH'] = (+ WGER_SETTINGS.get('USE_GOOGLE_AUTH', False)+ or WGER_SETTINGS.get('USE_GITHUB_AUTH', False)+ or WGER_SETTINGS.get('USE_FACEBOOK_AUTH', False)+)+## Django-allauth# Dj-rest-auth@@ -603,17 +591,8 @@ if WGER_SETTINGS.get('USE_SOCIAL_AUTH', False):'allauth.socialaccount','allauth.socialaccount.providers.google',- 'dj_rest_auth',- 'dj_rest_auth.registration',-]- if WGER_SETTINGS.get('USE_GITHUB_AUTH', False):- _social_apps.append('allauth.socialaccount.providers.github')-- if WGER_SETTINGS.get('USE_FACEBOOK_AUTH', False):- _social_apps.append('allauth.socialaccount.providers.facebook')-INSTALLED_APPS += _social_apps#