user

pkg/auth/provider/hass/provider.go

@@ -127,4 +127,3 @@ func (hap *HomeAssistantProvider) FlowSchema() []provider.FlowSchemaItem {
 func init() {
 	provider.Register(HomeAssistant, NewHAProvider)
 }
-

pkg/auth/provider/provider.go

@@ -49,5 +49,3 @@ type FlowSchemaItem struct {
 	Name     string `json:"name"`
 	Required bool   `json:"required"`
 }
-
-

pkg/auth/provider/trustednets/trustednets.go

@@ -73,4 +73,3 @@ func (hap *TrustedNetworksProvider) FlowSchema() []provider.FlowSchemaItem {
 func init() {
 	provider.Register(TrustedNetworks, New)
 }
-

pkg/auth/session.go

@@ -103,11 +103,12 @@ const defaultExpiration = 2 * time.Hour
 
 func (a *Authenticator) NewToken(r *http.Request, user provider.ProviderUser, f *Flow) TokenID {
 	id := TokenID(genUUID())
+	now := time.Now()
 
 	t := &Token{
 		ID:      id,
-		Ctime:   time.Now(),
-		Expires: time.Now().Add(defaultExpiration),
+		Ctime:   now,
+		Expires: now.Add(defaultExpiration),
 		Addr:    r.RemoteAddr,
 
 		user: user,

pkg/auth/store.go

@@ -1,8 +1,8 @@
 package auth
 
 import (
-	"fmt"
 	"encoding/json"
+	"fmt"
 
 	"dynatron.me/x/blasphem/pkg/storage"
 )
@@ -11,13 +11,13 @@ const (
 	AuthStoreKey = "auth"
 )
 
-
 type AuthStore interface {
+	User(UserID) *User
 }
 
 type authStore struct {
 	Users       []User       `json:"users"`
-	Groups interface {} `json:"groups"`
+	Groups      interface{}  `json:"groups"`
 	Credentials []Credential `json:"credentials"`
 
 	userMap map[UserID]*User
@@ -49,3 +49,7 @@ func (a *Authenticator) newAuthStore(s storage.Store) (as *authStore, err error)
 
 	return
 }
+
+func (s *authStore) User(uid UserID) *User {
+	return s.userMap[uid]
+}

pkg/auth/user.go

@@ -35,8 +35,10 @@ func (u *User) allowedToAuth() error {
 
 func (a *Authenticator) getOrCreateUser(c *Credential) (*User, error) {
 	log.Debug().Interface("userdata", c.user.ProviderUserData()).Msg("getOrCreateUser")
-	panic("not implemented")
-	return &User{}, nil
+	u := a.store.User(c.UserID)
+	if u == nil {
+		return nil, errors.New("no such user)
+	}
+
+	return u, nil
 }
-
-