Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion internal/api/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,9 @@ func (ts *AdminTestSuite) TestAdminUserDelete() {
require.NoError(ts.T(), json.NewEncoder(&buffer).Encode(c.body))
u, err := signupParams.ToUserModel(false /* <- isSSOUser */)
require.NoError(ts.T(), err)
u, err = ts.API.signupNewUser(ts.API.db, u)
signupReq, err := http.NewRequest("GET", "/", nil)
require.NoError(ts.T(), err)
u, err = ts.API.signupNewUser(signupReq, ts.API.db, u)
require.NoError(ts.T(), err)

// Setup request
Expand Down
2 changes: 1 addition & 1 deletion internal/api/anonymous.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (a *API) SignupAnonymously(w http.ResponseWriter, r *http.Request) error {
var token *AccessTokenResponse
err = db.Transaction(func(tx *storage.Connection) error {
var terr error
newUser, terr = a.signupNewUser(tx, newUser)
newUser, terr = a.signupNewUser(r, tx, newUser)
if terr != nil {
return terr
}
Expand Down
2 changes: 1 addition & 1 deletion internal/api/external.go
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ func (a *API) createAccountFromExternalIdentity(tx *storage.Connection, r *http.
return nil, terr
}

if user, terr = a.signupNewUser(tx, user); terr != nil {
if user, terr = a.signupNewUser(r, tx, user); terr != nil {
return nil, terr
}

Expand Down
23 changes: 23 additions & 0 deletions internal/api/hooks.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package api

import (
"net/http"

"github.com/supabase/auth/internal/hooks/v0hooks"
"github.com/supabase/auth/internal/models"
"github.com/supabase/auth/internal/storage"
)

func (a *API) triggerBeforeUserCreated(
r *http.Request,
conn *storage.Connection,
user *models.User,
) error {
if !a.hooksMgr.Enabled(v0hooks.BeforeUserCreated) {
return nil
}

req := v0hooks.NewBeforeUserCreatedInput(r, user)
res := new(v0hooks.BeforeUserCreatedOutput)
return a.hooksMgr.InvokeHook(conn, r, req, res)
}
2 changes: 1 addition & 1 deletion internal/api/invite.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (a *API) Invite(w http.ResponseWriter, r *http.Request) error {
return err
}

user, err = a.signupNewUser(tx, user)
user, err = a.signupNewUser(r, tx, user)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ func (a *API) adminGenerateLink(w http.ResponseWriter, r *http.Request) error {
return terr
}

user, terr = a.signupNewUser(tx, user)
user, terr = a.signupNewUser(r, tx, user)
if terr != nil {
return terr
}
Expand Down Expand Up @@ -198,7 +198,7 @@ func (a *API) adminGenerateLink(w http.ResponseWriter, r *http.Request) error {
// password here to generate a new user, use
// signupUser which is a model generated from
// SignupParams above
user, terr = a.signupNewUser(tx, signupUser)
user, terr = a.signupNewUser(r, tx, signupUser)
if terr != nil {
return terr
}
Expand Down
11 changes: 9 additions & 2 deletions internal/api/signup.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func (a *API) Signup(w http.ResponseWriter, r *http.Request) error {
}
// do not update the user because we can't be sure of their claimed identity
} else {
user, terr = a.signupNewUser(tx, signupUser)
user, terr = a.signupNewUser(r, tx, signupUser)
if terr != nil {
return terr
}
Expand Down Expand Up @@ -363,9 +363,16 @@ func sanitizeUser(u *models.User, params *SignupParams) (*models.User, error) {
return u, nil
}

func (a *API) signupNewUser(conn *storage.Connection, user *models.User) (*models.User, error) {
func (a *API) signupNewUser(
r *http.Request,
conn *storage.Connection,
user *models.User,
) (*models.User, error) {
config := a.config

if err := a.triggerBeforeUserCreated(r, conn, user); err != nil {
return nil, err
}
err := conn.Transaction(func(tx *storage.Connection) error {
var terr error
if terr = tx.Create(user); terr != nil {
Expand Down
Loading