llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 18:54:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge two login functions.

Browse Source
This commit is contained in:
Yang Luo 2021-03-20 00:23:37 +08:00
parent d0e243fca3
commit 18c021b009
6 changed files with 121 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
controllers/account.go
View File

@ -17,12 +17,12 @@ package controllers
import (
"encoding/base64"
"encoding/json"
"fmt"
"strconv"
"strings"
"time"
"github.com/casdoor/casdoor/object"
"github.com/casdoor/casdoor/util"
"strings"
)
type RegisterForm struct {
@ -97,43 +97,6 @@ func (c *ApiController) Register() {
c.ServeJSON()
}
// @Title Login
// @Description login as a user
// @Param username formData string true "The username to login"
// @Param password formData string true "The password"
// @Success 200 {object} controllers.api_controller.Response The Response object
// @router /login [post]
func (c *ApiController) Login() {
var resp Response
if c.GetSessionUser() != "" {
resp = Response{Status: "error", Msg: "please log out first before signing in", Data: c.GetSessionUser()}
c.Data["json"] = resp
c.ServeJSON()
return
}
var form RegisterForm
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
if err != nil {
panic(err)
}
userId := fmt.Sprintf("%s/%s", form.Organization, form.Username)
password := form.Password
msg := object.CheckUserLogin(userId, password)
if msg != "" {
resp = Response{Status: "error", Msg: msg, Data: ""}
} else {
c.HandleLoggedIn(userId)
resp = Response{Status: "ok", Msg: "", Data: userId}
}
c.Data["json"] = resp
c.ServeJSON()
}
// @Title Logout
// @Description logout the current user
// @Success 200 {object} controllers.api_controller.Response The Response object

213
controllers/auth.go
View File

@ -31,115 +31,136 @@ func (c *ApiController) HandleLoggedIn(userId string) {
util.LogInfo(c.Ctx, "API: [%s] signed in", userId)
}
func (c *ApiController) AuthLogin() {
func (c *ApiController) Login() {
var resp Response
var form RegisterForm
err := json.Unmarshal(c.Ctx.Input.RequestBody, &form)
if err != nil {
panic(err)
}
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
provider := object.GetProvider(fmt.Sprintf("admin/%s", form.Provider))
idProvider := idp.GetIdProvider(provider.Type)
oauthConfig := idProvider.GetConfig()
oauthConfig.ClientID = provider.ClientId
oauthConfig.ClientSecret = provider.ClientSecret
oauthConfig.RedirectURL = form.RedirectUri
var resp Response
var res authResponse
if form.State != beego.AppConfig.String("AuthState") {
resp = Response{Status: "error", Msg: "unauthorized", Data: res}
c.ServeJSON()
return
}
// https://github.com/golang/oauth2/issues/123#issuecomment-103715338
ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, httpClient)
token, err := oauthConfig.Exchange(ctx, form.Code)
if err != nil {
panic(err)
}
if !token.Valid() {
resp = Response{Status: "error", Msg: "unauthorized", Data: res}
c.Data["json"] = resp
c.ServeJSON()
return
}
res.Email, res.Method, res.Avatar, err = idProvider.GetUserInfo(httpClient, token)
if err != nil {
resp = Response{Status: "error", Msg: "Login failed, please try again."}
c.Data["json"] = resp
c.ServeJSON()
return
}
if form.Method == "signup" {
userId := ""
if provider.Type == "github" {
userId = object.GetUserIdByField(application, "github", res.Method)
} else if provider.Type == "google" {
userId = object.GetUserIdByField(application, "google", res.Email)
}
if userId != "" {
//if object.IsForbidden(userId) {
// c.forbiddenAccountResp(userId)
// return
//}
//if len(object.GetMemberAvatar(userId)) == 0 {
// avatar := UploadAvatarToOSS(res.Avatar, userId)
// object.LinkMemberAccount(userId, "avatar", avatar)
//}
c.HandleLoggedIn(userId)
} else {
//if object.IsForbidden(userId) {
// c.forbiddenAccountResp(userId)
// return
//}
if userId := object.GetUserIdByField(application, "email", res.Email); userId != "" {
c.HandleLoggedIn(userId)
if provider.Type == "github" {
_ = object.LinkUserAccount(userId, "github", res.Method)
} else if provider.Type == "google" {
_ = object.LinkUserAccount(userId, "google", res.Email)
}
}
}
//res.Method = res.Email
resp = Response{Status: "ok", Msg: "success", Data: res}
} else {
userId := c.GetSessionUser()
if userId == "" {
resp = Response{Status: "error", Msg: "user doesn't exist", Data: res}
if form.Username != "" {
if c.GetSessionUser() != "" {
resp = Response{Status: "error", Msg: "please log out first before signing in", Data: c.GetSessionUser()}
c.Data["json"] = resp
c.ServeJSON()
return
}
var linkRes bool
if provider.Type == "github" {
_ = object.LinkUserAccount(userId, "github", res.Method)
} else if provider.Type == "google" {
_ = object.LinkUserAccount(userId, "google", res.Email)
}
if linkRes {
resp = Response{Status: "ok", Msg: "success", Data: linkRes}
userId := fmt.Sprintf("%s/%s", form.Organization, form.Username)
password := form.Password
msg := object.CheckUserLogin(userId, password)
if msg != "" {
resp = Response{Status: "error", Msg: msg, Data: ""}
} else {
resp = Response{Status: "error", Msg: "link account failed", Data: linkRes}
c.HandleLoggedIn(userId)
resp = Response{Status: "ok", Msg: "", Data: userId}
}
//if len(object.GetMemberAvatar(userId)) == 0 {
// avatar := UploadAvatarToOSS(tempUserAccount.AvatarUrl, userId)
// object.LinkUserAccount(userId, "avatar", avatar)
//}
} else if form.Provider != "" {
application := object.GetApplication(fmt.Sprintf("admin/%s", form.Application))
provider := object.GetProvider(fmt.Sprintf("admin/%s", form.Provider))
idProvider := idp.GetIdProvider(provider.Type)
oauthConfig := idProvider.GetConfig()
oauthConfig.ClientID = provider.ClientId
oauthConfig.ClientSecret = provider.ClientSecret
oauthConfig.RedirectURL = form.RedirectUri
var res authResponse
if form.State != beego.AppConfig.String("AuthState") {
resp = Response{Status: "error", Msg: "unauthorized", Data: res}
c.ServeJSON()
return
}
// https://github.com/golang/oauth2/issues/123#issuecomment-103715338
ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, httpClient)
token, err := oauthConfig.Exchange(ctx, form.Code)
if err != nil {
panic(err)
}
if !token.Valid() {
resp = Response{Status: "error", Msg: "unauthorized", Data: res}
c.Data["json"] = resp
c.ServeJSON()
return
}
res.Email, res.Method, res.Avatar, err = idProvider.GetUserInfo(httpClient, token)
if err != nil {
resp = Response{Status: "error", Msg: "Login failed, please try again."}
c.Data["json"] = resp
c.ServeJSON()
return
}
if form.Method == "signup" {
userId := ""
if provider.Type == "github" {
userId = object.GetUserIdByField(application, "github", res.Method)
} else if provider.Type == "google" {
userId = object.GetUserIdByField(application, "google", res.Email)
}
if userId != "" {
//if object.IsForbidden(userId) {
// c.forbiddenAccountResp(userId)
// return
//}
//if len(object.GetMemberAvatar(userId)) == 0 {
// avatar := UploadAvatarToOSS(res.Avatar, userId)
// object.LinkMemberAccount(userId, "avatar", avatar)
//}
c.HandleLoggedIn(userId)
} else {
//if object.IsForbidden(userId) {
// c.forbiddenAccountResp(userId)
// return
//}
if userId := object.GetUserIdByField(application, "email", res.Email); userId != "" {
c.HandleLoggedIn(userId)
if provider.Type == "github" {
_ = object.LinkUserAccount(userId, "github", res.Method)
} else if provider.Type == "google" {
_ = object.LinkUserAccount(userId, "google", res.Email)
}
}
}
resp = Response{Status: "ok", Msg: "success", Data: res}
} else {
userId := c.GetSessionUser()
if userId == "" {
resp = Response{Status: "error", Msg: "user doesn't exist", Data: res}
c.Data["json"] = resp
c.ServeJSON()
return
}
linkRes := false
if provider.Type == "github" {
linkRes = object.LinkUserAccount(userId, "github", res.Method)
} else if provider.Type == "google" {
linkRes = object.LinkUserAccount(userId, "google", res.Email)
}
if linkRes {
resp = Response{Status: "ok", Msg: "success", Data: linkRes}
} else {
resp = Response{Status: "error", Msg: "link account failed", Data: linkRes}
}
//if len(object.GetMemberAvatar(userId)) == 0 {
// avatar := UploadAvatarToOSS(tempUserAccount.AvatarUrl, userId)
// object.LinkUserAccount(userId, "avatar", avatar)
//}
}
} else {
panic("unknown authentication type (not password or provider)")
}
c.Data["json"] = resp

1
routers/router.go
View File

@ -37,7 +37,6 @@ func initAPI() {
beego.Router("/api/login", &controllers.ApiController{}, "POST:Login")
beego.Router("/api/logout", &controllers.ApiController{}, "POST:Logout")
beego.Router("/api/get-account", &controllers.ApiController{}, "GET:GetAccount")
beego.Router("/api/auth/login", &controllers.ApiController{}, "POST:AuthLogin")
beego.Router("/api/get-organizations", &controllers.ApiController{}, "GET:GetOrganizations")
beego.Router("/api/get-organization", &controllers.ApiController{}, "GET:GetOrganization")

8
web/src/auth/AuthBackend.js
View File

@ -44,14 +44,6 @@ export function logout() {
}).then(res => res.json());
}
export function authLogin(values) {
return fetch(`${authConfig.serverUrl}/api/auth/login`, {
method: 'POST',
credentials: "include",
body: JSON.stringify(values),
}).then(res => res.json());
}
export function getOAuthCode(clientId, responseType, redirectUri, scope, state) {
return fetch(`${authConfig.serverUrl}/api/oauth/code?clientId=${clientId}&responseType=${responseType}&redirectUri=${redirectUri}&scope=${scope}&state=${state}`, {
method: 'GET',

2
web/src/auth/AuthCallback.js
View File

@ -46,7 +46,7 @@ class AuthCallback extends React.Component {
redirectUri: redirectUri,
method: this.state.method,
};
AuthBackend.authLogin(body)
AuthBackend.login(body)
.then((res) => {
if (res.status === "ok") {
window.location.href = '/';

9
web/yarn.lock
View File

@ -3380,20 +3380,13 @@ copy-descriptor@^0.1.0:
resolved "https://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
copy-to-clipboard@^3.2.0:
copy-to-clipboard@^3.2.0, copy-to-clipboard@^3.3.1:
version "3.3.1"
resolved "https://registry.npm.taobao.org/copy-to-clipboard/download/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
integrity sha1-EVqhqZmP+rYZb5MHatbaO5E2Yq4=
dependencies:
toggle-selection "^1.0.6"
copy-to-clipboard@^3.3.1:
version "3.3.1"
resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
dependencies:
toggle-selection "^1.0.6"
core-js-compat@^3.6.2:
version "3.6.5"
resolved "https://registry.npm.taobao.org/core-js-compat/download/core-js-compat-3.6.5.tgz#2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"