Moved response handlers

RaphiMC · Nov 12, 2023 · 1785e34 · 1785e34
1 parent 2535a00
commit 1785e34
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 5 deletions.
diff --git a/...ep/msa/MsaCredentialsResponseHandler.java → ...andler/MsaCredentialsResponseHandler.java b/...ep/msa/MsaCredentialsResponseHandler.java → ...andler/MsaCredentialsResponseHandler.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.minecraftauth.step.msa;
+package net.raphimc.minecraftauth.responsehandler;
 
 import org.apache.http.*;
 import org.apache.http.client.HttpResponseException;

diff --git a/...raftauth/step/msa/MsaResponseHandler.java → ...h/responsehandler/MsaResponseHandler.java b/...raftauth/step/msa/MsaResponseHandler.java → ...h/responsehandler/MsaResponseHandler.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.minecraftauth.step.msa;
+package net.raphimc.minecraftauth.responsehandler;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;

diff --git a/.../step/bedrock/PlayFabResponseHandler.java → ...sponsehandler/PlayFabResponseHandler.java b/.../step/bedrock/PlayFabResponseHandler.java → ...sponsehandler/PlayFabResponseHandler.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.minecraftauth.step.bedrock;
+package net.raphimc.minecraftauth.responsehandler;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;

diff --git a/...raftauth/step/xbl/XblResponseHandler.java → ...h/responsehandler/XblResponseHandler.java b/...raftauth/step/xbl/XblResponseHandler.java → ...h/responsehandler/XblResponseHandler.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package net.raphimc.minecraftauth.step.xbl;
+package net.raphimc.minecraftauth.responsehandler;
 
 import net.raphimc.minecraftauth.util.MicrosoftConstants;
 import org.apache.http.HttpEntity;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/bedrock/StepPlayFabToken.java b/src/main/java/net/raphimc/minecraftauth/step/bedrock/StepPlayFabToken.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.PlayFabResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.step.xbl.StepXblXstsToken;
 import net.raphimc.minecraftauth.util.MicrosoftConstants;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/MsaCodeStep.java b/src/main/java/net/raphimc/minecraftauth/step/msa/MsaCodeStep.java
@@ -23,7 +23,7 @@
 import net.raphimc.minecraftauth.step.AbstractStep;
 import org.apache.http.client.HttpClient;
 
-public class MsaCodeStep<I extends AbstractStep.StepResult<?>> extends AbstractStep<I, MsaCodeStep.MsaCode> {
+public abstract class MsaCodeStep<I extends AbstractStep.StepResult<?>> extends AbstractStep<I, MsaCodeStep.MsaCode> {
 
     protected final String clientId;
     protected final String scope;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/StepCredentialsMsaCode.java b/src/main/java/net/raphimc/minecraftauth/step/msa/StepCredentialsMsaCode.java
@@ -21,6 +21,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.MsaCredentialsResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import org.apache.http.HttpHeaders;
 import org.apache.http.NameValuePair;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaDeviceCode.java b/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaDeviceCode.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.MsaResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaDeviceCodeMsaCode.java b/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaDeviceCodeMsaCode.java
@@ -20,6 +20,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.MsaResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import org.apache.http.HttpStatus;
 import org.apache.http.NameValuePair;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaToken.java b/src/main/java/net/raphimc/minecraftauth/step/msa/StepMsaToken.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.MsaResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblDeviceToken.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblDeviceToken.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.XblResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.util.CryptUtil;
 import org.apache.http.client.HttpClient;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblSisuAuthentication.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblSisuAuthentication.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.XblResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.step.xbl.session.StepFullXblSession;
 import net.raphimc.minecraftauth.step.xbl.session.StepInitialXblSession;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblTitleToken.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblTitleToken.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.XblResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.step.xbl.session.StepInitialXblSession;
 import net.raphimc.minecraftauth.util.CryptUtil;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblUserToken.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblUserToken.java
@@ -22,6 +22,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.XblResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.step.xbl.session.StepInitialXblSession;
 import net.raphimc.minecraftauth.util.CryptUtil;

diff --git a/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblXstsToken.java b/src/main/java/net/raphimc/minecraftauth/step/xbl/StepXblXstsToken.java
@@ -24,6 +24,7 @@
 import lombok.EqualsAndHashCode;
 import lombok.Value;
 import net.raphimc.minecraftauth.MinecraftAuth;
+import net.raphimc.minecraftauth.responsehandler.XblResponseHandler;
 import net.raphimc.minecraftauth.step.AbstractStep;
 import net.raphimc.minecraftauth.step.xbl.session.StepFullXblSession;
 import net.raphimc.minecraftauth.step.xbl.session.StepInitialXblSession;