Simplified based on new APIs from identity v0.6

Author: rayluo

README.md

@@ -27,9 +27,9 @@ to sign in users and make authenticated calls to the Microsoft Graph API.
    how to build this from scratch, or how to add auth to your existing project.)
 2. `cd project_name`
 3. Run `pip install -r requirements.txt` to install dependencies
-4. Run `python manage.py migrate` to initialize your Django project
-5. Copy [`.env.sample`](https://github.com/Azure-Samples/ms-identity-python-webapp-django/blob/main/.env.sample) as `.env`,
+4. Copy [`.env.sample`](https://github.com/Azure-Samples/ms-identity-python-webapp-django/blob/main/.env.sample) as `.env`,
    and then modify its content based on your application's registration.
+5. Run `python manage.py migrate` to initialize your Django project
 
 ### Quickstart
 

mysite/settings.py

@@ -19,7 +19,6 @@
     os.getenv('CLIENT_ID'),
     client_credential=os.getenv('CLIENT_SECRET'),
     redirect_uri=os.getenv('REDIRECT_URI'),
-    scopes=os.getenv('SCOPE', "").split(),
     authority=os.getenv('AUTHORITY'),
     )
 

mysite/views.py

@@ -2,35 +2,29 @@
 import json
 
 from django.conf import settings
-from django.shortcuts import redirect, render
+from django.shortcuts import render
 import requests
 
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 
 @settings.AUTH.login_required
-def index(request):
-    user = settings.AUTH.get_user(request)
-    assert user  # User would not be None since we decorated this view with @login_required
+def index(request, *, context):
     return render(request, 'index.html', dict(
-        user=user,
+        user=context['user'],
         version=__version__,
-        edit_profile_url=settings.AUTH.get_edit_profile_url(request),
+        edit_profile_url=settings.AUTH.get_edit_profile_url(),
         downstream_api=os.getenv("ENDPOINT"),
     ))
 
-# Instead of using the login_required decorator,
-# here we demonstrate how to handle the error explicitly.
-def call_downstream_api(request):
-    token = settings.AUTH.get_token_for_user(request, os.getenv("SCOPE", "").split())
-    if "error" in token:
-        return redirect(settings.AUTH.login)
-    api_result = requests.get(  # Use access token to call downstream api
+@settings.AUTH.login_required(scopes=os.getenv("SCOPE", "").split())
+def call_downstream_api(request, *, context):
+    api_result = requests.get(  # Use access token to call a web api
         os.getenv("ENDPOINT"),
-        headers={'Authorization': 'Bearer ' + token['access_token']},
+        headers={'Authorization': 'Bearer ' + context['access_token']},
         timeout=30,
-    ).json()  # Here we assume the response format is json
+    ).json() if context.get('access_token') else "Did you forget to set the SCOPE environment variable?"
     return render(request, 'display.html', {
         "title": "Result of downstream API call",
         "content": json.dumps(api_result, indent=4),

requirements.txt

@@ -2,6 +2,6 @@
 # See https://docs.djangoproject.com/en/5.0/faq/install/#what-python-version-can-i-use-with-django
 django>=3.2,<6
 
-identity>=0.5.2,<0.6
+identity>=0.6,<0.7
 python-dotenv<0.22
 requests>=2,<3