Merge branch 'master' of https://github.com/TylerLu/EDUGraphAPI-Python

Author: BennyZhang-Canviz

README.md

@@ -421,7 +421,7 @@ The first 2 flows (Local Login/O365 Login) enable users to login in with either
 
 This flow shows how an administrator logs into the system and performs administrative operations.
 
-After logging into the app with an Office 365 account,the administrator will be asked to link to a local account. This step is not required and can be skipped. 
+After logging into the app with an Office 365 account, the administrator will be asked to link to a local account. This step is not required and can be skipped. 
 
 As mentioned earlier, the web app is a multi-tenant app which uses some application permissions, so tenant administrator must consent the app first.  
 

admin/views.py

@@ -51,7 +51,7 @@ def consent_alone(request):
 
 def process_code(request):
     AuthService.validate_state(request)
-    id_token = AuthService.get_id_token(request)    
+    id_token = AuthService.get_id_token(request)
     tenant_id = id_token.get('tid')
 
     user_service.update_organization(tenant_id, True)
@@ -72,7 +72,8 @@ def unconsent(request):
     aad_graph_service = AADGraphService(user.tenant_id, token)
 
     service_principal = aad_graph_service.get_service_principal()
-    aad_graph_service.delete_service_principal(service_principal['objectId'])    
+    if service_principal:
+        aad_graph_service.delete_service_principal(service_principal['objectId'])    
     user_service.update_organization(user.tenant_id, False)
     link_service.remove_links(user.tenant_id)
 

services/aad_graph_service.py

@@ -3,6 +3,7 @@
  *   * See LICENSE in the project root for license information.
 '''
 
+import re
 import urllib
 import constant
 from services.rest_api_service import RestApiService
@@ -12,28 +13,37 @@ class AADGraphService(object):
     def __init__(self, tenant_id, access_token):
         self.api_base_uri = constant.Resources.AADGraph + '/' + tenant_id + '/'
         self.access_token = access_token
+        self.skip_token_re = re.compile('(?<=skiptoken=).*')
         self.rest_api_service = RestApiService()
 
     def get_service_principal(self):
         url = self.api_base_uri + "servicePrincipals?api-version=1.6&$filter=appId eq '%s'" % constant.client_id
         app_content = self.rest_api_service.get_json(url, self.access_token)
-        return app_content['value'][0]
+        return next(iter(app_content['value']), None)
 
     def delete_service_principal(self, service_principal_id):
         version = '?api-version=1.6'
         url = self.api_base_uri + 'servicePrincipals/%s' % service_principal_id + version
         self.rest_api_service.delete(url, self.access_token)
 
     def add_app_role_assignments(self, service_principal_id, service_principal_id_name):
-        url = self.api_base_uri + 'users?api-version=1.6&$expand=appRoleAssignments'
-        users_content = self.rest_api_service.get_json(url, self.access_token)
-        users = users_content['value']
-
         count = 0
-        for user in users:
-            if all(a['resourceId'] != service_principal_id for a in user['appRoleAssignments']):
-                self._add_app_role_assignment(user, service_principal_id, service_principal_id_name)
-                count = count + 1                
+        url = self.api_base_uri + 'users?api-version=1.6&$expand=appRoleAssignments'
+        skip_token = None
+        while True:
+            url2 = url + '&$skiptoken=' + skip_token if skip_token else url
+            users_content = self.rest_api_service.get_json(url2, self.access_token)
+            users = users_content['value']
+            skip_token = self._get_skip_token(users_content.get('odata.nextLink'))
+            for user in users:
+                if all(a['resourceId'] != service_principal_id for a in user['appRoleAssignments']):
+                    try:
+                        self._add_app_role_assignment(user, service_principal_id, service_principal_id_name)
+                        count = count + 1
+                    except:
+                        pass
+            if skip_token == None:
+                break;           
         return count
 
     def _add_app_role_assignment(self, user, service_principal_id, service_principal_id_name):
@@ -47,3 +57,10 @@ def _add_app_role_assignment(self, user, service_principal_id, service_principal
         }
         post_url = self.api_base_uri + 'users/%s' % user['objectId'] + '/appRoleAssignments?api-version=1.6'
         self.rest_api_service.post_json(post_url, self.access_token, data=app_role_assignment)
+              
+    def _get_skip_token(self, nextlink):
+        if nextlink:
+            matches = self.skip_token_re.findall(nextlink)
+            if matches:
+                return matches[0]
+        return None