lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix token refresh

Browse Source
This commit is contained in:
shamoon 2024-10-05 09:28:55 -07:00
parent 61723528f2
commit 6a1253fea1
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/paperless_mail/mail.py
View File

@ -525,6 +525,7 @@ class MailAccountHandler(LoggingMixin):
return False return False
if "gmail" in account.imap_server: if "gmail" in account.imap_server:
url = "https://accounts.google.com/o/oauth2/token"
data = { data = {
"client_id": settings.GMAIL_OAUTH_CLIENT_ID, "client_id": settings.GMAIL_OAUTH_CLIENT_ID,
"client_secret": settings.GMAIL_OAUTH_CLIENT_SECRET, "client_secret": settings.GMAIL_OAUTH_CLIENT_SECRET,
@ -532,6 +533,7 @@ class MailAccountHandler(LoggingMixin):
"grant_type": "refresh_token", "grant_type": "refresh_token",
} }
elif "outlook" in account.imap_server: elif "outlook" in account.imap_server:
url = "https://login.microsoftonline.com/common/oauth2/v2.0/token"
data = { data = {
"client_id": settings.OUTLOOK_OAUTH_CLIENT_ID, "client_id": settings.OUTLOOK_OAUTH_CLIENT_ID,
"client_secret": settings.OUTLOOK_OAUTH_CLIENT_SECRET, "client_secret": settings.OUTLOOK_OAUTH_CLIENT_SECRET,
@ -540,17 +542,18 @@ class MailAccountHandler(LoggingMixin):
} }
response = httpx.post( response = httpx.post(
"https://login.microsoftonline.com/common/oauth2/v2.0/token", url=url,
data=data, data=data,
headers={"Content-Type": "application/x-www-form-urlencoded"}, headers={"Content-Type": "application/x-www-form-urlencoded"},
) )
data = response.json() data = response.json()
if "access_token" in data: if "access_token" in data:
account.token = data["access_token"] account.password = data["access_token"]
account.expiration = datetime.datetime.now() + timedelta( account.expiration = timezone.now() + timedelta(
seconds=data["expires_in"], seconds=data["expires_in"],
) )
account.save() account.save()
self.log.debug(f"Successfully refreshed token for account {account}")
return True return True
else: else:
self.log.error(f"Failed to refresh token for account {account}: {data}") self.log.error(f"Failed to refresh token for account {account}: {data}")
@ -579,8 +582,9 @@ class MailAccountHandler(LoggingMixin):
): ):
self.log.debug(f"Attempting to refresh token for account {account}") self.log.debug(f"Attempting to refresh token for account {account}")
success = self.refresh_token(account) success = self.refresh_token(account)
if not success: if success:
self.log.error(f"Failed to refresh token for account {account}") account.refresh_from_db()
else:
return total_processed_files return total_processed_files
supports_gmail_labels = "X-GM-EXT-1" in M.client.capabilities supports_gmail_labels = "X-GM-EXT-1" in M.client.capabilities