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

Merge branch 'main' into refactor/models

Browse source
This commit is contained in:
Victor Lacasse-Beaudoin 2023-08-19 15:29:06 -04:00
commit 9975d4032d
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"` 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) { func NewApiClientFromViper() (*API, error) {
var config config.Config var config config.Config

8
cmd/server.go
View file

@ -424,13 +424,7 @@ func handleAdminDocumentsUploadPOST(c echo.Context) error {
Message string Message string
} }
client, err := api.New(cfg.Server.Api.Protocol, cfg.Server.Api.Host, cfg.Server.Port, api.APIOptions{ client, err := api.NewApiClientFromViper()
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,
})
if err != nil { if err != nil {
data.Message = fmt.Sprintf("handleAdminDocumentsUploadPOST#api.New: %s", err) data.Message = fmt.Sprintf("handleAdminDocumentsUploadPOST#api.New: %s", err)
return c.Render(http.StatusInternalServerError, "admin-upload-html", data) return c.Render(http.StatusInternalServerError, "admin-upload-html", data)