makary/writefreely
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updating oauth user lookup call as per PR feedback. T710

Browse source
This commit is contained in:
Nick Gerakines 2020-01-03 11:31:38 -05:00
parent 6d8da2bffd
commit 0b229a5ede
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oauth.go
View file

@ -63,7 +63,7 @@ type OAuthDatastore interface {
GenerateOAuthState(context.Context, string, string) (string, error) GenerateOAuthState(context.Context, string, string) (string, error)
CreateUser(*config.Config, *User, string) error CreateUser(*config.Config, *User, string) error
GetUserForAuthByID(int64) (*User, error) GetUserByID(int64) (*User, error)
} }
type HttpClient interface { type HttpClient interface {
@ -209,7 +209,7 @@ func (h oauthHandler) viewOauthCallback(app *App, w http.ResponseWriter, r *http
return nil return nil
} }
user, err := h.DB.GetUserForAuthByID(localUserID) user, err := h.DB.GetUserByID(localUserID)
if err != nil { if err != nil {
return impart.HTTPError{http.StatusInternalServerError, err.Error()} return impart.HTTPError{http.StatusInternalServerError, err.Error()}
} }

26
oauth_test.go
View file

@ -27,7 +27,7 @@ type MockOAuthDatastore struct {
DoGetIDForRemoteUser func(context.Context, string, string, string) (int64, error) DoGetIDForRemoteUser func(context.Context, string, string, string) (int64, error)
DoCreateUser func(*config.Config, *User, string) error DoCreateUser func(*config.Config, *User, string) error
DoRecordRemoteUserID func(context.Context, int64, string, string, string, string) error DoRecordRemoteUserID func(context.Context, int64, string, string, string, string) error
DoGetUserForAuthByID func(int64) (*User, error) DoGetUserByID func(int64) (*User, error)
} }
var _ OAuthDatastore = &MockOAuthDatastore{} var _ OAuthDatastore = &MockOAuthDatastore{}
@ -115,9 +115,9 @@ func (m *MockOAuthDatastore) RecordRemoteUserID(ctx context.Context, localUserID
return nil return nil
} }
func (m *MockOAuthDatastore) GetUserForAuthByID(userID int64) (*User, error) { func (m *MockOAuthDatastore) GetUserByID(userID int64) (*User, error) {
if m.DoGetUserForAuthByID != nil { if m.DoGetUserByID != nil {
return m.DoGetUserForAuthByID(userID) return m.DoGetUserByID(userID)
} }
user := &User{ user := &User{
@ -137,9 +137,9 @@ func TestViewOauthInit(t *testing.T) {
t.Run("success", func(t *testing.T) { t.Run("success", func(t *testing.T) {
app := &MockOAuthDatastoreProvider{} app := &MockOAuthDatastoreProvider{}
h := oauthHandler{ h := oauthHandler{
Config: app.Config(), Config: app.Config(),
DB: app.DB(), DB: app.DB(),
Store: app.SessionStore(), Store: app.SessionStore(),
EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd}, EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd},
oauthClient: writeAsOauthClient{ oauthClient: writeAsOauthClient{
ClientID: app.Config().WriteAsOauth.ClientID, ClientID: app.Config().WriteAsOauth.ClientID,
@ -180,9 +180,9 @@ func TestViewOauthInit(t *testing.T) {
}, },
} }
h := oauthHandler{ h := oauthHandler{
Config: app.Config(), Config: app.Config(),
DB: app.DB(), DB: app.DB(),
Store: app.SessionStore(), Store: app.SessionStore(),
EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd}, EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd},
oauthClient: writeAsOauthClient{ oauthClient: writeAsOauthClient{
ClientID: app.Config().WriteAsOauth.ClientID, ClientID: app.Config().WriteAsOauth.ClientID,
@ -210,9 +210,9 @@ func TestViewOauthCallback(t *testing.T) {
t.Run("success", func(t *testing.T) { t.Run("success", func(t *testing.T) {
app := &MockOAuthDatastoreProvider{} app := &MockOAuthDatastoreProvider{}
h := oauthHandler{ h := oauthHandler{
Config: app.Config(), Config: app.Config(),
DB: app.DB(), DB: app.DB(),
Store: app.SessionStore(), Store: app.SessionStore(),
EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd}, EmailKey: []byte{0xd, 0xe, 0xc, 0xa, 0xf, 0xf, 0xb, 0xa, 0xd},
oauthClient: writeAsOauthClient{ oauthClient: writeAsOauthClient{
ClientID: app.Config().WriteAsOauth.ClientID, ClientID: app.Config().WriteAsOauth.ClientID,