llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Finish the prompt page logic.

Browse Source
This commit is contained in:
Yang Luo
2021-06-20 09:46:06 +08:00
parent e0b6270f50
commit d3a8ab8347
8 changed files with 175 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
controllers/account.go
View File

@ -153,7 +153,10 @@ func (c *ApiController) Signup() {
}
object.AddUser(user)
//c.SetSessionUser(user)
if application.HasPromptPage() {
// The prompt page needs the user to be signed in
c.SetSessionUser(user.GetId())
}
object.DisableVerificationCode(form.Email)
object.DisableVerificationCode(checkPhone)

2
controllers/auth.go
View File

@ -309,7 +309,7 @@ func (c *ApiController) Login() {
oldUser = object.GetUserByField(application.Organization, provider.Type, userInfo.Username)
}
if oldUser != nil {
resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s (%s) is already linked to another account", provider.Type, userInfo.Username, userInfo.DisplayName)}
resp = &Response{Status: "error", Msg: fmt.Sprintf("The account for provider: %s and username: %s (%s) is already linked to another account: %s (%s)", provider.Type, userInfo.Username, userInfo.DisplayName, oldUser.Name, oldUser.DisplayName)}
c.Data["json"] = resp
c.ServeJSON()
return