fix: do not hardcode scopes for azure AD v2

snok · Mar 30, 2023 · 6518a6a · 6518a6a
1 parent 80adc32
commit 6518a6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/django_auth_adfs/__init__.py b/django_auth_adfs/__init__.py
@@ -4,4 +4,4 @@
 Adding imports here will break setup.py
 """
 
-__version__ = '1.11.4'
+__version__ = '1.11.5'
diff --git a/django_auth_adfs/config.py b/django_auth_adfs/config.py
@@ -346,7 +346,10 @@ def build_authorization_endpoint(self, request, disable_sso=None, force_mfa=Fals
         })
         if self._mode == "openid_connect":
             if settings.VERSION == 'v2.0':
-                query["scope"] = f"openid api://{settings.RELYING_PARTY_ID}/.default"
+                if settings.RELYING_PARTY_ID == settings.CLIENT_ID:
+                    query["scope"] = f"openid api://{settings.RELYING_PARTY_ID}/.default"
+                else:
+                    query["scope"] = f"openid {settings.RELYING_PARTY_ID}"
                 query.pop("resource")
             else:
                 query["scope"] = "openid"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'django-auth-adfs'
-version = "1.11.4"  # Remember to also change __init__.py version
+version = "1.11.5"  # Remember to also change __init__.py version
 description = 'A Django authentication backend for Microsoft ADFS and AzureAD'
 authors = ['Joris Beckers <joris.beckers@gmail.com>']
 maintainers = ['Jonas Krüger Svensson <jonas-ks@hotmail.com>', 'Sondre Lillebø Gundersen <sondrelg@live.no>']