Added AuthProvider.redeem_refresh_token method

Author: cdmayer

src/onedrivesdk/auth_provider.py

@@ -36,8 +36,8 @@
 
 class AuthProvider(AuthProviderBase):
 
-    AUTH_SERVER_URL = "https://login.live.com/oauth20_authorize.srf"
-    AUTH_TOKEN_URL = "https://login.live.com/oauth20_token.srf"
+    MSA_AUTH_SERVER_URL = "https://login.live.com/oauth20_authorize.srf"
+    MSA_AUTH_TOKEN_URL = "https://login.live.com/oauth20_token.srf"
 
     def __init__(self, http_provider, client_id=None, scopes=None, access_token=None, session_type=None, loop=None,
                  auth_server_url=None, auth_token_url=None):
@@ -73,8 +73,8 @@ def __init__(self, http_provider, client_id=None, scopes=None, access_token=None
         self._scopes = scopes
         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
-        self._auth_token_url = self.AUTH_TOKEN_URL if auth_token_url is None else auth_token_url
+        self._auth_server_url = self.MSA_AUTH_SERVER_URL if auth_server_url is None else auth_server_url
+        self._auth_token_url = self.MSA_AUTH_TOKEN_URL if auth_token_url is None else auth_token_url
 
         if sys.version_info >= (3, 4, 0):
             import asyncio
@@ -265,6 +265,41 @@ def refresh_token(self):
                                       rcont["access_token"],
                                       rcont["refresh_token"])
 
+    def redeem_refresh_token(self, resource):
+        """Redeem a refresh token against a new resource. Used
+        only by OneDrive for Business apps.
+
+        Args:
+            resource (str): URL to resource to be accessed.
+                Can be a 'serviceResourceId' value obtained from
+                Discovery Service."""
+        if self._session is None:
+            raise RuntimeError("""Session must be authenticated
+                before refreshing token.""")
+
+        if self._session.refresh_token is None:
+            raise RuntimeError("""Refresh token not present.""")
+
+        params = {
+            "client_id": self._session.client_id,
+            "redirect_uri": self._session.redirect_uri,
+            "client_secret": self._session.client_secret,
+            "refresh_token": self._session.refresh_token,
+            "grant_type": "refresh_token",
+            "resource": resource
+        }
+
+        headers = {"Content-Type": "application/x-www-form-urlencoded"}
+        response = self._http_provider.send(method="POST",
+                                            headers=headers,
+                                            url=self.auth_token_url,
+                                            data=params)
+        rcont = json.loads(response.content)
+        self._session.refresh_session(rcont["expires_in"],
+                                      "",
+                                      rcont["access_token"],
+                                      rcont["refresh_token"])
+
     def save_session(self, **save_session_kwargs):
         """Save the current session. Must have already
         obtained an access_token.

src/onedrivesdk/helpers/resource_discovery.py

@@ -21,9 +21,8 @@ def get_service_info(self, access_token):
                 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}
+        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']

src/onedrivesdk/http_provider.py

@@ -66,7 +66,6 @@ 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)