feat(microsoft): Configure tenant per app

pennersr · Sep 12, 2023 · cb6ef5d · cb6ef5d
1 parent fda3987
commit cb6ef5d
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/allauth/socialaccount/providers/microsoft/views.py b/allauth/socialaccount/providers/microsoft/views.py
@@ -3,7 +3,9 @@
 import json
 import requests
 
+from allauth.core import context
 from allauth.socialaccount import app_settings
+from allauth.socialaccount.adapter import get_adapter
 from allauth.socialaccount.providers.oauth2.client import OAuth2Error
 from allauth.socialaccount.providers.oauth2.views import (
     OAuth2Adapter,
@@ -35,13 +37,23 @@ def _check_errors(response):
 class MicrosoftGraphOAuth2Adapter(OAuth2Adapter):
     provider_id = MicrosoftGraphProvider.id
 
-    settings = app_settings.PROVIDERS.get(provider_id, {})
-    # Lower case "tenant" for backwards compatibility
-    tenant = settings.get("TENANT", settings.get("tenant", "common"))
+    def _build_tenant_url(self, path):
+        settings = app_settings.PROVIDERS.get(self.provider_id, {})
+        # Lower case "tenant" for backwards compatibility
+        tenant = settings.get("TENANT", settings.get("tenant", "common"))
+        # Prefer app based tenant setting.
+        app = get_adapter().get_app(context.request, provider=self.provider_id)
+        tenant = app.settings.get("tenant", tenant)
+        return f"https://login.microsoftonline.com/{tenant}{path}"
+
+    @property
+    def access_token_url(self):
+        return self._build_tenant_url("/oauth2/v2.0/token")
+
+    @property
+    def authorize_url(self):
+        return self._build_tenant_url("/oauth2/v2.0/authorize")
 
-    provider_base_url = "https://login.microsoftonline.com/{0}".format(tenant)
-    access_token_url = "{0}/oauth2/v2.0/token".format(provider_base_url)
-    authorize_url = "{0}/oauth2/v2.0/authorize".format(provider_base_url)
     profile_url = "https://graph.microsoft.com/v1.0/me"
 
     user_properties = (

diff --git a/docs/socialaccount/providers/microsoft.rst b/docs/socialaccount/providers/microsoft.rst
@@ -7,13 +7,21 @@ documents, directory, devices and more.
 Apps can be registered (for consumer key and secret) here
     https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade
 
-By default, `common` (`organizations` and `consumers`) tenancy is configured
-for the login. To restrict it, change the `TENANT` setting as shown below.
+By default, ``common`` (``organizations`` and ``consumers``) tenancy is configured
+for the login. To restrict it, change the ``tenant`` setting as shown below.
 
 .. code-block:: python
 
-    SOCIALACCOUNT_PROVIDERS = {
-        'microsoft': {
-            'TENANT': 'organizations',
-        }
-    }
+  SOCIALACCOUNT_PROVIDERS = {
+      "microsoft": {
+          "APPS": [
+              {
+                  "client_id": "<insert-id>",
+                  "secret": "<insert-secret>",
+                  "settings": {
+                      "tenant": "organizations",
+                  }
+              }
+          ]
+      }
+  }