crash send also oauth token

massimozappino · massimozappino · commit fbcde0897880 · 2017-11-29T20:32:40.000+01:00
diff --git a/src/main/java/com/tagmycode/sdk/authentication/OauthToken.java b/src/main/java/com/tagmycode/sdk/authentication/OauthToken.java
@@ -1,5 +1,7 @@
 package com.tagmycode.sdk.authentication;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.scribe.model.Token;
 
 public class OauthToken implements Comparable<OauthToken> {
@@ -43,4 +45,15 @@ public boolean equals(Object object) {
 
         return compareTo((OauthToken) object) == 0;
     }
+
+    public String toJson() {
+        JSONObject jo = new JSONObject();
+        try {
+            jo.put("access_token", accessToken.getToken());
+            jo.put("refresh_token", refreshToken.getToken());
+        } catch (JSONException ignore) {
+        }
+
+        return jo.toString();
+    }
 }
diff --git a/src/main/java/com/tagmycode/sdk/crash/Crash.java b/src/main/java/com/tagmycode/sdk/crash/Crash.java
@@ -1,5 +1,6 @@
 package com.tagmycode.sdk.crash;
 
+import com.tagmycode.sdk.authentication.OauthToken;
 import com.tagmycode.sdk.model.User;
 import org.json.JSONException;
 
@@ -14,6 +15,7 @@ public class Crash {
     public static final String APP_ID = "app_id";
     public static final String APP_VERSION = "app_version";
     public static final String USER = "user";
+    public static final String OAUTH_TOKEN = "oauth_token";
     public static final String THROWABLE = "throwable";
     public static final String THROWABLE_MESSAGE = "throwable_message";
     private String operatingSystem;
@@ -22,25 +24,27 @@ public class Crash {
     private User user;
     private Throwable throwable;
     private String appId;
+    private OauthToken oauthToken;
 
-    public Crash(String operatingSystem, String javaVersion, String appId, String appVersion, User user, Throwable throwable) {
+    public Crash(String operatingSystem, String javaVersion, String appId, String appVersion, User user, OauthToken oauthToken, Throwable throwable) {
         this.operatingSystem = operatingSystem;
         this.javaVersion = javaVersion;
         this.appId = appId;
         this.appVersion = appVersion;
         this.user = user;
+        this.oauthToken = oauthToken;
         this.throwable = throwable;
     }
 
-    public static Crash create(String appId, String appVersion, User user, Throwable throwable) {
+    public static Crash create(String appId, String appVersion, User user, OauthToken oauthToken, Throwable throwable) {
         String operatingSystem = String.format("%s %s %s %s",
                 System.getProperty("os.name"),
                 System.getProperty("os.version"),
                 System.getProperty("os.arch"),
                 System.getProperty("sun.desktop")
         );
 
-        return new Crash(operatingSystem, System.getProperty("java.version"), appId, appVersion, user, throwable);
+        return new Crash(operatingSystem, System.getProperty("java.version"), appId, appVersion, user, oauthToken, throwable);
     }
 
     private String extractStackTrace(Throwable throwable) {
@@ -73,6 +77,10 @@ public User getUser() {
         return user;
     }
 
+    public OauthToken getOauthToken() {
+        return oauthToken;
+    }
+
     public Map<String, String> toMap() {
         Map<String, String> map = new HashMap<String, String>();
         map.put(OPERATING_SYSTEM, getOperatingSystem());
@@ -82,7 +90,10 @@ public Map<String, String> toMap() {
         try {
             map.put(USER, getUser().toJson());
         } catch (JSONException e) {
-            map.put(USER, getUser().getUsername());
+            map.put(USER, "");
+        }
+        if (getOauthToken() != null) {
+            map.put(OAUTH_TOKEN, getOauthToken().toJson());
         }
         map.put(THROWABLE, extractStackTrace(getThrowable()));
         map.put(THROWABLE_MESSAGE, getThrowable().getMessage());
diff --git a/src/test/java/com/tagmycode/sdk/authentication/OauthTokenTest.java b/src/test/java/com/tagmycode/sdk/authentication/OauthTokenTest.java
@@ -11,4 +11,10 @@ public void twoOauthTokensAreEquals() {
         OauthToken oauthToken2 = new OauthToken("123", "456");
         assertEquals(oauthToken1, oauthToken2);
     }
+
+    @Test
+    public void toJson() {
+        assertEquals("{\"access_token\":\"access_token_value\",\"refresh_token\":\"refresh_token_value\"}",
+                new OauthToken("access_token_value", "refresh_token_value").toJson());
+    }
 }
diff --git a/src/test/java/com/tagmycode/sdk/crash/CrashClientTest.java b/src/test/java/com/tagmycode/sdk/crash/CrashClientTest.java
@@ -1,5 +1,6 @@
 package com.tagmycode.sdk.crash;
 
+import com.tagmycode.sdk.authentication.OauthToken;
 import com.tagmycode.sdk.model.User;
 import org.junit.Before;
 import org.junit.Test;
@@ -23,10 +24,12 @@ public void sendCrash() throws Exception {
                         .withStatus(200)
                         .withHeader("Content-Type", "application/json")
                 ));
-        Crash crash = Crash.create("app_id", "1.0.0", new User(), new Throwable("throwable"));
-// TODO
-//        verify(postRequestedFor(urlEqualTo(url))
-//                .withRequestBody(equalTo("app_version=1.0.0&throwable=java.lang.Throwable%3A%20throwable%0A%09at%20com.tagmycode.sdk.crash.CrashClientTest.sendCrash%28CrashClientTest.java%3A27%29%0A%09at%20sun.reflect.NativeMethodAccessorImpl.invoke0%28Native%20Method%29%0A%09at%20sun.reflect.NativeMethodAccessorImpl.invoke%28NativeMethodAccessorImpl.java%3A62%29%0A%09at%20sun.reflect.DelegatingMethodAccessorImpl.invoke%28DelegatingMethodAccessorImpl.java%3A43%29%0A%09at%20java.lang.reflect.Method.invoke%28Method.java%3A498%29%0A%09at%20org.junit.runners.model.FrameworkMethod%241.runReflectiveCall%28FrameworkMethod.java%3A47%29%0A%09at%20org.junit.internal.runners.model.ReflectiveCallable.run%28ReflectiveCallable.java%3A12%29%0A%09at%20org.junit.runners.model.FrameworkMethod.invokeExplosively%28FrameworkMethod.java%3A44%29%0A%09at%20org.junit.internal.runners.statements.InvokeMethod.evaluate%28InvokeMethod.java%3A17%29%0A%09at%20org.junit.internal.runners.statements.RunBefores.evaluate%28RunBefores.java%3A26%29%0A%09at%20com.github.tomakehurst.wiremock.junit.WireMockRule%241.evaluate%28WireMockRule.java%3A74%29%0A%09at%20org.junit.rules.RunRules.evaluate%28RunRules.java%3A20%29%0A%09at%20org.junit.runners.ParentRunner.runLeaf%28ParentRunner.java%3A271%29%0A%09at%20org.junit.runners.BlockJUnit4ClassRunner.runChild%28BlockJUnit4ClassRunner.java%3A70%29%0A%09at%20org.junit.runners.BlockJUnit4ClassRunner.runChild%28BlockJUnit4ClassRunner.java%3A50%29%0A%09at%20org.junit.runners.ParentRunner%243.run%28ParentRunner.java%3A238%29%0A%09at%20org.junit.runners.ParentRunner%241.schedule%28ParentRunner.java%3A63%29%0A%09at%20org.junit.runners.ParentRunner.runChildren%28ParentRunner.java%3A236%29%0A%09at%20org.junit.runners.ParentRunner.access%24000%28ParentRunner.java%3A53%29%0A%09at%20org.junit.runners.ParentRunner%242.evaluate%28ParentRunner.java%3A229%29%0A%09at%20org.junit.runners.ParentRunner.run%28ParentRunner.java%3A309%29%0A%09at%20org.junit.runner.JUnitCore.run%28JUnitCore.java%3A160%29%0A%09at%20com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs%28JUnit4IdeaTestRunner.java%3A68%29%0A%09at%20com.intellij.rt.execution.junit.IdeaTestRunner%24Repeater.startRunnerWithArgs%28IdeaTestRunner.java%3A47%29%0A%09at%20com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart%28JUnitStarter.java%3A242%29%0A%09at%20com.intellij.rt.execution.junit.JUnitStarter.main%28JUnitStarter.java%3A70%29%0A&java_version=1.8.0_131&operating_system=Linux%204.8.0-59-generic%20amd64%20gnome&throwable_message=throwable&app_id=app_id&user=%7B%22id%22%3A0%7D")));
+        Crash crash = Crash.create("app_id", "1.0.0", new User(), new OauthToken("access_token_value", "refresh_token_value"), new Throwable("throwable"));
+
+        new CrashClient(client).sendCrash(crash);
+
+        verify(postRequestedFor(urlMatching(url))
+                .withRequestBody(equalTo("app_version=1.0.0&oauth_token=%7B%22access_token%22%3A%22access_token_value%22%2C%22refresh_token%22%3A%22refresh_token_value%22%7D&throwable=java.lang.Throwable%3A%20throwable%0A%09at%20com.tagmycode.sdk.crash.CrashClientTest.sendCrash%28CrashClientTest.java%3A27%29%0A%09at%20sun.reflect.NativeMethodAccessorImpl.invoke0%28Native%20Method%29%0A%09at%20sun.reflect.NativeMethodAccessorImpl.invoke%28NativeMethodAccessorImpl.java%3A62%29%0A%09at%20sun.reflect.DelegatingMethodAccessorImpl.invoke%28DelegatingMethodAccessorImpl.java%3A43%29%0A%09at%20java.lang.reflect.Method.invoke%28Method.java%3A498%29%0A%09at%20org.junit.runners.model.FrameworkMethod%241.runReflectiveCall%28FrameworkMethod.java%3A47%29%0A%09at%20org.junit.internal.runners.model.ReflectiveCallable.run%28ReflectiveCallable.java%3A12%29%0A%09at%20org.junit.runners.model.FrameworkMethod.invokeExplosively%28FrameworkMethod.java%3A44%29%0A%09at%20org.junit.internal.runners.statements.InvokeMethod.evaluate%28InvokeMethod.java%3A17%29%0A%09at%20org.junit.internal.runners.statements.RunBefores.evaluate%28RunBefores.java%3A26%29%0A%09at%20com.github.tomakehurst.wiremock.junit.WireMockRule%241.evaluate%28WireMockRule.java%3A74%29%0A%09at%20org.junit.rules.RunRules.evaluate%28RunRules.java%3A20%29%0A%09at%20org.junit.runners.ParentRunner.runLeaf%28ParentRunner.java%3A271%29%0A%09at%20org.junit.runners.BlockJUnit4ClassRunner.runChild%28BlockJUnit4ClassRunner.java%3A70%29%0A%09at%20org.junit.runners.BlockJUnit4ClassRunner.runChild%28BlockJUnit4ClassRunner.java%3A50%29%0A%09at%20org.junit.runners.ParentRunner%243.run%28ParentRunner.java%3A238%29%0A%09at%20org.junit.runners.ParentRunner%241.schedule%28ParentRunner.java%3A63%29%0A%09at%20org.junit.runners.ParentRunner.runChildren%28ParentRunner.java%3A236%29%0A%09at%20org.junit.runners.ParentRunner.access%24000%28ParentRunner.java%3A53%29%0A%09at%20org.junit.runners.ParentRunner%242.evaluate%28ParentRunner.java%3A229%29%0A%09at%20org.junit.runners.ParentRunner.run%28ParentRunner.java%3A309%29%0A%09at%20org.junit.runner.JUnitCore.run%28JUnitCore.java%3A160%29%0A%09at%20com.intellij.junit4.JUnit4IdeaTestRunner.startRunnerWithArgs%28JUnit4IdeaTestRunner.java%3A68%29%0A%09at%20com.intellij.rt.execution.junit.IdeaTestRunner%24Repeater.startRunnerWithArgs%28IdeaTestRunner.java%3A47%29%0A%09at%20com.intellij.rt.execution.junit.JUnitStarter.prepareStreamsAndStart%28JUnitStarter.java%3A242%29%0A%09at%20com.intellij.rt.execution.junit.JUnitStarter.main%28JUnitStarter.java%3A70%29%0A&java_version=1.8.0_131&operating_system=Linux%204.8.0-59-generic%20amd64%20gnome&throwable_message=throwable&app_id=app_id&user=%7B%22id%22%3A0%7D")));
         crashClient.sendCrash(crash);
     }
 }
diff --git a/src/test/java/com/tagmycode/sdk/crash/CrashTest.java b/src/test/java/com/tagmycode/sdk/crash/CrashTest.java
@@ -1,43 +1,54 @@
 package com.tagmycode.sdk.crash;
 
+import com.tagmycode.sdk.authentication.OauthToken;
 import com.tagmycode.sdk.model.User;
 import org.json.JSONException;
 import org.junit.Test;
 
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class CrashTest {
 
+    private OauthToken oauthToken = new OauthToken("access_token_value", "refresh_token_value");
+
     @Test
     public void create() throws JSONException {
-        Crash crash = Crash.create("0000", "1.1.1", new User(), new Exception("message"));
+        Crash crash = Crash.create("0000", "1.1.1", new User(), oauthToken, new Exception("message"));
         assertTrue(crash.getOperatingSystem().length() > 0);
         assertTrue(crash.getJavaVersion().contains("1."));
         assertEquals("0000", crash.getAppId());
         assertEquals("1.1.1", crash.getAppVersion());
         assertEquals("{\"id\":0}", crash.getUser().toJson());
+        assertEquals("{\"access_token\":\"access_token_value\",\"refresh_token\":\"refresh_token_value\"}", crash.getOauthToken().toJson());
         assertEquals("message", crash.getThrowable().getMessage());
     }
 
     @Test
     public void toMap() throws JSONException {
         Crash crash = new Crash("OS", "1.8", "plugin_id",
-                "2.0.0", new User().setUsername("username"), new Exception("Error message"));
+                "2.0.0", new User().setUsername("username"), oauthToken, new Exception("Error message"));
 
         Map<String, String> map = crash.toMap();
         assertEquals("OS", map.get(Crash.OPERATING_SYSTEM));
         assertEquals("1.8", map.get(Crash.JAVA_VERSION));
         assertEquals("2.0.0", map.get(Crash.APP_VERSION));
         assertEquals("plugin_id", map.get(Crash.APP_ID));
         assertEquals("{\"id\":0,\"username\":\"username\"}", map.get(Crash.USER));
+        assertEquals("{\"access_token\":\"access_token_value\",\"refresh_token\":\"refresh_token_value\"}", map.get(Crash.OAUTH_TOKEN));
         String[] stackTrace = map.get(Crash.THROWABLE).split("\r\n|\r|\n");
         assertTrue(stackTrace.length > 10);
         assertEquals("java.lang.Exception: Error message", stackTrace[0]);
         assertEquals("java.lang.Exception: Error message", stackTrace[0]);
         assertEquals("Error message", map.get(Crash.THROWABLE_MESSAGE));
     }
 
+    @Test
+    public void nullOauthToken() throws JSONException {
+        oauthToken = null;
+        Crash crash = Crash.create("0000", "1.1.1", new User(), oauthToken, new Exception("message"));
+        assertNull(crash.toMap().get(Crash.OAUTH_TOKEN));
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,10 @@ public void twoOauthTokensAreEquals() {`
`11`	`11`	`OauthToken oauthToken2 = new OauthToken("123", "456");`
`12`	`12`	`assertEquals(oauthToken1, oauthToken2);`
`13`	`13`	`}`
	`14`	`+`
	`15`	`+ @Test`
	`16`	`+ public void toJson() {`
	`17`	`+ assertEquals("{\"access_token\":\"access_token_value\",\"refresh_token\":\"refresh_token_value\"}",`
	`18`	`+ new OauthToken("access_token_value", "refresh_token_value").toJson());`
	`19`	`+ }`
`14`	`20`	`}`