phc/website
6
4
Fork 1
Code Issues 9 Pull Requests Projects 1 Releases Wiki Activity

feat: update users via Ldap

Browse Source
This commit is contained in:
BachoSeven
2022-08-28 12:23:24 +02:00
parent 4be4a68912
commit 85a0a21d15
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/phc-website-server/main.go
+4 -4
View File
@@ -3,7 +3,6 @@ package main
import ( import (
"log" "log"
"git.phc.dm.unipi.it/phc/website"
"git.phc.dm.unipi.it/phc/website/articles" "git.phc.dm.unipi.it/phc/website/articles"
"git.phc.dm.unipi.it/phc/website/auth" "git.phc.dm.unipi.it/phc/website/auth"
"git.phc.dm.unipi.it/phc/website/config" "git.phc.dm.unipi.it/phc/website/config"
@@ -25,9 +24,10 @@ func main() {
), ),
NewsArticlesRegistry: articles.NewRegistry("./_content/news"), NewsArticlesRegistry: articles.NewRegistry("./_content/news"),
GuideArticlesRegistry: articles.NewRegistry("./_content/guide"), GuideArticlesRegistry: articles.NewRegistry("./_content/guide"),
ListaUtenti: &website.JsonFileListaUtenti{ // ListaUtenti: &website.JsonFileListaUtenti{
Path: "./utenti-poisson-2022.local.json", // Path: "./utenti-poisson-2022.local.json",
}, // },
ListaUtentiService: auth.NewLDAPAuthService(config.AuthServiceHost),
Storia: &storia.JsonFileStoria{ Storia: &storia.JsonFileStoria{
Path: "./storia.json", Path: "./storia.json",
}, },
handler/handler.go
+4 -5
View File
@@ -5,7 +5,6 @@ import (
"html/template" "html/template"
"io" "io"
"git.phc.dm.unipi.it/phc/website"
"git.phc.dm.unipi.it/phc/website/articles" "git.phc.dm.unipi.it/phc/website/articles"
"git.phc.dm.unipi.it/phc/website/auth" "git.phc.dm.unipi.it/phc/website/auth"
"git.phc.dm.unipi.it/phc/website/model" "git.phc.dm.unipi.it/phc/website/model"
@@ -18,7 +17,7 @@ import (
type Service interface { type Service interface {
HandleStaticPage(w io.Writer, view string, ctx Context) error HandleStaticPage(w io.Writer, view string, ctx Context) error
HandleUtenti() ([]*model.User, error) HandleUtenti() ([]*model.User, error)
HandleListaUtenti() ([]website.UserInfo, error) HandleListaUtenti() ([]*model.User, error)
HandleStoriaPage(w io.Writer, ctx Context) error HandleStoriaPage(w io.Writer, ctx Context) error
HandleQueryAppunti(w io.Writer, query string, ctx Context) error HandleQueryAppunti(w io.Writer, query string, ctx Context) error
HandleAppuntiCondivisiPage(w io.Writer, ctx Context) error HandleAppuntiCondivisiPage(w io.Writer, ctx Context) error
@@ -51,7 +50,7 @@ type DefaultHandler struct {
Renderer *templates.TemplateRenderer Renderer *templates.TemplateRenderer
NewsArticlesRegistry *articles.Registry NewsArticlesRegistry *articles.Registry
GuideArticlesRegistry *articles.Registry GuideArticlesRegistry *articles.Registry
ListaUtenti website.ListaUtentiService ListaUtentiService auth.Service
Storia storia.StoriaService Storia storia.StoriaService
} }
@@ -70,8 +69,8 @@ func (h *DefaultHandler) HandleUtenti() ([]*model.User, error) {
return utenti, nil return utenti, nil
} }
func (h *DefaultHandler) HandleListaUtenti() ([]website.UserInfo, error) { func (h *DefaultHandler) HandleListaUtenti() ([]*model.User, error) {
utenti, err := h.ListaUtenti.GetUtenti() utenti, err := h.ListaUtentiService.GetUsers()
if err != nil { if err != nil {
return nil, err return nil, err
} }