diff options
| author | George Goldberg <george@gberg.me> | 2017-09-01 16:42:02 +0100 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-09-01 11:42:02 -0400 |
| commit | e85b5fb98835fb952eb2ed55f81e79eb3ef361ec (patch) | |
| tree | abe78804cd5e1175954f74b811a6d6a7af089d0b /app/saml.go | |
| parent | d9ec7d9240a508571904c22458222e2846c2b5b4 (diff) | |
| download | chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.tar.gz chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.tar.bz2 chat-e85b5fb98835fb952eb2ed55f81e79eb3ef361ec.zip | |
App: NewLocAppError -> NewAppError (#7327)
* App: NewLocAppError -> NewAppError
* Remove statuscode that got missed.
Diffstat (limited to 'app/saml.go')
| -rw-r--r-- | app/saml.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/saml.go b/app/saml.go index e5d1e8b3e..6b0966ebf 100644 --- a/app/saml.go +++ b/app/saml.go @@ -33,19 +33,19 @@ func WriteSamlFile(fileData *multipart.FileHeader) *model.AppError { filename := filepath.Base(fileData.Filename) if filename == "." || filename == string(filepath.Separator) { - return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, "") + return model.NewAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, "", http.StatusBadRequest) } file, err := fileData.Open() defer file.Close() if err != nil { - return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error()) + return model.NewAppError("AddSamlCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error(), http.StatusInternalServerError) } configDir, _ := utils.FindDir("config") out, err := os.Create(configDir + filename) if err != nil { - return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error()) + return model.NewAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error(), http.StatusInternalServerError) } defer out.Close() @@ -114,12 +114,11 @@ func RemoveSamlFile(filename string) *model.AppError { filename = filepath.Base(filename) if filename == "." || filename == string(filepath.Separator) { - return model.NewLocAppError("AddSamlCertificate", "api.admin.remove_certificate.delete.app_error", nil, "") + return model.NewAppError("AddSamlCertificate", "api.admin.remove_certificate.delete.app_error", nil, "", http.StatusBadRequest) } if err := os.Remove(utils.FindConfigFile(filename)); err != nil { - return model.NewLocAppError("removeCertificate", "api.admin.remove_certificate.delete.app_error", - map[string]interface{}{"Filename": filename}, err.Error()) + return model.NewAppError("removeCertificate", "api.admin.remove_certificate.delete.app_error", map[string]interface{}{"Filename": filename}, err.Error(), http.StatusInternalServerError) } return nil |