Merge pull request #30 from datadistillr/add_constructors

feat: Add Constructors to Allow Import of External Tokens

Author: isac322

.gitignore

@@ -45,6 +45,7 @@ hs_err_pid*
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/dictionaries
+.idea/
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/
@@ -124,3 +125,6 @@ $RECYCLE.BIN/
 
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
+
+# lombok config
+lombok.config

README.md

@@ -100,6 +100,14 @@ Client client = new Client(clientId, scope, redirectURL, clientSecret);
 // without login
 Client client = new Client(clientId, scope, redirectURL, clientSecret, false);
 client.login();
+
+// With tokens provided from outside source 
+String accessToken = "<access_token>";
+String refreshToken = "<refresh_token>"
+String tokenType = "bearer";
+long expiresIn = 0;
+
+Client client = new Client(clientId, scope, redirectURL, clientSecret, accessToken, refreshToken, tokenType, expiresIn);
 ```
 
 

gradle/wrapper/gradle-wrapper.jar

@@ -2,6 +2,7 @@
 
 import com.bhyoo.onedrive.client.auth.AbstractAuthHelper;
 import com.bhyoo.onedrive.client.auth.AuthHelper;
+import com.bhyoo.onedrive.client.auth.AuthenticationInfo;
 import com.bhyoo.onedrive.container.AsyncJobMonitor;
 import com.bhyoo.onedrive.container.items.*;
 import com.bhyoo.onedrive.container.items.pointer.BasePointer;
@@ -25,6 +26,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 
 import static com.bhyoo.onedrive.container.items.pointer.Operator.*;
 import static io.netty.handler.codec.http.HttpMethod.GET;
@@ -96,6 +98,30 @@ public Client(@NotNull String clientId, @NotNull String[] scope, @NotNull String
 	}
 
 
+	/**
+	 * Constructor used when authorization is handled by an external system.  In this case, the accessToken,
+	 * refreshToken and expiresIn values have been obtained elsewhere.
+	 * @param clientId The OAuth clientID
+	 * @param scope A {@link String[]} of scopes
+	 * @param redirectURL The OAuth redirect URL
+	 * @param clientSecret The OAuth clientSecret token
+	 * @param accessToken The OAuth accessToken
+	 * @param refreshToken The OAuth refreshToken
+	 * @param tokenType The OAuth tokenType
+	 * @param expiresIn The OAuth expiresIn value
+	 */
+	public Client(@NotNull String clientId,
+								@NotNull String[] scope,
+								@NotNull String redirectURL,
+								@NotNull String clientSecret,
+								@NotNull String accessToken,
+								@NotNull String refreshToken,
+								String tokenType,
+								long expiresIn) {
+		requestTool = new RequestTool(this);
+		AuthenticationInfo authInfo = new AuthenticationInfo(tokenType, expiresIn, accessToken, refreshToken, Arrays.toString(scope));
+		authHelper = new AuthHelper(scope, clientId, clientSecret, redirectURL, requestTool, authInfo);
+	}
 
 
 	/*

src/main/java/com/bhyoo/onedrive/client/Client.java

@@ -46,6 +46,25 @@ public AuthHelper(@NotNull String[] scopes, @NotNull String clientId, @NotNull S
 		this.requestTool = requestTool;
 	}
 
+	/**
+	 * Creates an AuthHelper object when the initial access and refresh tokens are obtained programmatically.
+	 * @param scopes A list of scopes
+	 * @param clientId The OAuth 2.0 clientID token
+	 * @param clientSecret The OAuth 2.0 client secret token
+	 * @param redirectURL The OAuth 2.0 redirect URL
+	 * @param requestTool The {@link RequestTool} for making HTTP requests
+	 * @param authInfo The {@link AuthenticationInfo} containing the access and refresh tokens.
+	 */
+	public AuthHelper(@NotNull String[] scopes, @NotNull String clientId, @NotNull String clientSecret,
+										@NotNull String redirectURL, @NotNull RequestTool requestTool, @NotNull AuthenticationInfo authInfo) {
+		this.scopes = scopes;
+		this.clientId = clientId;
+		this.clientSecret = clientSecret;
+		this.redirectURL = redirectURL;
+		this.requestTool = requestTool;
+		this.authInfo = authInfo;
+	}
+
 
 	@Override public boolean isLogin() {
 		return authCode != null && authInfo != null;

src/main/java/com/bhyoo/onedrive/client/auth/AuthHelper.java

@@ -21,7 +21,7 @@ public class AuthenticationInfo {
 	@Getter @JsonProperty("refresh_token") protected @NotNull String refreshToken;
 	@Getter protected String scope;
 
-	protected AuthenticationInfo(@NotNull String tokenType, long expiresIn, @NotNull String accessToken,
+	public AuthenticationInfo(@NotNull String tokenType, long expiresIn, @NotNull String accessToken,
 								 @NotNull String refreshToken, @NotNull String scope) {
 		this.tokenType = tokenType;
 		this.expiresIn = expiresIn;