From 8634858249dec2b6f0665d510279d15a34b74633 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 21 Aug 2021 16:09:47 -0500
Subject: [PATCH] Revalidate the API keys if they are expired. Fixes #3210

---
 .../ReaderAPI/ReaderAPIAccountDelegate.swift  | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
index 16d333340..87db27815 100644
--- a/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
+++ b/Account/Sources/Account/ReaderAPI/ReaderAPIAccountDelegate.swift
@@ -136,8 +136,35 @@ final class ReaderAPIAccountDelegate: AccountDelegate {
 			case .failure(let error):
 				DispatchQueue.main.async {
 					self.refreshProgress.clear()
+					
 					let wrappedError = AccountError.wrappedError(error: error, account: account)
-					completion(.failure(wrappedError))
+					if wrappedError.isCredentialsError, let basicCredentials = try? account.retrieveCredentials(type: .readerBasic), let endpoint = account.endpointURL {
+						self.caller.credentials = basicCredentials
+						
+						self.caller.validateCredentials(endpoint: endpoint) { result in
+							switch result {
+							case .success(let apiCredentials):
+								if let apiCredentials = apiCredentials {
+									DispatchQueue.main.async {
+										try? account.storeCredentials(apiCredentials)
+										self.caller.credentials = apiCredentials
+										self.refreshAll(for: account, completion: completion)
+									}
+								} else {
+									DispatchQueue.main.async {
+										completion(.failure(wrappedError))
+									}
+								}
+							case .failure:
+								DispatchQueue.main.async {
+									completion(.failure(wrappedError))
+								}
+							}
+						}
+						
+					} else {
+						completion(.failure(wrappedError))
+					}
 				}
 			}