diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-13 08:26:23 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-13 12:26:23 +0000 |
| commit | 3559fb7959cf008b038239f2e7c43e604c44cd31 (patch) | |
| tree | 159fdbb16a169926e0d142aa17d6086fcded62c4 /api | |
| parent | fe38d6d5bb36e18ddefbe490cc21f48f4f4c8d81 (diff) | |
| download | chat-3559fb7959cf008b038239f2e7c43e604c44cd31.tar.gz chat-3559fb7959cf008b038239f2e7c43e604c44cd31.tar.bz2 chat-3559fb7959cf008b038239f2e7c43e604c44cd31.zip | |
Implement SAML endpoints for APIv4 (#5671)
* Implement SAML endpoints for APIv4
* Fix unit test
* Only disable encryption when removing puplic/private certs
Diffstat (limited to 'api')
| -rw-r--r-- | api/admin.go | 12 | ||||
| -rw-r--r-- | api/apitestlib.go | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/api/admin.go b/api/admin.go index 3aa1dc67d..785b8bf24 100644 --- a/api/admin.go +++ b/api/admin.go @@ -383,7 +383,7 @@ func addCertificate(c *Context, w http.ResponseWriter, r *http.Request) { fileData := fileArray[0] - if err := app.AddSamlCertificate(fileData); err != nil { + if err := app.WriteSamlFile(fileData); err != nil { c.Err = err return } @@ -393,7 +393,7 @@ func addCertificate(c *Context, w http.ResponseWriter, r *http.Request) { func removeCertificate(c *Context, w http.ResponseWriter, r *http.Request) { props := model.MapFromJson(r.Body) - if err := app.RemoveSamlCertificate(props["filename"]); err != nil { + if err := app.RemoveSamlFile(props["filename"]); err != nil { c.Err = err return } @@ -403,7 +403,13 @@ func removeCertificate(c *Context, w http.ResponseWriter, r *http.Request) { func samlCertificateStatus(c *Context, w http.ResponseWriter, r *http.Request) { status := app.GetSamlCertificateStatus() - w.Write([]byte(model.StringInterfaceToJson(status))) + + statusMap := map[string]interface{}{} + statusMap["IdpCertificateFile"] = status.IdpCertificateFile + statusMap["PrivateKeyFile"] = status.PrivateKeyFile + statusMap["PublicCertificateFile"] = status.PublicCertificateFile + + w.Write([]byte(model.StringInterfaceToJson(statusMap))) } func getRecentlyActiveUsers(c *Context, w http.ResponseWriter, r *http.Request) { diff --git a/api/apitestlib.go b/api/apitestlib.go index df5ac5d26..4206d033e 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -6,6 +6,7 @@ package api import ( "time" + "github.com/mattermost/platform/api4" "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" "github.com/mattermost/platform/store" @@ -43,6 +44,7 @@ func SetupEnterprise() *TestHelper { InitRouter() app.StartServer() utils.InitHTML() + api4.InitApi(false) InitApi() utils.EnableDebugLogForTest() app.Srv.Store.MarkSystemRanUnitTests() |