Introducing improved OAuth

Author: dec4234

README.md

@@ -1,11 +1,9 @@
 # JavaDestinyAPI
-<<<<<<< HEAD
 This is a java wrapper for the API provided by bungie to control things on Bungie.net and inside the game Destiny 2. It handles all of the neccessary HTTP requests async and parses the Json response for you.
 
 The API is far from complete, and currently only handles the basics of what you might need. You can get users and clans by their names or ids and get details about them. You can also control your clan such as kicking, banning and inviting players, as long as you have set up OAuth.
 
 ## Getting Started
-=======
 This is a java wrapper for the API provided by bungie to control things on the Bungie.net platform.
 The API is far from complete, and currently only handles the basics of what you might need. You can get users and clans by their names or ids and get details about them. You can also control your clan such as kicking, banning and inviting players, as long as you have set up OAuth.
 
@@ -14,7 +12,6 @@ This project is currently not a member of any maven repository, so you have to d
 - Download the most recently available jar from [releases](https://github.com/dec4234/JavaDestinyAPI/releases)
 - Create a folder called lib inside of your project folder (the one in such place as eclipse-workspace)
 - Place the jar into that folder then add this maven dependency inside of your pom.xml
->>>>>>> 9ce3da3ce0026cdd15b6b7b3fa265a40f66db14c
 This project can be currently accesed through the jitpack repository, which allows any github repo to be used as a dependency
 ```
 <repository>
@@ -36,11 +33,11 @@ Check out the [wiki](https://github.com/dec4234/JavaDestinyAPI/wiki/Getting-Star
 
 ## How's it made?
 There is both offical and unoffical documentation for the API available on [destinydevs.github.io](http://destinydevs.github.io/BungieNetPlatform/docs/Endpoints) and on the [offical bungie api documentation](https://bungie-net.github.io/).
-=======
+```
+<dependency>
     <version>1.0</version>
     <scope>system</scope>
     <systemPath>${basedir}/lib/JavaDestinyAPI.jar</systemPath>
     <version>master</version>
 </dependency>
-```
->>>>>>> 9ce3da3ce0026cdd15b6b7b3fa265a40f66db14c
+```

src/main/java/material/DestinyAPI.java

@@ -124,8 +124,12 @@ public static Clan getClan(String name) {
 
 	public static String getOauthCode() { return oauthCode; }
 
-	public static String getAccessToken() { return accessToken; }
+	public static String getAccessToken() {
+		return oam.getAccessToken();
+	}
 
-	public static String getRefreshToken() { return refreshToken; }
+	public static String getRefreshToken() {
+		return oam.getRefreshToken();
+	}
 
 }

src/main/java/utils/HttpUtils.java

@@ -28,7 +28,7 @@
 public class HttpUtils {
 
 	String apiKey = DestinyAPI.getApiKey();
-	private static String bearerToken = FileUtils.getInfo("access_token");
+	private static String bearerToken = DestinyAPI.getAccessToken();
 
 	/**
 	 * Send a GET url request to the url provided, returns a JsonObject of the response
@@ -61,7 +61,6 @@ public String urlRequestGETstring(String url) {
 										 .GET()
 										 .build();
 		CompletableFuture<String> response = client.sendAsync(request, HttpResponse.BodyHandlers.ofString()).thenApplyAsync(HttpResponse::body);
-		JsonElement parse = null;
 		try {
 			return response.get();
 		} catch (InterruptedException | ExecutionException e) {
@@ -153,7 +152,7 @@ public String generateLineGraph() {
 	public String setTokenViaRefresh() {
 		String url = "https://www.bungie.net/Platform/App/OAuth/Token/";
 
-		String requestBody = "grant_type=refresh_token&refresh_token=" + FileUtils.getInfo("refresh_token");
+		String requestBody = "grant_type=refresh_token&refresh_token=" + DestinyAPI.getRefreshToken();
 
 		HttpClient client = HttpClient.newHttpClient();
 		HttpRequest request = HttpRequest.newBuilder()
@@ -172,12 +171,14 @@ public String setTokenViaRefresh() {
 		}
 		String at = parse.getAsJsonObject().get("access_token").getAsString();
 		String rt = parse.getAsJsonObject().get("refresh_token").getAsString();
+		/*
 		FileUtils.setInfo("refresh_token", rt);
 		FileUtils.setInfo("access_token", at);
+		 */
 		bearerToken = at;
 		new DestinyAPI().setAccessToken(at).setRefreshToken(rt);
 
-		return parse.getAsJsonObject().get("access_token").getAsString();
+		return at;
 	}
 
 	public void setTokenViaAuth() {
@@ -202,23 +203,28 @@ public void setTokenViaAuth() {
 		}
 		String accessToken = parse.getAsJsonObject().get("access_token").getAsString();
 		String refreshToken = parse.getAsJsonObject().get("refresh_token").getAsString();
+		/*
 		FileUtils.clear();
 		FileUtils.setInfo("access_token", accessToken);
 		FileUtils.setInfo("refresh_token", refreshToken);
-		HttpUtils.bearerToken = FileUtils.getInfo("access_token");
+		 */
 
 		new DestinyAPI().setAccessToken(accessToken).setRefreshToken(refreshToken);
+
+		HttpUtils.bearerToken = accessToken;
 	}
 
-	public void checkFor401(String input) {
+	public boolean checkFor401(String input) {
 		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();
-				System.exit(401);
+				return true;
 			}
 		}
+
+		return false;
 	}
 }