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

Implémenter NewApiClientFromViper()

Browse source 
Remplacer api.New() par api.NewApiClientFromViper() à certains endroits
de serverCmd

Remplacer hard-coded api protocol et host par viper où api.New() est
encore utilisé
This commit is contained in:
Victor Lacasse-Beaudoin 2023-07-14 20:14:15 -04:00
parent 04de5cdad2
commit d6a16a7222
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
api/api.go
View file

@ -9,6 +9,9 @@ import (
"io/ioutil" "io/ioutil"
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"git.agecem.com/agecem/agecem-org/config"
"github.com/spf13/viper"
) )
type API struct { type API struct {
@ -37,6 +40,24 @@ type UploadDocumentResponseInfo struct {
Size float64 `json:"size"` Size float64 `json:"size"`
} }
func NewApiClientFromViper() (*API, error) {
var config config.Config
if err := viper.Unmarshal(&config); err != nil {
return nil, err
}
api, err := New(config.Server.Api.Protocol, config.Server.Api.Host, config.Server.Api.Port, APIOptions{
KeyAuth: config.Server.Api.Auth,
Key: config.Server.Api.Key,
})
if err != nil {
return api, err
}
return api, nil
}
func New(protocol, host string, port int, opts APIOptions) (*API, error) { func New(protocol, host string, port int, opts APIOptions) (*API, error) {
api := API{ api := API{
Protocol: protocol, Protocol: protocol,

12
cmd/server.go
View file

@ -617,10 +617,7 @@ func handleVieEtudianteOrganisme(c echo.Context) error {
} }
func handleDocumentation(c echo.Context) error { func handleDocumentation(c echo.Context) error {
client, err := api.New("http", "localhost", cfg.Server.Port, api.APIOptions{ client, err := api.NewApiClientFromViper()
KeyAuth: cfg.Server.Api.Auth,
Key: cfg.Server.Api.Key,
})
if err != nil { if err != nil {
return c.Render(http.StatusInternalServerError, "documentation-html", nil) return c.Render(http.StatusInternalServerError, "documentation-html", nil)
} }
@ -689,10 +686,7 @@ func handleFormulaires(c echo.Context) error {
} }
func handlePublicDocumentation(c echo.Context) error { func handlePublicDocumentation(c echo.Context) error {
client, err := api.New("http", "localhost", cfg.Server.Port, api.APIOptions{ client, err := api.NewApiClientFromViper()
KeyAuth: cfg.Server.Api.Auth,
Key: cfg.Server.Api.Key,
})
if err != nil { if err != nil {
return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"}) return c.JSON(http.StatusNotFound, map[string]string{"message": "Not Found"})
} }
@ -725,7 +719,7 @@ func handleAdminDocumentsUpload(c echo.Context) error {
} }
func handleAdminDocumentsUploadPOST(c echo.Context) error { func handleAdminDocumentsUploadPOST(c echo.Context) error {
client, err := api.New("http", "localhost", cfg.Server.Port, api.APIOptions{ client, err := api.New(cfg.Server.Api.Protocol, cfg.Server.Api.Host, cfg.Server.Port, api.APIOptions{
KeyAuth: cfg.Server.Api.Auth, KeyAuth: cfg.Server.Api.Auth,
Key: cfg.Server.Api.Key, Key: cfg.Server.Api.Key,
BasicAuth: cfg.Server.Admin.Auth, BasicAuth: cfg.Server.Admin.Auth,