Added resource_discovery.py

- Has some debug print() statements in there
- AuthProvider changes to only have a getter for access_token, looks
into the _session property to get it.

Author: cdmayer

src/onedrivesdk/auth_provider.py

@@ -51,8 +51,7 @@ def __init__(self, http_provider, client_id=None, scopes=None, access_token=None
                 application
             scopes (list of str): Defaults to None, the scopes 
                 that are required for your application
-            access_token (str): Defaults to None, the access token
-                for your application
+            access_token (str): Defaults to None. Not used in this implementation.
             session_type (:class:`SessionBase<onedrivesdk.session_base.SessionBase>`):
                 Defaults to :class:`Session<onedrivesdk.session.Session>`,
                 the implementation of SessionBase that stores your
@@ -72,7 +71,6 @@ def __init__(self, http_provider, client_id=None, scopes=None, access_token=None
         self._http_provider = http_provider
         self._client_id = client_id
         self._scopes = scopes
-        self._access_token = access_token
         self._session_type = Session if session_type is None else session_type
         self._session = None
         self._auth_server_url = self.AUTH_SERVER_URL if auth_server_url is None else auth_server_url
@@ -116,13 +114,11 @@ def access_token(self):
         AuthProvider
 
         Returns:
-            str: The access token
+            str: The access token. Looks at the session
         """
-        return self._access_token
-
-    @access_token.setter
-    def access_token(self, value):
-        self._access_token = value
+        if self._session is not None:
+            return self._session.access_token
+        return None
 
     @property
     def auth_server_url(self):
@@ -192,7 +188,8 @@ def authenticate(self, code, redirect_uri, client_secret, resource=None):
             "redirect_uri": redirect_uri,
             "client_secret": client_secret,
             "code": code,
-            "response_type": "code"
+            "response_type": "code",
+            "grant_type": "authorization_code"
         }
 
         if resource is not None:

src/onedrivesdk/helpers/resource_discovery.py

@@ -0,0 +1,96 @@
+import requests
+import json
+
+
+class ResourceDiscoveryRequest(object):
+    def __init__(self):
+        self._method = 'GET'
+        self._discovery_service_url = 'https://api.office.com/discovery/v2.0/me/services'
+
+    def get_service_info(self, access_token):
+        """Send request to discovery service. Return ServiceInfo
+        for valid services.
+
+        Args:
+            access_token (str): A valid access token for resource
+                'https://api.office.com/discovery/'
+
+        Returns:
+            List of :class:`ServiceInfo<onedrivesdk.helpers.resource_discovery.ServiceInfo>`:
+                ServiceInfo for each service that the caller can access. NOTE: values that
+                do not provide access to OneDrive for Business will be excluded (i.e. must have
+                capability = 'MyFiles' and service_api_version = 'v2.0'
+        """
+        headers = {'Authorization': 'bearer ' + access_token}
+        response = json.loads(requests.get(self._discovery_service_url, headers=headers).text)
+        print(response)
+        service_info_list = [ServiceInfo(x) for x in response['value']]
+        trimmed_service_info_list = [si for si in service_info_list
+                                     if si.capability == 'MyFiles' and si.service_api_version == 'v2.0']
+        return trimmed_service_info_list
+
+
+class ServiceInfo(object):
+    def __init__(self, prop_dict={}):
+        self._prop_dict = prop_dict
+
+    def __str__(self):
+        return 'serviceResourceId: {}\nserviceEndpointUri: {}'\
+            .format(self.service_resource_id, self.service_endpoint_uri)
+
+    def _prop_dict_get(self, prop):
+        if prop in self._prop_dict:
+            return self._prop_dict[prop]
+        else:
+            return None
+
+    def _prop_dict_set(self, prop, val):
+        self._prop_dict[prop] = val
+
+    @property
+    def capability(self):
+        return self._prop_dict_get('capability')
+
+    @capability.setter
+    def capability(self, value):
+        self._prop_dict_set('capability', value)
+
+    @property
+    def service_id(self):
+        return self._prop_dict_get('serviceId')
+
+    @service_id.setter
+    def service_id(self, value):
+        self._prop_dict_set('serviceId', value)
+
+    @property
+    def service_name(self):
+        return self._prop_dict_get('serviceName')
+
+    @service_name.setter
+    def service_name(self, value):
+        self._prop_dict_set('serviceName', value)
+
+    @property
+    def service_endpoint_uri(self):
+        return self._prop_dict_get('serviceEndpointUri')
+
+    @service_endpoint_uri.setter
+    def service_endpoint_uri(self, value):
+        self._prop_dict_set('serviceEndpointUri', value)
+
+    @property
+    def service_resource_id(self):
+        return self._prop_dict_get('serviceResourceId')
+
+    @service_resource_id.setter
+    def service_resource_id(self, value):
+        self._prop_dict_set('serviceResourceId', value)
+
+    @property
+    def service_api_version(self):
+        return self._prop_dict_get('serviceApiVersion')
+
+    @service_api_version.setter
+    def service_api_version(self, value):
+        self._prop_dict_set('serviceApiVersion', value)

src/onedrivesdk/http_provider.py

@@ -66,6 +66,7 @@ def send(self, method, headers, url, data=None, content=None, path=None):
                                        data=data,
                                        json=content)
             prepped = request.prepare()
+            print(prepped.body, prepped.url, prepped.method)
             response = session.send(prepped)
 
         custom_response = HttpResponse(response.status_code, response.headers, response.text)