From 623d98de5b0aeb3910bd8e52c5d239e7c9ac4b1f Mon Sep 17 00:00:00 2001
From: sahama <sayyidhamidmahdavi@gmail.com>
Date: Wed, 7 Aug 2024 17:24:05 +0330
Subject: [PATCH] new oauth urls

---
 apps/users/models.py  | 4 ++--
 data_crud/settings.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/users/models.py b/apps/users/models.py
index befc272..237bcf8 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -91,7 +91,7 @@ class OAuthCode(models.Model):
         return code_challenge
 
     def generate_login_url(self):
-        url = f'''{settings.BASE_OAUTH2_PROVIDER_URL}/oauth2/authorize/?response_type=code&code_challenge={self.generate_code_challenge()}&code_challenge_method=S256&client_id={settings.CLIENT_ID}&scope={settings.SCOPES}&state={self.uuid}'''
+        url = f'''{settings.BASE_OAUTH2_PROVIDER_PUBLIC_URL}/authorize/?response_type=code&code_challenge={self.generate_code_challenge()}&code_challenge_method=S256&client_id={settings.CLIENT_ID}&scope={settings.SCOPES}&state={self.uuid}'''
         return url
 
     def validate_code(self):
@@ -107,6 +107,6 @@ class OAuthCode(models.Model):
             "grant_type": "authorization_code"
         }
 
-        response = requests.post(f'{settings.BASE_OAUTH2_PROVIDER_URL}/oauth2/token/', data=data, headers=headers)
+        response = requests.post(f'{settings.BASE_OAUTH2_PROVIDER_PRIVATE_URL}/token/', data=data, headers=headers)
 
         return response.json()
\ No newline at end of file
diff --git a/data_crud/settings.py b/data_crud/settings.py
index 2803ff7..b9602f2 100644
--- a/data_crud/settings.py
+++ b/data_crud/settings.py
@@ -76,7 +76,9 @@ OAUTH2_PROVIDER_ID_TOKEN_MODEL = "gooyal_oauth2.IDToken"
 OAUTH2_PROVIDER_GRANT_MODEL = "gooyal_oauth2.Grant"
 OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = "gooyal_oauth2.RefreshToken"
 
-BASE_OAUTH2_PROVIDER_URL = "https://accounts.gooyal.com"
+BASE_OAUTH2_PROVIDER_PUBLIC_URL = config("BASE_OAUTH2_PROVIDER_PUBLIC_URL")
+BASE_OAUTH2_PROVIDER_PRIVATE_URL = config("BASE_OAUTH2_PROVIDER_PRIVATE_URL")
+
 CLIENT_ID = config('CLIENT_ID')
 CLIENT_SECRET = config('CLIENT_SECRET')
 SCOPES = config('SCOPES', default='')
@@ -88,7 +90,7 @@ OAUTH2_PROVIDER = {
     #            'groups': 'Access to your groups',
     #            'introspection': 'Introspect token scope'},
     'OAUTH2_VALIDATOR_CLASS': 'apps.gooyal_oauth2.validators.OAuth2Validator',
-    'RESOURCE_SERVER_INTROSPECTION_URL': BASE_OAUTH2_PROVIDER_URL + '/oauth2/introspect/',
+    'RESOURCE_SERVER_INTROSPECTION_URL': BASE_OAUTH2_PROVIDER_PRIVATE_URL + '/introspect/',
     # 'RESOURCE_SERVER_AUTH_TOKEN': '3yUqsWtwKYKHnfivFcJu', # OR this but not both:
     'RESOURCE_SERVER_INTROSPECTION_CREDENTIALS': (CLIENT_ID, CLIENT_SECRET),
 }