Added pyproject.toml

Alejandro Casanovas · Alejandro Casanovas · commit c5fa0e1233d3 · 2024-12-13T00:59:24.000+01:00
Second part of fixing the refresh token

Updated requirements
Added py3.13 to classifiers
changed dependency from requests-oauthlib to msal
diff --git a/O365/connection.py b/O365/connection.py
@@ -745,7 +745,7 @@ def _internal_request(self, request_obj, url, method, **kwargs):
         """
         method = method.lower()
         if method not in self._allowed_methods:
-            raise ValueError('Method must be one of: {}'.format(self._allowed_methods))
+            raise ValueError(f'Method must be one of: {self._allowed_methods}')
 
         if 'headers' not in kwargs:
             kwargs['headers'] = {**self.default_headers}
@@ -769,95 +769,60 @@ def _internal_request(self, request_obj, url, method, **kwargs):
         if self.timeout is not None:
             kwargs['timeout'] = self.timeout
 
-        request_done = False
-        token_refreshed = False
-
-        while not request_done:
-            self._check_delay()  # sleeps if needed
+        self._check_delay()  # sleeps if needed
+        try:
+            log.debug(f'Requesting ({method.upper()}) URL: {url}')
+            log.debug(f'Request parameters: {kwargs}')
+            # auto_retry will occur inside this function call if enabled
+            response = request_obj.request(method, url, **kwargs)
+
+            response.raise_for_status()  # raise 4XX and 5XX error codes.
+            log.debug(f'Received response ({response.status_code}) from URL {response.url}')
+            return response
+        except (ConnectionError, ProxyError, SSLError, Timeout) as e:
+            # We couldn't connect to the target url, raise error
+            log.debug(f'Connection Error calling: {url}.{f"Using proxy {self.proxy}" if self.proxy else ""}')
+            raise e  # re-raise exception
+        except HTTPError as e:
+            # Server response with 4XX or 5XX error status codes
+            if e.response.status_code == 401 and self._token_expired_flag is False:
+                # This could be a token expired error.
+                if self.token_backend.token_is_expired():
+                    log.debug('Oauth Token is expired')
+                    # Token has expired, try to refresh the token and try again on the next loop
+                    self._token_expired_flag = True
+                    raise TokenExpiredError('Oauth Token is expired')
+
+            # try to extract the error message:
             try:
-                log.debug('Requesting ({}) URL: {}'.format(method.upper(), url))
-                log.debug('Request parameters: {}'.format(kwargs))
-                # auto_retry will occur inside this function call if enabled
-                response = request_obj.request(method, url, **kwargs)
-                response.raise_for_status()  # raise 4XX and 5XX error codes.
-                log.debug('Received response ({}) from URL {}'.format(
-                    response.status_code, response.url))
-                request_done = True
-                return response
-            except (ConnectionError, ProxyError, SSLError, Timeout) as e:
-                # We couldn't connect to the target url, raise error
-                log.debug('Connection Error calling: {}.{}'
-                          ''.format(url, ('Using proxy: {}'.format(self.proxy)
-                                          if self.proxy else '')))
-                raise e  # re-raise exception
-            except TokenExpiredError as e:
-                # Token has expired, try to refresh the token and try again on the next loop
-                log.debug('Oauth Token is expired')
-                if self.token_backend.token.is_long_lived is False and self.auth_flow_type == 'authorization':
-                    raise e
-                if token_refreshed:
-                    # Refresh token done but still TokenExpiredError raise
-                    raise RuntimeError('Token Refresh Operation not working')
-                should_rt = self.token_backend.should_refresh_token(self)
-                if should_rt is True:
-                    # The backend has checked that we can refresh the token
-                    if self.refresh_token() is False:
-                        raise RuntimeError('Token Refresh Operation not working')
-                    token_refreshed = True
-                elif should_rt is False:
-                    # the token was refreshed by another instance and updated into
-                    # this instance, so: update the session token and
-                    # go back to the loop and try the request again.
-                    request_obj.token = self.token_backend.token
-                else:
-                    # the refresh was performed by the tokend backend.
-                    token_refreshed = True
-            except HTTPError as e:
-                # Server response with 4XX or 5XX error status codes
-
-                if e.response.status_code == 401 and self._token_expired_flag is False:
-                    # This could be a token expired error.
-                    if self.token_backend.token_is_expired():
-                        log.debug('Oauth Token is expired')
-                        # Token has expired, try to refresh the token and try again on the next loop
-                        if self.token_backend.token_is_long_lived is False and self.auth_flow_type == 'authorization':
-                            raise e
-
-                # try to extract the error message:
-                try:
-                    error = response.json()
-                    error_message = error.get('error', {}).get('message', '')
-                    error_code = (
-                        error.get("error", {}).get("innerError", {}).get("code", "")
-                    )
-                except ValueError:
-                    error_message = ''
-                    error_code = ''
-
-                status_code = int(e.response.status_code / 100)
-                if status_code == 4:
-                    # Client Error
-                    # Logged as error. Could be a library error or Api changes
-                    log.error(
-                        "Client Error: {} | Error Message: {} | Error Code: {}".format(
-                            str(e), error_message, error_code
-                        )
-                    )
-                else:
-                    # Server Error
-                    log.debug('Server Error: {}'.format(str(e)))
-                if self.raise_http_errors:
-                    if error_message:
-                        raise HTTPError('{} | Error Message: {}'.format(e.args[0], error_message),
-                                        response=response) from None
-                    else:
-                        raise e
+                error = e.response.json()
+                error_message = error.get('error', {}).get('message', '')
+                error_code = (
+                    error.get("error", {}).get("innerError", {}).get("code", "")
+                )
+            except ValueError:
+                error_message = ''
+                error_code = ''
+
+            status_code = int(e.response.status_code / 100)
+            if status_code == 4:
+                # Client Error
+                # Logged as error. Could be a library error or Api changes
+                log.error(f'Client Error: {e} | Error Message: {error_message} | Error Code: {error_code}')
+            else:
+                # Server Error
+                log.debug(f'Server Error: {e}')
+            if self.raise_http_errors:
+                if error_message:
+                    raise HTTPError(f'{e.args[0]} | Error Message: {error_message}', response=e.response) from None
                 else:
-                    return e.response
-            except RequestException as e:
-                # catch any other exception raised by requests
-                log.debug('Request Exception: {}'.format(str(e)))
-                raise e
+                    raise e
+            else:
+                return e.response
+        except RequestException as e:
+            # catch any other exception raised by requests
+            log.debug(f'Request Exception: {e}')
+            raise e
 
     def naive_request(self, url, method, **kwargs):
         """ Makes a request to url using an without oauth authorization
@@ -872,6 +837,7 @@ def naive_request(self, url, method, **kwargs):
         if self.naive_session is None:
             # lazy creation of a naive session
             self.naive_session = self.get_naive_session()
+
         return self._internal_request(self.naive_session, url, method, **kwargs)
 
     def oauth_request(self, url, method, **kwargs):
@@ -889,10 +855,15 @@ def oauth_request(self, url, method, **kwargs):
 
         try:
             return self._internal_request(self.session, url, method, **kwargs)
-        except TokenExpiredError:
+        except TokenExpiredError as e:
             # refresh and try again the request!
-            self.refresh_token()
-            return self._internal_request(self.session, url, method, **kwargs)
+            try:
+                if self.refresh_token():
+                    return self._internal_request(self.session, url, method, **kwargs)
+                else:
+                    raise e
+            finally:
+                self._token_expired_flag = False
 
     def get(self, url, params=None, **kwargs):
         """ Shorthand for self.oauth_request(url, 'get')
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,14 @@
+[project]
+name = "o365"
+version = "2.0.38"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.9"
+dependencies = [
+    "beautifulsoup4>=4.12.3",
+    "msal>=1.31.1",
+    "python-dateutil>=2.9.0.post0",
+    "requests>=2.32.3",
+    "tzdata>=2024.2",
+    "tzlocal>=5.2",
+]
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,5 +1,5 @@
 requests>=2.31.0
-requests-oauthlib>=2.0.0
+msal>=1.31.1
 python-dateutil>=2.7
 tzlocal>=5.0
 beautifulsoup4>=4.0.0
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-requests-oauthlib>=2.0.0
+msal>=1.31.1
 requests>=2.32.0
 python-dateutil>=2.7
 tzlocal>=5.0
diff --git a/setup.py b/setup.py
@@ -18,6 +18,7 @@
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
+    'Programming Language :: Python :: 3.13',
     'Operating System :: OS Independent',
 ]
 
@@ -29,17 +30,16 @@ def read(fname):
 
 requires = [
     'requests>=2.32.0',
-    'requests-oauthlib>=2.0.0',
+    'msal>=1.31.1',
     'python-dateutil>=2.7',
     'tzlocal>=5.0',
     'beautifulsoup4>=4.0.0',
     'tzdata>=2023.4'
 ]
 
 setup(
-    name='O365',
+    name='o365',
     version=VERSION,
-    # packages=['O365', 'O365.utils'],
     packages=find_packages(),
     url='https://github.com/O365/python-o365',
     license='Apache License 2.0',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-requests-oauthlib>=2.0.0`
	`1`	`+msal>=1.31.1`
`2`	`2`	`requests>=2.32.0`
`3`	`3`	`python-dateutil>=2.7`
`4`	`4`	`tzlocal>=5.0`