extended the Menu so it can use the Account information.
Dieser Commit ist enthalten in:
Ursprung
fc435441ce
Commit
d827664a69
|
@ -6,6 +6,26 @@ import (
|
||||||
"go.sebtobie.de/httpserver/auth"
|
"go.sebtobie.de/httpserver/auth"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
type Rauth int
|
||||||
|
|
||||||
|
//
|
||||||
|
const (
|
||||||
|
ReqAuthAbsent Rauth = -1
|
||||||
|
ReqAuthUnspec Rauth = 0
|
||||||
|
ReqAuthRequired Rauth = 1
|
||||||
|
)
|
||||||
|
|
||||||
|
var rauthmap = map[Rauth]string{
|
||||||
|
ReqAuthAbsent: "Authentication Absent",
|
||||||
|
ReqAuthRequired: "Authntication Required",
|
||||||
|
ReqAuthUnspec: "Authentication irrelevant",
|
||||||
|
}
|
||||||
|
|
||||||
|
// String is to Statisfy th Stringer interface
|
||||||
|
func (r *Rauth) String() string {
|
||||||
|
return rauthmap[*r]
|
||||||
|
}
|
||||||
|
|
||||||
// Menu is an Interface to give the server infos about menuitems
|
// Menu is an Interface to give the server infos about menuitems
|
||||||
type Menu interface {
|
type Menu interface {
|
||||||
Name() string
|
Name() string
|
||||||
|
@ -27,6 +47,7 @@ type MenuItem struct {
|
||||||
ItemAltText string
|
ItemAltText string
|
||||||
ItemURL *url.URL
|
ItemURL *url.URL
|
||||||
ItemChildren []Menu
|
ItemChildren []Menu
|
||||||
|
RequireAuth Rauth
|
||||||
}
|
}
|
||||||
|
|
||||||
// Name returns the name of the Item.
|
// Name returns the name of the Item.
|
||||||
|
@ -54,8 +75,16 @@ func (m *MenuItem) Children() []Menu {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enabled returns always true
|
// Enabled returns always true
|
||||||
func (*MenuItem) Enabled(auth.Account) bool {
|
func (m *MenuItem) Enabled(a auth.Account) bool {
|
||||||
|
switch m.RequireAuth {
|
||||||
|
case ReqAuthAbsent:
|
||||||
|
return true && a.Anonymous()
|
||||||
|
case ReqAuthUnspec:
|
||||||
return true
|
return true
|
||||||
|
case ReqAuthRequired:
|
||||||
|
return true && !a.Anonymous()
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ Menu = &MenuItem{}
|
var _ Menu = &MenuItem{}
|
||||||
|
|
|
@ -0,0 +1,89 @@
|
||||||
|
package menus_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
|
"go.sebtobie.de/httpserver/menus"
|
||||||
|
)
|
||||||
|
|
||||||
|
type account struct {
|
||||||
|
auth bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a *account) Anonymous() bool {
|
||||||
|
return !a.auth
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*account) Get(string) interface{} {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*account) List() []string {
|
||||||
|
return []string{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (*account) Redirect(*gin.Context) {
|
||||||
|
}
|
||||||
|
|
||||||
|
type Case struct {
|
||||||
|
menu menus.MenuItem
|
||||||
|
authenticated bool
|
||||||
|
seen bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Case) String() string {
|
||||||
|
return fmt.Sprintf("%v ,authenticated: %t,seen: %t", c.menu.RequireAuth.String(), c.authenticated, c.seen)
|
||||||
|
}
|
||||||
|
|
||||||
|
func gencases(t *testing.T) []Case {
|
||||||
|
cases := make([]Case, 0, 6)
|
||||||
|
for _, authenticated := range []bool{true, false} {
|
||||||
|
for _, require := range []menus.Rauth{menus.ReqAuthAbsent, menus.ReqAuthRequired, menus.ReqAuthUnspec} {
|
||||||
|
switch require {
|
||||||
|
case menus.ReqAuthAbsent:
|
||||||
|
c := Case{
|
||||||
|
menu: menus.MenuItem{
|
||||||
|
RequireAuth: require,
|
||||||
|
},
|
||||||
|
authenticated: authenticated,
|
||||||
|
seen: true && !authenticated,
|
||||||
|
}
|
||||||
|
cases = append(cases, c)
|
||||||
|
t.Logf("Absent Case, athenticated: %t, seen: %t", authenticated, c.seen)
|
||||||
|
case menus.ReqAuthRequired:
|
||||||
|
c := Case{
|
||||||
|
menu: menus.MenuItem{
|
||||||
|
RequireAuth: require,
|
||||||
|
},
|
||||||
|
authenticated: authenticated,
|
||||||
|
seen: true && authenticated,
|
||||||
|
}
|
||||||
|
cases = append(cases, c)
|
||||||
|
t.Logf("Required Case, athenticated: %t, seen: %t", authenticated, c.seen)
|
||||||
|
case menus.ReqAuthUnspec:
|
||||||
|
c := Case{
|
||||||
|
menu: menus.MenuItem{
|
||||||
|
RequireAuth: require,
|
||||||
|
},
|
||||||
|
authenticated: authenticated,
|
||||||
|
seen: true,
|
||||||
|
}
|
||||||
|
cases = append(cases, c)
|
||||||
|
t.Logf("Uspec Case, athenticated: %t, seen: %t", authenticated, c.seen)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
t.Log(cap(cases), len(cases))
|
||||||
|
return cases
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestMenuAuth(t *testing.T) {
|
||||||
|
cases := gencases(t)
|
||||||
|
for _, input := range cases {
|
||||||
|
if s := input.menu.Enabled(&account{input.authenticated}); s != input.seen {
|
||||||
|
t.Errorf("Test failed. %s, is seen: %t", input.String(), s)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Laden…
In neuem Issue referenzieren