From 33947086b355ab108f9b8629a1e5db0580bf96d3 Mon Sep 17 00:00:00 2001
From: Jordan Wright <jmwright798@gmail.com>
Date: Sun, 24 Jan 2016 19:48:15 -0600
Subject: [PATCH] Added async option to the API to address async/synch requests
 until I can migrate all to async

---
 static/js/gophish.js | 51 ++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/static/js/gophish.js b/static/js/gophish.js
index ca9c0e11..86090932 100644
--- a/static/js/gophish.js
+++ b/static/js/gophish.js
@@ -15,10 +15,10 @@ function modalError(message) {
         <i class=\"fa fa-exclamation-circle\"></i> " + message + "</div>")
 }
 
-function query(endpoint, method, data) {
+function query(endpoint, method, data, async) {
     return $.ajax({
         url: "/api" + endpoint + "?api_key=" + user.api_key,
-        async: false,
+        async: async,
         method: method,
         data: JSON.stringify(data),
         dataType: "json",
@@ -34,108 +34,113 @@ var api = {
     campaigns: {
         // get() - Queries the API for GET /campaigns
         get: function() {
-            return query("/campaigns/", "GET", {})
+            return query("/campaigns/", "GET", {}, false)
         },
         // post() - Posts a campaign to POST /campaigns
         post: function(data) {
-            return query("/campaigns/", "POST", data)
+            return query("/campaigns/", "POST", data, false)
         }
     },
     // campaignId contains the endpoints for /campaigns/:id
     campaignId: {
         // get() - Queries the API for GET /campaigns/:id
         get: function(id) {
-            return query("/campaigns/" + id, "GET", {})
+            return query("/campaigns/" + id, "GET", {}, false)
         },
         // delete() - Deletes a campaign at DELETE /campaigns/:id
         delete: function(id) {
-            return query("/campaigns/" + id, "DELETE", {})
+            return query("/campaigns/" + id, "DELETE", {}, false)
         }
     },
     // groups contains the endpoints for /groups
     groups: {
         // get() - Queries the API for GET /groups
         get: function() {
-            return query("/groups/", "GET", {})
+            return query("/groups/", "GET", {}, false)
         },
         // post() - Posts a campaign to POST /groups
         post: function(group) {
-            return query("/groups/", "POST", group)
+            return query("/groups/", "POST", group, false)
         }
     },
     // groupId contains the endpoints for /groups/:id
     groupId: {
         // get() - Queries the API for GET /groups/:id
         get: function(id) {
-            return query("/groups/" + id, "GET", {})
+            return query("/groups/" + id, "GET", {}, false)
         },
         // put() - Puts a campaign to PUT /groups/:id
         put: function(group) {
-            return query("/groups/" + group.id, "PUT", group)
+            return query("/groups/" + group.id, "PUT", group, false)
         },
         // delete() - Deletes a campaign at DELETE /groups/:id
         delete: function(id) {
-            return query("/groups/" + id, "DELETE", {})
+            return query("/groups/" + id, "DELETE", {}, false)
         }
     },
     // templates contains the endpoints for /templates
     templates: {
         // get() - Queries the API for GET /templates
         get: function() {
-            return query("/templates/", "GET", {})
+            return query("/templates/", "GET", {}, false)
         },
         // post() - Posts a campaign to POST /templates
         post: function(template) {
-            return query("/templates/", "POST", template)
+            return query("/templates/", "POST", template, false)
         }
     },
     // templateId contains the endpoints for /templates/:id
     templateId: {
         // get() - Queries the API for GET /templates/:id
         get: function(id) {
-            return query("/templates/" + id, "GET", {})
+            return query("/templates/" + id, "GET", {}, false)
         },
         // put() - Puts a campaign to PUT /templates/:id
         put: function(template) {
-            return query("/templates/" + template.id, "PUT", template)
+            return query("/templates/" + template.id, "PUT", template, false)
         },
         // delete() - Deletes a campaign at DELETE /templates/:id
         delete: function(id) {
-            return query("/templates/" + id, "DELETE", {})
+            return query("/templates/" + id, "DELETE", {}, false)
         }
     },
     // pages contains the endpoints for /pages
     pages: {
         // get() - Queries the API for GET /pages
         get: function() {
-            return query("/pages/", "GET", {})
+            return query("/pages/", "GET", {}, false)
         },
         // post() - Posts a campaign to POST /pages
         post: function(page) {
-            return query("/pages/", "POST", page)
+            return query("/pages/", "POST", page, false)
         }
     },
     // templateId contains the endpoints for /templates/:id
     pageId: {
         // get() - Queries the API for GET /templates/:id
         get: function(id) {
-            return query("/pages/" + id, "GET", {})
+            return query("/pages/" + id, "GET", {}, false)
         },
         // put() - Puts a campaign to PUT /templates/:id
         put: function(page) {
-            return query("/pages/" + page.id, "PUT", page)
+            return query("/pages/" + page.id, "PUT", page, false)
         },
         // delete() - Deletes a campaign at DELETE /templates/:id
         delete: function(id) {
-            return query("/pages/" + id, "DELETE", {})
+            return query("/pages/" + id, "DELETE", {}, false)
         }
     },
     // import handles all of the "import" functions in the api
     import_email: function(raw) {
-        return query("/import/email", "POST", {})
+        return query("/import/email", "POST", {}, false)
     },
+    // clone_site handles importing a site by url
     clone_site: function(req) {
-        return query("/import/site", "POST", req)
+        return query("/import/site", "POST", req, false)
+    },
+    // send_test_email sends an email to the specified email address
+    send_test_email: function(req){
+    	return query("/util/send_test_email", "POST", req, true)
     }
 }