Order in class usages.

Damian Staszewski · Damian Staszewski · commit c11c1aa30c87 · 2017-07-06T06:57:20.000+02:00
diff --git a/src/main/java/com/hirezstudios/HiRezAPI.java b/src/main/java/com/hirezstudios/HiRezAPI.java
diff --git a/src/main/java/pl/stachu540/hirezstudios/HiRezAPI.java b/src/main/java/pl/stachu540/hirezstudios/HiRezAPI.java
@@ -0,0 +1,19 @@
+package pl.stachu540.hirezstudios;
+
+import pl.stachu540.hirezstudios.util.Endpoints;
+
+/**
+ * @author Damian Staszewski <damian@stachuofficial.pl>
+ * @since 1.8
+ */
+public class HiRezAPI {
+    private final String devId;
+    private final String authKey;
+    private final Endpoints endpoint;
+
+    public HiRezAPI(String devId, String authKey, Endpoints endpoint) {
+        this.devId = devId;
+        this.authKey = authKey;
+        this.endpoint = endpoint;
+    }
+}
diff --git a/src/main/java/pl/stachu540/hirezstudios/instance/Language.java b/src/main/java/pl/stachu540/hirezstudios/instance/Language.java
@@ -1,4 +1,4 @@
-package com.hirezstudios.games.smite;
+package pl.stachu540.hirezstudios.instance;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/pl/stachu540/hirezstudios/instance/Queue.java b/src/main/java/pl/stachu540/hirezstudios/instance/Queue.java
@@ -1,4 +1,4 @@
-package com.hirezstudios.games.smite;
+package pl.stachu540.hirezstudios.instance;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/pl/stachu540/hirezstudios/instance/Session.java b/src/main/java/pl/stachu540/hirezstudios/instance/Session.java
@@ -0,0 +1,63 @@
+package pl.stachu540.hirezstudios.instance;
+
+import org.json.JSONObject;
+import pl.stachu540.hirezstudios.util.Endpoints;
+import pl.stachu540.util.API;
+import pl.stachu540.util.MD5Hash;
+
+import java.security.NoSuchAlgorithmException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.SimpleTimeZone;
+
+/**
+ * @author Damian Staszewski <damian@stachuofficial.pl>
+ * @since 1.8
+ */
+public class Session {
+
+    private final Endpoints endpoints;
+    private final String devId;
+    private final String authKey;
+    private final String timestamp = timeStamp();
+
+    private String timeStamp() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        sdf.setTimeZone(new SimpleTimeZone(SimpleTimeZone.UTC_TIME, "UTC"));
+        return sdf.format(new Date());
+    }
+
+    private final int session_time = 1000 * 60 * 15;
+
+    public Session(String devId, String authKey, Endpoints endpoints) {
+        this.devId = devId;
+        this.authKey = authKey;
+        this.endpoints = endpoints;
+    }
+
+    public String getUrl() {
+        return endpoints.url();
+    }
+
+    public String getTimestamp() { return timestamp; }
+
+    public MD5Hash generateSig(String method) throws NoSuchAlgorithmException {
+        if (method.toLowerCase().endsWith("json")) method = method.substring(0, method.length() - 4);
+        return new MD5Hash(devId + method + authKey + getTimestamp());
+    }
+
+    public String createSession(MD5Hash signature) throws Exception {
+        API api = new API(endpoints.url());
+        String url = "/createsessionJson/" + devId + "/" + signature.getHash() + "/" + timestamp;
+        JSONObject data = api.getData(API.requestType.GET, url);
+        JSONObject content = new JSONObject();
+        if (data.getBoolean("_success")) content = data.getJSONObject("_content");
+        if (content.getString("ret_msg").equals("Approved")) return content.getString("session_id");
+        else {
+            Exception exception = (Exception) Class.forName(data.getString("_exception")).getConstructor(String.class, Throwable.class).newInstance(data.getString("_exceptionMessage"));
+            throw exception;
+        }
+    }
+
+}
+
diff --git a/src/main/java/pl/stachu540/hirezstudios/instance/TierLeauge.java b/src/main/java/pl/stachu540/hirezstudios/instance/TierLeauge.java
@@ -1,4 +1,4 @@
-package com.hirezstudios.games.smite;
+package pl.stachu540.hirezstudios.instance;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -52,4 +52,8 @@ public enum TierLeauge {
     public static TierLeauge valueOf(int id) {
         return map.get(id);
     }
+
+    public final String getName() {
+        return name().replace("_", " ");
+    }
 }
diff --git a/src/main/java/pl/stachu540/hirezstudios/util/Endpoints.java b/src/main/java/pl/stachu540/hirezstudios/util/Endpoints.java
@@ -0,0 +1,24 @@
+package pl.stachu540.hirezstudios.util;
+
+/**
+ * @author Damian Staszewski <damian@stachuofficial.pl>
+ * @since 1.8
+ */
+
+public enum Endpoints {
+    Smite_PC("http://api.smitegame.com/smiteapi.svc"),
+    Smite_XB1("http://api.xbox.smitegame.com/smiteapi.svc"),
+    Smite_PS4("http://api.ps4.smitegame.com/smiteapi.svc"),
+
+    Paladins_PC("http://api.paladins.com/paladinsapi.svc"),
+    Paladins_XB1("http://api.xbox.paladins.com/paladinsapi.svc"),
+    Paladins_PS4("http://api.ps4.paladins.com/paladinsapi.svc");
+
+    private String url;
+
+    Endpoints(String url) {
+        this.url = url;
+    }
+
+    public String url() { return url; }
+}
diff --git a/src/main/java/pl/stachu540/hirezstudios/util/Signature.java b/src/main/java/pl/stachu540/hirezstudios/util/Signature.java
@@ -0,0 +1,34 @@
+package pl.stachu540.hirezstudios.util;
+
+import pl.stachu540.util.MD5Hash;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.SimpleTimeZone;
+
+/**
+ * @author Damian Staszewski <damian@stachuofficial.pl>
+ * @since 1.8
+ */
+public class Signature {
+    private final String timestamp = generateTimestamp();
+    private final String devId;
+    private final String authKey;
+
+    public Signature(String devId, String authKey) {
+        this.devId = devId;
+        this.authKey = authKey;
+    }
+
+    private String generateTimestamp() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+        sdf.setTimeZone(new SimpleTimeZone(SimpleTimeZone.UTC_TIME, "UTC"));
+        return sdf.format(new Date());
+    }
+
+    public String getTimestamp() { return timestamp; }
+
+    public MD5Hash generateSignature(String method) {
+        return new MD5Hash(devId + method + authKey + timestamp);
+    }
+}
diff --git a/src/main/java/pl/stachu540/util/API.java b/src/main/java/pl/stachu540/util/API.java
@@ -1,4 +1,4 @@
-package pl.stachu540;
+package pl.stachu540.util;
 
 
 import org.apache.commons.io.IOUtils;
@@ -43,11 +43,11 @@ public void deleteHeader(String name) {
     }
 
     public JSONObject getData(requestType req, String path) {
-        return getData(req, path, "");
+        return getData(req, path, null);
     }
 
     @SuppressWarnings("UseSpecificCatch")
-    public JSONObject getData(requestType req, String path, String post) {
+    public JSONObject getData(requestType req, String path, JSONObject post) {
         JSONObject jsonData = new JSONObject("{}");
         InputStream is = null;
         String content = "";
@@ -62,48 +62,51 @@ public JSONObject getData(requestType req, String path, String post) {
             c.setRequestMethod(req.name());
             c.setConnectTimeout(timeout);
 
-            if (!post.isEmpty()) c.setDoOutput(true);
+            if (post.length() > 0) c.setDoOutput(true);
             c.connect();
-            if (!post.isEmpty()) {
+            if (post.length() > 0) {
                 try (OutputStream o = c.getOutputStream()){
-                    o.write(post.getBytes(Charset.forName("UTF-8")));
+                    o.write(post.toString().getBytes(Charset.forName("UTF-8")));
                 }
             }
 
             is = c.getInputStream();
             content = IOUtils.toString(is, c.getContentEncoding());
 
-            fillJSONObject(jsonData, true, req.name(), post, url_path, c.getResponseCode(), "", "", content);
+            fillJSONObject(jsonData, true, req, post, url_path, c.getResponseCode(), null, content);
         } catch (Exception e) {
             Throwable rootCause = e;
             while (rootCause.getCause() != null && rootCause.getCause() != rootCause) {
                 rootCause = rootCause.getCause();
             }
-
-            fillJSONObject(jsonData, false, req.name(), post, url_path, 0, e.getClass().getSimpleName(), e.getMessage(), content);
-            System.err.println(e.getMessage());
+            fillJSONObject(jsonData, false, req, post, url_path, 0, e, content);
+            e.printStackTrace();
         } finally {
             if (is != null) {
                 try {
                     is.close();
                 } catch (Exception e) {
-                    fillJSONObject(jsonData, false, req.name(), post, url_path, 0, e.getClass().getName(), e.getMessage(), content);
-                    System.err.println(e.getMessage());
+                    fillJSONObject(jsonData, false, req, post, url_path, 0, e, content);
+                    e.printStackTrace();
                 }
             }
         }
 
         return jsonData;
     }
 
-    private void fillJSONObject(JSONObject jsonObject, boolean success, String type, String post, String url, int responseCode, String exception, String exceptionMessage, String jsonContent) {
-        jsonObject.put("_success", success);
-        jsonObject.put("_type", type);
-        jsonObject.put("_post", post);
-        jsonObject.put("_url", url);
-        jsonObject.put("_http", responseCode);
-        jsonObject.put("_exception", exception);
-        jsonObject.put("_exceptionMessage", exceptionMessage);
-        jsonObject.put("_content", jsonContent);
+    private void fillJSONObject(JSONObject jsonObject, boolean success, requestType type, JSONObject post, String url, int responseCode, Exception exception, String jsonContent) {
+
+        JSONObject data = new JSONObject("{}");
+        data.put("status", success);
+        data.put("requestType", type.name());
+        data.put("url", url);
+        data.put("postData", post);
+        data.put("responseCode", responseCode);
+
+        jsonObject.put("data", data);
+        jsonObject.put("content", new JSONObject(jsonContent));
+        jsonObject.put("exception", exception);
+
     }
 }
diff --git a/src/main/java/pl/stachu540/util/MD5Hash.java b/src/main/java/pl/stachu540/util/MD5Hash.java
@@ -0,0 +1,35 @@
+package pl.stachu540.util;
+
+import java.security.MessageDigest;
+
+/**
+ * @author Damian Staszewski <damian@stachuofficial.pl>
+ * @since 1.8
+ */
+public class MD5Hash {
+
+    private final String data;
+    private final StringBuilder hash = new StringBuilder();
+
+    public MD5Hash(String data) {
+        this.data = data;
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(data.getBytes());
+
+            byte byteData[] = md.digest();
+
+            for (int i = 0; i < byteData.length; i++) {
+                String hex = Integer.toHexString(0xff & byteData[i]);
+                if (hex.length() == 1) hash.append("0");
+                hash.append(hex);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getText() { return data; }
+
+    public String getHash() { return hash.toString(); }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.hirezstudios.games.smite;`
	`1`	`+package pl.stachu540.hirezstudios.instance;`
`2`	`2`
`3`	`3`	`import java.util.HashMap;`
`4`	`4`	`import java.util.Map;`