agecem/agecem-org
4
1
Fork 0
Code Issues 33 Pull requests 2 Activity

Standardiser l'utilisation de api#NewApiClientFromViper #110

Merged
vlbeaudoin merged 2 commits from fix/use-api-client-from-viper into main 2023-08-19 15:24:19 -04:00
Conversation 0 Commits 2 Files changed 2 +4 -7
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/api.go
View file

@ -41,6 +41,9 @@ type UploadDocumentResponseInfo struct {
Size float64 `json:"size"`
}
// NewApiClientFromViper returns a pointer to a new API object,
// provided the configuration options are managed by
// https://git.agecem.com/agecem/agecem-org/config
func NewApiClientFromViper() (*API, error) {
var config config.Config

8
cmd/server.go
View file

@ -441,13 +441,7 @@ func handleAdminDocumentsUploadPOST(c echo.Context) error {
Message string
}
client, err := api.New(cfg.Server.Api.Protocol, cfg.Server.Api.Host, cfg.Server.Port, api.APIOptions{
KeyAuth: cfg.Server.Api.Auth,
Key: cfg.Server.Api.Key,
BasicAuth: cfg.Server.Admin.Auth,
Username: cfg.Server.Admin.Username,
Password: cfg.Server.Admin.Password,
})
client, err := api.NewApiClientFromViper()
if err != nil {
data.Message = fmt.Sprintf("handleAdminDocumentsUploadPOST#api.New: %s", err)
return c.Render(http.StatusInternalServerError, "admin-upload-html", data)