Improve oauth import error handling

Author: vaisest

src/Classes/ImportTab.lua

@@ -42,14 +42,12 @@ function addOAuthControls(self)
 
 	function charImportStatus()
 		if not self.isAuthorized() and not self.oauthTimer then
-			local suffix = self.oauthErrCode and string.format(": %s", self.oauthErrCode) or ""
-			return colorCodes.WARNING .. "Not authenticated" .. suffix
+			return colorCodes.WARNING .. "Not authenticated"
 		elseif not self.isAuthorized() and self.oauthTimer then
 			local timeLeft = m_max(0, (self.oauthTimer + 30) - os.time())
 			if timeLeft < 1 then
 				self.oauthTimer = nil
-				local suffix = self.oauthErrCode and string.format(": %s", self.oauthErrCode) or ""
-				return colorCodes.WARNING .. "Not authenticated" .. suffix
+				return colorCodes.WARNING .. "Not authenticated"
 			end
 			return string.format("Logging in... (%d)", timeLeft) .. (self.oauthErrCode or "")
 			-- user is spam changing realms and is rate limited
@@ -65,7 +63,6 @@ function addOAuthControls(self)
 		elseif self.isAuthorized() then
 			return "Authenticated"
 		end
-		-- unreachable
 		return ""
 	end
 
@@ -107,6 +104,7 @@ function addOAuthControls(self)
 				self.rateLimitEndTime = timeNext
 			-- token has been invalidated for some reason
 			elseif err and err:match("401") then
+				self.oauthErrCode = "Auth token is invalid. Please login again."
 				main.api:ResetDetails()
 			else
 				self.oauthErrCode = err
@@ -117,7 +115,6 @@ function addOAuthControls(self)
 		main.api:DownloadCharacterList(realm.realmCode, onResponse)
 	end
 
-	-- OAuth Stage: Authenticate
 	self.controls.authenticateButton = new("ButtonControl", { "TOPLEFT", self.controls.characterImportAnchor, "TOPLEFT" },
 		{ 0, 0, 200, 16 }, "^7Authorize with Path of Exile", function()
 			main.api:FetchAuthToken(function(errCode)
@@ -146,6 +143,13 @@ function addOAuthControls(self)
 		return self.usingOauth and self.isAuthorized()
 	end
 
+	self.controls.oauthErrorLabel = new("LabelControl", { "TOPRIGHT", self.controls.sectionOauthCharImport, "TOPRIGHT" },
+		{ -8, 40, 0, 18 })
+	self.controls.oauthErrorLabel.label = function()
+		local text = self.oauthErrCode and string.format("%sError: %s", colorCodes.NEGATIVE, self.oauthErrCode) or ""
+		return text
+	end
+	
 	-- realm select
 	function setLeaguesFromCharList()
 		local currentRealm = self.controls.accountRealm:GetSelValue().realmCode
@@ -248,17 +252,24 @@ function addOAuthControls(self)
 
 			saveDetails(realm.id, league, selectedName)
 			local deleteJewels = self.controls.charImportTreeClearJewels.state
+			local function importHandler(data, errMsg)
+				if data and data.character then
+					self:ImportPassiveTreeAndJewels(data.character, deleteJewels)
+				else
+					if errMsg then
+						self.oauthErrCode = "Could not import: " .. errMsg
+					else
+						self.oauthErrCode = "Could not import character"
+					end
+				end
+			end
 			if self.build.spec:CountAllocNodes() > 0 then
 				main:OpenConfirmPopup("Character Import", "Importing the passive tree will overwrite your current tree.",
 					"Import", function()
-						main.api:DownloadCharacter(realm.realmCode, selectedName, function(char)
-							self:ImportPassiveTreeAndJewels(char.character, deleteJewels)
-						end)
+						main.api:DownloadCharacter(realm.realmCode, selectedName, importHandler)
 					end)
 			else
-				main.api:DownloadCharacter(realm.realmCode, selectedName, function(char)
-					self:ImportPassiveTreeAndJewels(char.character, deleteJewels)
-				end)
+				main.api:DownloadCharacter(realm.realmCode, selectedName, importHandler)
 			end
 		end)
 	self.controls.charImportTree.enabled = function()
@@ -274,11 +285,20 @@ function addOAuthControls(self)
 
 			saveDetails(realm.id, league, selectedName)
 
-			main.api:DownloadCharacter(realm.realmCode, selectedName, function(char)
+			main.api:DownloadCharacter(realm.realmCode, selectedName, function(data, errMsg)
 				local clearItems = self.controls.charImportItemsClearItems.state
 				local clearSkills = self.controls.charImportItemsClearSkills.state
 				local ignoreWeaponSwap = self.controls.charImportItemsIgnoreWeaponSwap.state
-				self:ImportItemsAndSkills(char.character, clearItems, clearSkills, ignoreWeaponSwap)
+				if data and data.character then
+					self:ImportItemsAndSkills(data.character, clearItems, clearSkills, ignoreWeaponSwap)
+				else
+					if errMsg then
+						self.oauthErrCode = "Could not import: " .. errMsg
+					else
+						self.oauthErrCode = "Could not import character"
+					end
+				end
+				
 			end)
 		end)
 	self.controls.charImportItems.enabled = function()