#22 - Add more error catching

Author: dec4234

src/main/java/net/dec4234/javadestinyapi/exceptions/InvalidConditionException.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024. dec4234
+ * A standard open MIT license applies. Modififcation and usage permitted with credit. No warranties or express guarentees are given in any way.
+ *
+ * Github -> https://github.com/dec4234/JavaDestinyAPI
+ */
+
+package net.dec4234.javadestinyapi.exceptions;
+
+/**
+ * When a token is missing or wrong, or some other pre-condition was not met that was needed to execute a request.
+ * This is a generic error, check the associated error message for more information.
+ */
+public class InvalidConditionException extends APIException {
+
+    public InvalidConditionException(String message) {
+        super(message);
+    }
+}

src/main/java/net/dec4234/javadestinyapi/exceptions/OAuthUnauthorizedException.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2024. dec4234
+ * A standard open MIT license applies. Modififcation and usage permitted with credit. No warranties or express guarentees are given in any way.
+ *
+ * Github -> https://github.com/dec4234/JavaDestinyAPI
+ */
+
+package net.dec4234.javadestinyapi.exceptions;
+
+/**
+ * You either have insufficient permission to attempt this OAuth action, or you forgot to authorize yourself.
+ * See {@link net.dec4234.javadestinyapi.utils.framework.OAuthFlow}
+ */
+public class OAuthUnauthorizedException extends APIException {
+
+    public OAuthUnauthorizedException(String message) {
+        super(message);
+    }
+}

src/main/java/net/dec4234/javadestinyapi/material/user/BungieUser.java

@@ -44,6 +44,7 @@ public class BungieUser extends ContentFramework {
 	private List<DestinyCharacter> destinyCharacters = null;
 	private int playTime = -1, crossSaveOverride = -1, membershipType = -1;
 	private boolean isPublic, isCrossSavePrimary, isOverridden = false;
+	@Deprecated
 	private int intendedPlatform = -2;
 	private InventoryManager inventoryManager;
 	private CollectionsManager collectionsManager;
@@ -443,6 +444,7 @@ public JsonObject getJE() throws APIException {
 		return je;
 	}
 
+	@Deprecated
 	public void setIntendedPlatform(DestinyPlatform destinyPlatform) {
 		intendedPlatform = destinyPlatform.getPlatformCode();
 		je = null;

src/main/java/net/dec4234/javadestinyapi/utils/HttpUtils.java

@@ -13,8 +13,8 @@
 import com.google.gson.JsonSyntaxException;
 import net.dec4234.javadestinyapi.exceptions.APIException;
 import net.dec4234.javadestinyapi.exceptions.APIOfflineException;
-import net.dec4234.javadestinyapi.exceptions.AccessTokenInvalidException;
 import net.dec4234.javadestinyapi.exceptions.ConnectionException;
+import net.dec4234.javadestinyapi.exceptions.InvalidConditionException;
 import net.dec4234.javadestinyapi.exceptions.JsonParsingError;
 import net.dec4234.javadestinyapi.material.DestinyAPI;
 import net.dec4234.javadestinyapi.material.manifest.ManifestEntityTypes;
@@ -154,6 +154,10 @@ public String setTokenViaRefresh() throws APIException {
 			return starter;
 		})));
 
+		if(response.has("error_description") && response.get("error_description").getAsString().equals("ApplicationTokenKeyIdDoesNotExist")) {
+			throw new InvalidConditionException("The refresh token is invalid, you likely need to generate new tokens");
+		}
+
 		if(!response.has("access_token")) {
 			return null;
 		}
@@ -194,20 +198,6 @@ public void setTokenViaAuth(String oAuthCode) throws APIException {
 		HttpUtils.bearerToken = accessToken;
 	}
 
-	public boolean checkFor401(String input) throws APIException {
-		if (input.contains("401 - Unauthorized")) {
-			try {
-				setTokenViaRefresh();
-				throw new AccessTokenInvalidException("The access token used in this OAuth request was not accepted by the server \nI've already taken the liberty of getting a new access token for you :D");
-			} catch (AccessTokenInvalidException e) {
-				e.printStackTrace();
-				return true;
-			}
-		}
-
-		return false;
-	}
-
 	private JsonObject getJsonObject(String stringResponse) throws APIException {
 		JsonObject jsonObject;
 
@@ -221,6 +211,7 @@ private JsonObject getJsonObject(String stringResponse) throws APIException {
 		if(jsonObject.has("ErrorCode") && jsonObject.get("ErrorCode").getAsInt() == 5) {
 			throw new APIOfflineException(jsonObject.get("Message").getAsString());
 		}
+
 		return jsonObject;
 	}
 

src/main/java/net/dec4234/javadestinyapi/utils/framework/OAuthFlow.java

@@ -10,6 +10,7 @@
 
 import com.sun.net.httpserver.*;
 import net.dec4234.javadestinyapi.exceptions.APIException;
+import net.dec4234.javadestinyapi.exceptions.InvalidConditionException;
 import net.dec4234.javadestinyapi.material.DestinyAPI;
 import net.dec4234.javadestinyapi.utils.StringUtils;
 
@@ -49,7 +50,11 @@ public void initOAuthFlow(int port) throws APIException {
 	 * @param port The port to start the server on
 	 */
 	public void initOAuthFlowIfNeeded(int port) throws APIException {
-		if(!DestinyAPI.hasOauthManager() || DestinyAPI.getAccessToken() == null || DestinyAPI.getHttpUtils().setTokenViaRefresh() == null) {
+		try {
+			if(!DestinyAPI.hasOauthManager() || DestinyAPI.getAccessToken() == null || DestinyAPI.getHttpUtils().setTokenViaRefresh() == null) {
+				initOAuthFlow(port);
+			}
+		} catch (InvalidConditionException e) {
 			initOAuthFlow(port);
 		}
 	}