Add signature list to avoid duplicate code

Learnosity · Jun 16, 2016 · 4671027 · 4671027
1 parent 0848451
commit 4671027
Showing 1 changed file with 11 additions and 21 deletions.
diff --git a/LearnositySDK/Request/Init.cs b/LearnositySDK/Request/Init.cs
@@ -403,33 +403,23 @@ private void setServiceOptions()
 
                         JsonObject questionsApiActivity = new JsonObject();
 
-                        string[] arrayToHash;
+                        List<string> signatureList = new List<string>();
+
+                        signatureList.Add(this.securityPacket.getString("consumer_key"));
+                        signatureList.Add(domain);
+                        signatureList.Add(this.securityPacket.getString("timestamp"));
 
                         if (Tools.array_key_exists("expires", this.securityPacket))
                         {
-                            arrayToHash = new string[] {
-                                this.securityPacket.getString("consumer_key"),
-                                domain,
-                                this.securityPacket.getString("timestamp"),
-                                this.securityPacket.getString("expires"),
-                                this.securityPacket.getString("user_id"),
-                                this.secret
-                            };
-
+                            signatureList.Add(this.securityPacket.getString("expires"));
                             questionsApiActivity.set("expires", this.securityPacket.getString("expires"));
                             questionsApi.remove("expires");
                         }
-                        else {
-                            arrayToHash = new string[] {
-                                this.securityPacket.getString("consumer_key"),
-                                domain,
-                                this.securityPacket.getString("timestamp"),
-                                this.securityPacket.getString("user_id"),
-                                this.secret
-                            };
-                        }
-
-                        string signature = this.hashValue(arrayToHash);
+
+                        signatureList.Add(this.securityPacket.getString("user_id"));
+                        signatureList.Add(this.secret);
+
+                        string signature = this.hashValue(signatureList.ToArray());
 
                         questionsApiActivity.set("consumer_key", this.securityPacket.getString("consumer_key"));
                         questionsApiActivity.set("timestamp", this.securityPacket.getString("timestamp"));