summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorCarlos Tadeu Panato Junior <ctadeu@gmail.com>2017-03-14 13:52:27 +0100
committerJoram Wilander <jwawilander@gmail.com>2017-03-14 08:52:27 -0400
commitd03367c56005470396d883d273323ecbd8d4f243 (patch)
tree921b6e459c367b9172809bc63a218711566b304d /api4
parentee457176bd0c4442358df089044b87eb75fe7569 (diff)
downloadchat-d03367c56005470396d883d273323ecbd8d4f243.tar.gz
chat-d03367c56005470396d883d273323ecbd8d4f243.tar.bz2
chat-d03367c56005470396d883d273323ecbd8d4f243.zip
Add implementation for POST /config/reload apiV4 - Reload Configuration (#5713)
Diffstat (limited to 'api4')
-rw-r--r--api4/system.go13
-rw-r--r--api4/system_test.go21
2 files changed, 34 insertions, 0 deletions
diff --git a/api4/system.go b/api4/system.go
index 04275f57f..32c010d82 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -17,6 +17,7 @@ func InitSystem() {
BaseRoutes.System.Handle("/ping", ApiHandler(getSystemPing)).Methods("GET")
BaseRoutes.ApiRoot.Handle("/config", ApiSessionRequired(getConfig)).Methods("GET")
+ BaseRoutes.ApiRoot.Handle("/config/reload", ApiSessionRequired(configReload)).Methods("POST")
BaseRoutes.ApiRoot.Handle("/email/test", ApiSessionRequired(testEmail)).Methods("POST")
BaseRoutes.ApiRoot.Handle("/database/recycle", ApiSessionRequired(databaseRecycle)).Methods("POST")
}
@@ -53,6 +54,18 @@ func getConfig(c *Context, w http.ResponseWriter, r *http.Request) {
w.Write([]byte(cfg.ToJson()))
}
+func configReload(c *Context, w http.ResponseWriter, r *http.Request) {
+ if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
+ c.SetPermissionError(model.PERMISSION_MANAGE_SYSTEM)
+ return
+ }
+
+ app.ReloadConfig()
+
+ w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+ ReturnStatusOK(w)
+}
+
func databaseRecycle(c *Context, w http.ResponseWriter, r *http.Request) {
if !app.SessionHasPermissionTo(c.Session, model.PERMISSION_MANAGE_SYSTEM) {
diff --git a/api4/system_test.go b/api4/system_test.go
index 36ae347dd..cb6ca7b81 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -66,6 +66,27 @@ func TestGetConfig(t *testing.T) {
}
}
+func TestReloadConfig(t *testing.T) {
+ th := Setup().InitBasic().InitSystemAdmin()
+ defer TearDown()
+ Client := th.Client
+
+ flag, resp := Client.ReloadConfig()
+ CheckForbiddenStatus(t, resp)
+ if flag == true {
+ t.Fatal("should not Reload the config due no permission.")
+ }
+
+ flag, resp = th.SystemAdminClient.ReloadConfig()
+ CheckNoError(t, resp)
+ if flag == false {
+ t.Fatal("should Reload the config")
+ }
+
+ utils.Cfg.TeamSettings.MaxUsersPerTeam = 50
+ *utils.Cfg.TeamSettings.EnableOpenServer = true
+}
+
func TestEmailTest(t *testing.T) {
th := Setup().InitBasic().InitSystemAdmin()
defer TearDown()