Skip to content

Commit fa6ba51

Browse files
aarondlaarondl
committed
More gigantic edits.
- Change response to be more central to Authboss. Make sure it has useful methods and works with the new rendering idioms. - Change the load user methods to all work with context keys, and even be able to set context keys on the current request to avoid setting contexts everywhere in the code base.
1 parent f65d9f6 commit fa6ba51

25 files changed

Lines changed: 891 additions & 1218 deletions

‎authboss.go‎

Lines changed: 27 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ type Authboss struct {
2020

2121
loadedModules map[string]Modularizer
2222
mux *http.ServeMux
23+
24+
templateNames []string
25+
renderer Renderer
2326
}
2427

2528
// New makes a new instance of authboss with a default
@@ -47,66 +50,13 @@ func (a *Authboss) Init(modulesToLoad ...string) error {
4750
}
4851
}
4952

50-
return nil
51-
}
52-
53-
// CurrentUser retrieves the current user from the session and the database.
54-
func (a *Authboss) CurrentUser(w http.ResponseWriter, r *http.Request) (interface{}, error) {
55-
return nil, errors.New("TODO")
56-
}
57-
58-
func (a *Authboss) currentUser(w http.ResponseWriter, r *http.Request) (interface{}, error) {
59-
/*
60-
_, err := a.Callbacks.FireBefore(EventGetUserSession, ctx)
61-
if err != nil {
62-
return nil, err
63-
}
64-
65-
key, ok := ctx.SessionStorer.Get(SessionKey)
66-
if !ok {
67-
return nil, nil
68-
}
69-
70-
_, err = a.Callbacks.FireBefore(EventGetUser, ctx)
71-
if err != nil {
72-
return nil, err
73-
}
74-
75-
var user interface{}
76-
77-
if index := strings.IndexByte(key, ';'); index > 0 {
78-
user, err = a.OAuth2Storer.GetOAuth(key[:index], key[index+1:])
79-
} else {
80-
user, err = a.Storer.Get(key)
81-
}
82-
83-
if err != nil {
84-
return nil, err
85-
}
86-
87-
ctx.User = Unbind(user)
88-
89-
err = a.Callbacks.FireAfter(EventGetUser, ctx)
90-
if err != nil {
91-
return nil, err
92-
}
93-
94-
return user, err
95-
*/
96-
return nil, errors.New("not implemented")
97-
}
53+
renderer, err := a.ViewLoader.Init(a.templateNames)
54+
if err != nil {
55+
return errors.Wrap(err, "failed to init view loader")
56+
}
57+
a.renderer = renderer
9858

99-
// CurrentUserP retrieves the current user but panics if it's not available for
100-
// any reason.
101-
func (a *Authboss) CurrentUserP(w http.ResponseWriter, r *http.Request) interface{} {
102-
/*
103-
i, err := a.CurrentUser(w, r)
104-
if err != nil {
105-
panic(err.Error())
106-
}
107-
return i
108-
*/
109-
panic("TODO")
59+
return nil
11060
}
11161

11262
/*
@@ -130,43 +80,28 @@ The error returned is returned either from the updater if that produced an error
13080
or from the cleanup routines.
13181
*/
13282
func (a *Authboss) UpdatePassword(w http.ResponseWriter, r *http.Request,
133-
ptPassword string, user interface{}, updater func() error) error {
134-
135-
/*
136-
updatePwd := len(ptPassword) > 0
137-
138-
if updatePwd {
139-
pass, err := bcrypt.GenerateFromPassword([]byte(ptPassword), a.BCryptCost)
140-
if err != nil {
141-
return err
142-
}
143-
144-
val := reflect.ValueOf(user).Elem()
145-
field := val.FieldByName("Password")
146-
if !field.CanSet() {
147-
return errors.New("authboss: updatePassword called without a modifyable user struct")
148-
}
149-
fieldPtr := field.Addr()
150-
151-
if scanner, ok := fieldPtr.Interface().(sql.Scanner); ok {
152-
if err := scanner.Scan(string(pass)); err != nil {
153-
return err
154-
}
155-
} else {
156-
field.SetString(string(pass))
157-
}
158-
}
83+
ptPassword string, user Storer, updater func() error) error {
84+
85+
/*updatePwd := len(ptPassword) > 0
15986
160-
if err := updater(); err != nil {
87+
if updatePwd {
88+
pass, err := bcrypt.GenerateFromPassword([]byte(ptPassword), a.BCryptCost)
89+
if err != nil {
16190
return err
16291
}
16392
164-
if !updatePwd {
165-
return nil
166-
}
93+
user.PutPassword(r.Context(),
94+
}
95+
96+
if err := updater(); err != nil {
97+
return err
98+
}
16799
168-
return a.Callbacks.FireAfter(EventPasswordReset, a.InitContext(w, r))
169-
*/
100+
if !updatePwd {
101+
return nil
102+
}
170103
171-
return errors.New("TODO")
104+
return a.Callbacks.FireAfter(EventPasswordReset, r.Context())*/
105+
// TODO(aarondl): Fix
106+
return errors.New("not implemented")
172107
}

‎authboss_test.go‎

Lines changed: 89 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package authboss
22

33
import (
44
"context"
5-
"database/sql"
65
"io/ioutil"
76
"net/http"
87
"net/http/httptest"
@@ -16,6 +15,7 @@ func TestAuthBossInit(t *testing.T) {
1615

1716
ab := New()
1817
ab.LogWriter = ioutil.Discard
18+
ab.ViewLoader = mockRenderLoader{}
1919
err := ab.Init()
2020
if err != nil {
2121
t.Error("Unexpected error:", err)
@@ -28,12 +28,9 @@ func TestAuthBossCurrentUser(t *testing.T) {
2828
ab := New()
2929
ab.LogWriter = ioutil.Discard
3030
ab.StoreLoader = mockStoreLoader{"joe": mockUser{Email: "john@john.com", Password: "lies"}}
31-
ab.SessionStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
32-
return mockClientStore{SessionKey: "joe"}
33-
}
34-
ab.CookieStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
35-
return mockClientStore{}
36-
}
31+
ab.ViewLoader = mockRenderLoader{}
32+
ab.SessionStoreMaker = newMockClientStoreMaker(mockClientStore{SessionKey: "joe"})
33+
ab.CookieStoreMaker = newMockClientStoreMaker(mockClientStore{})
3734

3835
if err := ab.Init(); err != nil {
3936
t.Error("Unexpected error:", err)
@@ -43,7 +40,7 @@ func TestAuthBossCurrentUser(t *testing.T) {
4340
req, _ := http.NewRequest("GET", "localhost", nil)
4441

4542
userStruct := ab.CurrentUserP(rec, req)
46-
us := userStruct.(*mockUser)
43+
us := userStruct.(mockStoredUser)
4744

4845
if us.Email != "john@john.com" || us.Password != "lies" {
4946
t.Error("Wrong user found!")
@@ -56,12 +53,9 @@ func TestAuthBossCurrentUserCallbacks(t *testing.T) {
5653
ab := New()
5754
ab.LogWriter = ioutil.Discard
5855
ab.StoreLoader = mockStoreLoader{"joe": mockUser{Email: "john@john.com", Password: "lies"}}
59-
ab.SessionStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
60-
return mockClientStore{SessionKey: "joe"}
61-
}
62-
ab.CookieStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
63-
return mockClientStore{}
64-
}
56+
ab.ViewLoader = mockRenderLoader{}
57+
ab.SessionStoreMaker = newMockClientStoreMaker(mockClientStore{SessionKey: "joe"})
58+
ab.CookieStoreMaker = newMockClientStoreMaker(mockClientStore{})
6559

6660
if err := ab.Init(); err != nil {
6761
t.Error("Unexpected error:", err)
@@ -97,86 +91,88 @@ func TestAuthBossCurrentUserCallbacks(t *testing.T) {
9791
}
9892

9993
func TestAuthbossUpdatePassword(t *testing.T) {
100-
t.Parallel()
101-
102-
ab := New()
103-
session := mockClientStore{}
104-
cookies := mockClientStore{}
105-
ab.SessionStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
106-
return session
107-
}
108-
ab.CookieStoreMaker = func(_ http.ResponseWriter, _ *http.Request) ClientStorer {
109-
return cookies
110-
}
111-
112-
called := false
113-
ab.Callbacks.After(EventPasswordReset, func(ctx context.Context) error {
114-
called = true
115-
return nil
116-
})
117-
118-
user1 := struct {
119-
Password string
120-
}{}
121-
user2 := struct {
122-
Password sql.NullString
123-
}{}
124-
125-
r, _ := http.NewRequest("GET", "http://localhost", nil)
126-
127-
called = false
128-
err := ab.UpdatePassword(nil, r, "newpassword", &user1, func() error { return nil })
129-
if err != nil {
130-
t.Error(err)
131-
}
132-
133-
if len(user1.Password) == 0 {
134-
t.Error("Password not updated")
135-
}
136-
if !called {
137-
t.Error("Callbacks should have been called.")
138-
}
139-
140-
called = false
141-
err = ab.UpdatePassword(nil, r, "newpassword", &user2, func() error { return nil })
142-
if err != nil {
143-
t.Error(err)
144-
}
145-
146-
if !user2.Password.Valid || len(user2.Password.String) == 0 {
147-
t.Error("Password not updated")
148-
}
149-
if !called {
150-
t.Error("Callbacks should have been called.")
151-
}
152-
153-
called = false
154-
oldPassword := user1.Password
155-
err = ab.UpdatePassword(nil, r, "", &user1, func() error { return nil })
156-
if err != nil {
157-
t.Error(err)
158-
}
159-
160-
if user1.Password != oldPassword {
161-
t.Error("Password not updated")
162-
}
163-
if called {
164-
t.Error("Callbacks should not have been called")
165-
}
94+
t.Skip("TODO(aarondl): Implement")
95+
/*
96+
t.Parallel()
97+
98+
ab := New()
99+
session := mockClientStore{}
100+
cookies := mockClientStore{}
101+
ab.SessionStoreMaker = newMockClientStoreMaker(session)
102+
ab.CookieStoreMaker = newMockClientStoreMaker(cookies)
103+
104+
called := false
105+
ab.Callbacks.After(EventPasswordReset, func(ctx context.Context) error {
106+
called = true
107+
return nil
108+
})
109+
110+
user1 := struct {
111+
Password string
112+
}{}
113+
user2 := struct {
114+
Password sql.NullString
115+
}{}
116+
117+
r, _ := http.NewRequest("GET", "http://localhost", nil)
118+
119+
called = false
120+
err := ab.UpdatePassword(nil, r, "newpassword", &user1, func() error { return nil })
121+
if err != nil {
122+
t.Error(err)
123+
}
124+
125+
if len(user1.Password) == 0 {
126+
t.Error("Password not updated")
127+
}
128+
if !called {
129+
t.Error("Callbacks should have been called.")
130+
}
131+
132+
called = false
133+
err = ab.UpdatePassword(nil, r, "newpassword", &user2, func() error { return nil })
134+
if err != nil {
135+
t.Error(err)
136+
}
137+
138+
if !user2.Password.Valid || len(user2.Password.String) == 0 {
139+
t.Error("Password not updated")
140+
}
141+
if !called {
142+
t.Error("Callbacks should have been called.")
143+
}
144+
145+
called = false
146+
oldPassword := user1.Password
147+
err = ab.UpdatePassword(nil, r, "", &user1, func() error { return nil })
148+
if err != nil {
149+
t.Error(err)
150+
}
151+
152+
if user1.Password != oldPassword {
153+
t.Error("Password not updated")
154+
}
155+
if called {
156+
t.Error("Callbacks should not have been called")
157+
}
158+
*/
166159
}
167160

168161
func TestAuthbossUpdatePasswordFail(t *testing.T) {
169-
t.Parallel()
170-
171-
ab := New()
172-
173-
user1 := struct {
174-
Password string
175-
}{}
176-
177-
anErr := errors.New("anError")
178-
err := ab.UpdatePassword(nil, nil, "update", &user1, func() error { return anErr })
179-
if err != anErr {
180-
t.Error("Expected an specific error:", err)
181-
}
162+
t.Skip("TODO(aarondl): Implement")
163+
/*
164+
t.Parallel()
165+
166+
ab := New()
167+
168+
user1 := struct {
169+
Password string
170+
}{}
171+
172+
anErr := errors.New("anError")
173+
err := ab.UpdatePassword(nil, nil, "update", &user1, func() error { return anErr })
174+
if err != anErr {
175+
t.Error("Expected an specific error:", err)
176+
}
177+
*/
182178
}

0 commit comments

Comments
 (0)