Merge pull request #1211 from trheyi/main
Enhance user registration status handling during third-party login
This commit is contained in:
commit
f91f1cb32e
1 changed files with 7 additions and 1 deletions
|
|
@ -79,6 +79,12 @@ func LoginThirdParty(providerID string, userinfo *oauthtypes.OIDCUserInfo, login
|
||||||
userID, err = userProvider.GetOAuthUserID(ctx, providerID, userinfo.Sub)
|
userID, err = userProvider.GetOAuthUserID(ctx, providerID, userinfo.Sub)
|
||||||
if err != nil && err.Error() == user.ErrOAuthAccountNotFound {
|
if err != nil && err.Error() == user.ErrOAuthAccountNotFound {
|
||||||
|
|
||||||
|
// Determine initial status based on invite requirement
|
||||||
|
status := "active"
|
||||||
|
if entryConfig.InviteRequired {
|
||||||
|
status = "pending_invite" // Waiting for invite code verification
|
||||||
|
}
|
||||||
|
|
||||||
userData := map[string]interface{}{
|
userData := map[string]interface{}{
|
||||||
"name": userinfo.Name,
|
"name": userinfo.Name,
|
||||||
"given_name": userinfo.GivenName,
|
"given_name": userinfo.GivenName,
|
||||||
|
|
@ -86,7 +92,7 @@ func LoginThirdParty(providerID string, userinfo *oauthtypes.OIDCUserInfo, login
|
||||||
"picture": userinfo.Picture,
|
"picture": userinfo.Picture,
|
||||||
"role_id": entryConfig.Role,
|
"role_id": entryConfig.Role,
|
||||||
"type_id": entryConfig.Type,
|
"type_id": entryConfig.Type,
|
||||||
"status": "active",
|
"status": status,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auto register user
|
// Auto register user
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue