diff --git a/message_center_compassion/tools/onramp_connector.py b/message_center_compassion/tools/onramp_connector.py index 40b0c974b..aaf6b83a3 100644 --- a/message_center_compassion/tools/onramp_connector.py +++ b/message_center_compassion/tools/onramp_connector.py @@ -37,8 +37,11 @@ class OnrampConnector: # Private instance of the class __instance = None - # Holds the last time a token was retrieved from GMC. - _token_time = None + # When the token must be renewed, based on GMC's expires_in. + _token_expiry = None + + # (client, secret, token server) to renew the token without an env. + _token_credentials = None # Requests Session that will be used across calls to server _session = None @@ -73,9 +76,8 @@ def __init__(self, env): """Get a fresh token if needed.""" if onramp_fake.is_enabled(): return - now = datetime.now() if self._connect_url and ( - not self._token_time or self._token_time + timedelta(hours=1) <= now + not self._token_expiry or self._token_expiry <= datetime.now() ): self._retrieve_token(env) @@ -130,6 +132,7 @@ def send_message( self.log_message(message_type, url, headers, log_body, self._session, params) count = 0 r = None + token_renewed = False while not isinstance(r, requests.Response) and count < 5: try: if message_type in ("GET", "GET_RAW"): @@ -162,6 +165,12 @@ def send_message( self._session = requests.Session() self._session.params = session_params count += 1 + if r is not None and r.status_code == 401 and not token_renewed: + # GMC can hand out a cached token that dies before expires_in + _logger.warning("GMC answered 401, renewing the token and retrying") + self._renew_token() + token_renewed = True + r = None if message_type == "GET_RAW": # Simply return the result _logger.debug( @@ -192,19 +201,21 @@ def send_message( def _retrieve_token(self, env): """Retrieves the token from Connect.""" - self._token_time = datetime.now() try: - self._session.headers.update(self.get_gmc_token(env)) + self._token_credentials = self._get_token_credentials(env) + self._renew_token() except AttributeError: # Refresh the instance OnrampConnector.__instance = self.__new__(OnrampConnector, env) + def _renew_token(self): + header, expires_in = self.get_gmc_token(*self._token_credentials) + self._session.headers.update(header) + # One minute early, so a request in flight never carries a dead token + self._token_expiry = datetime.now() + timedelta(seconds=expires_in - 60) + @classmethod - def get_gmc_token(cls, env): - """ - Class method that fetches a token from GMC OAuth server. - :return: dict: Authorisation header. - """ + def _get_token_credentials(cls, env): client = env["res.config.settings"].get_param("connect_client") secret = env["res.config.settings"].get_param("connect_secret") provider = config.get("connect_token_server") @@ -215,6 +226,14 @@ def get_gmc_token(cls, env): "connect_token_server in your Odoo configuration file." ) ) + return client, secret, provider + + @classmethod + def get_gmc_token(cls, client, secret, provider): + """ + Class method that fetches a token from GMC OAuth server. + :return: (Authorisation header dict, token lifetime in seconds) + """ params_post = "grant_type=client_credentials&scope=connect/read-write" header_post = { "Content-type": "application/x-www-form-urlencoded", @@ -228,10 +247,11 @@ def get_gmc_token(cls, env): ) try: token = response.json() - return {"Authorization": "{token_type} {access_token}".format(**token)} + header = {"Authorization": "{token_type} {access_token}".format(**token)} except (AttributeError, KeyError, JSONDecodeError) as error: _logger.error("GMC token retrieval error: %s", response.text, exc_info=True) raise UserError(_("Token validation failed.")) from error + return header, int(token.get("expires_in") or 3600) @classmethod def log_message(