Merge fe811c7 into a831cbd

OpenBazaar · Jul 19, 2018 · 0500713 · 0500713
2 parents a831cbd + fe811c7
commit 0500713
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/api/jsonapi.go b/api/jsonapi.go
@@ -1803,9 +1803,12 @@ func (i *jsonAPIHandler) GETModerators(w http.ResponseWriter, r *http.Request) {
 		}
 		SanitizedResponse(w, resp)
 	} else {
-		idBytes := make([]byte, 16)
-		rand.Read(idBytes)
-		id := base58.Encode(idBytes)
+		id := r.URL.Query().Get("asyncID")
+		if id == "" {
+			idBytes := make([]byte, 16)
+			rand.Read(idBytes)
+			id = base58.Encode(idBytes)
+		}
 
 		type resp struct {
 			Id string `json:"id"`
@@ -2623,9 +2626,12 @@ func (i *jsonAPIHandler) POSTFetchProfiles(w http.ResponseWriter, r *http.Reques
 		resp += "\n]"
 		SanitizedResponse(w, resp)
 	} else {
-		idBytes := make([]byte, 16)
-		rand.Read(idBytes)
-		id := base58.Encode(idBytes)
+		id := r.URL.Query().Get("asyncID")
+		if id == "" {
+			idBytes := make([]byte, 16)
+			rand.Read(idBytes)
+			id = base58.Encode(idBytes)
+		}
 
 		type resp struct {
 			Id string `json:"id"`
@@ -3366,9 +3372,12 @@ func (i *jsonAPIHandler) POSTFetchRatings(w http.ResponseWriter, r *http.Request
 		resp += "\n]"
 		SanitizedResponse(w, resp)
 	} else {
-		idBytes := make([]byte, 16)
-		rand.Read(idBytes)
-		id := base58.Encode(idBytes)
+		id := r.URL.Query().Get("asyncID")
+		if id == "" {
+			idBytes := make([]byte, 16)
+			rand.Read(idBytes)
+			id = base58.Encode(idBytes)
+		}
 
 		type resp struct {
 			Id string `json:"id"`