From 1138dd67705829a6af0d6c610cf3dbe09082187c Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Wed, 14 Jun 2017 08:56:56 -0400
Subject: PLT-6657 Move system console to use v4 endpoints and redux (#6572)

* Move system console to use v4 endpoints and redux

* Rename logs dir to get past gitignore

* Fix test email

* Update brand unit test

* Updates per feedback
---
 api4/brand.go      |  1 +
 api4/brand_test.go | 24 ++++++------------------
 api4/compliance.go |  2 +-
 api4/system.go     |  6 +++++-
 api4/user.go       |  2 +-
 5 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'api4')

diff --git a/api4/brand.go b/api4/brand.go
index ac69f623b..de81b8a3b 100644
--- a/api4/brand.go
+++ b/api4/brand.go
@@ -23,6 +23,7 @@ func getBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
 	// No permission check required
 
 	if img, err := app.GetBrandImage(); err != nil {
+		w.WriteHeader(http.StatusNotFound)
 		w.Write(nil)
 	} else {
 		w.Header().Set("Content-Type", "image/png")
diff --git a/api4/brand_test.go b/api4/brand_test.go
index 98a539574..6ecb41a83 100644
--- a/api4/brand_test.go
+++ b/api4/brand_test.go
@@ -13,27 +13,15 @@ func TestGetBrandImage(t *testing.T) {
 	defer TearDown()
 	Client := th.Client
 
-	data, resp := Client.GetBrandImage()
-	CheckNoError(t, resp)
-
-	if len(data) != 0 {
-		t.Fatal("no image uploaded - should be empty")
-	}
+	_, resp := Client.GetBrandImage()
+	CheckNotFoundStatus(t, resp)
 
 	Client.Logout()
-	data, resp = Client.GetBrandImage()
-	CheckNoError(t, resp)
-
-	if len(data) != 0 {
-		t.Fatal("no image uploaded - should be empty")
-	}
-
-	data, resp = th.SystemAdminClient.GetBrandImage()
-	CheckNoError(t, resp)
+	_, resp = Client.GetBrandImage()
+	CheckNotFoundStatus(t, resp)
 
-	if len(data) != 0 {
-		t.Fatal("no image uploaded - should be empty")
-	}
+	_, resp = th.SystemAdminClient.GetBrandImage()
+	CheckNotFoundStatus(t, resp)
 }
 
 func TestUploadBrandImage(t *testing.T) {
diff --git a/api4/compliance.go b/api4/compliance.go
index cabac6e21..733abeecf 100644
--- a/api4/compliance.go
+++ b/api4/compliance.go
@@ -20,7 +20,7 @@ func InitCompliance() {
 	BaseRoutes.Compliance.Handle("/reports", ApiSessionRequired(createComplianceReport)).Methods("POST")
 	BaseRoutes.Compliance.Handle("/reports", ApiSessionRequired(getComplianceReports)).Methods("GET")
 	BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}", ApiSessionRequired(getComplianceReport)).Methods("GET")
-	BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}/download", ApiSessionRequired(downloadComplianceReport)).Methods("GET")
+	BaseRoutes.Compliance.Handle("/reports/{report_id:[A-Za-z0-9]+}/download", ApiSessionRequiredTrustRequester(downloadComplianceReport)).Methods("GET")
 }
 
 func createComplianceReport(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/api4/system.go b/api4/system.go
index 3a077283c..465f4e71d 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -52,13 +52,17 @@ func getSystemPing(c *Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func testEmail(c *Context, w http.ResponseWriter, r *http.Request) {
+	cfg := model.ConfigFromJson(r.Body)
+	if cfg == nil {
+		cfg = utils.Cfg
+	}
 
 	if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
 		c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM)
 		return
 	}
 
-	err := app.TestEmail(c.Session.UserId, utils.Cfg)
+	err := app.TestEmail(c.Session.UserId, cfg)
 	if err != nil {
 		c.Err = err
 		return
diff --git a/api4/user.go b/api4/user.go
index d06dd2882..69bea945a 100644
--- a/api4/user.go
+++ b/api4/user.go
@@ -27,7 +27,7 @@ func InitUser() {
 	BaseRoutes.Users.Handle("/autocomplete", ApiSessionRequired(autocompleteUsers)).Methods("GET")
 
 	BaseRoutes.User.Handle("", ApiSessionRequired(getUser)).Methods("GET")
-	BaseRoutes.User.Handle("/image", ApiSessionRequired(getProfileImage)).Methods("GET")
+	BaseRoutes.User.Handle("/image", ApiSessionRequiredTrustRequester(getProfileImage)).Methods("GET")
 	BaseRoutes.User.Handle("/image", ApiSessionRequired(setProfileImage)).Methods("POST")
 	BaseRoutes.User.Handle("", ApiSessionRequired(updateUser)).Methods("PUT")
 	BaseRoutes.User.Handle("/patch", ApiSessionRequired(patchUser)).Methods("PUT")
-- 
cgit v1.2.3-1-g7c22