diff --git a/api/api.go b/api/api.go index 42211b6..c6608a3 100644 --- a/api/api.go +++ b/api/api.go @@ -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 diff --git a/cmd/server.go b/cmd/server.go index 8ba30e8..5e4f8a4 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -424,13 +424,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)