liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- v2 ChangeMobile

Browse Source
This commit is contained in:
gazebo
2019-03-04 14:36:00 +08:00
parent f65f3dfadb
commit 9a581f1eba
5 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
controllers/auth2.go
View File

@@ -2,7 +2,6 @@ package controllers
import (
"encoding/base64"
"errors"
"fmt"
"net/http"
@@ -11,15 +10,10 @@ import (
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/password"
"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
"git.rosy.net.cn/jx-callback/business/jxcallback/auth"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/business/model"
"github.com/astaxie/beego"
)
var (
ErrNeedV2Token = errors.New("需要V2版的TOKEN")
)
type Auth2Controller struct {
beego.Controller
}
@@ -28,7 +22,7 @@ type Auth2Controller struct {
// @Description 生成captcha
// @Param width formData int true "图片宽"
// @Param height formData int true "图片高"
// @Param captchaLen formData int false "验证码长度"
// @Param captchaLen formData int false captcha码长度"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /CreateCaptcha [post]
@@ -40,9 +34,9 @@ func (c *Auth2Controller) CreateCaptcha() {
}
// @Title 发送验证码
// @Description 发送验证码（图片验证码与authToken二者必须至少有一个）
// @Param captchaID formData string false "图片验证码ID"
// @Param captchaValue formData string false "图片验证码值"
// @Description 发送验证码（captcha码与authToken二者必须至少有一个）
// @Param captchaID formData string false "captcha码ID"
// @Param captchaValue formData string false "captcha码值"
// @Param authToken formData string false "之前的认证信息"
// @Param authID formData string true "手机号或邮件"
// @Success 200 {object} controllers.CallResult
@@ -157,7 +151,7 @@ func (c *Auth2Controller) Logout() {
// @router /AddAuthBind [post]
func (c *Auth2Controller) AddAuthBind() {
c.callAddAuthBind(func(params *tAuth2AddAuthBindParams) (retVal interface{}, errCode string, err error) {
authInfo, err2 := getAuth2Info(params.Ctx)
authInfo, err2 := params.Ctx.GetV2AuthInfo()
if err := err2; err == nil {
newAuthInfo, err2 := auth2.GetTokenInfo(params.AuthToken)
if err = err2; err == nil {
@@ -177,7 +171,7 @@ func (c *Auth2Controller) AddAuthBind() {
// @router /RemoveAuthBind [post]
func (c *Auth2Controller) RemoveAuthBind() {
c.callRemoveAuthBind(func(params *tAuth2RemoveAuthBindParams) (retVal interface{}, errCode string, err error) {
authInfo, err2 := getAuth2Info(params.Ctx)
authInfo, err2 := params.Ctx.GetV2AuthInfo()
if err := err2; err == nil {
err = auth2.UnbindAuth(authInfo, params.AuthType)
}
@@ -195,17 +189,10 @@ func (c *Auth2Controller) RemoveAuthBind() {
// @router /ChangePassword [put]
func (c *Auth2Controller) ChangePassword() {
c.callChangePassword(func(params *tAuth2ChangePasswordParams) (retVal interface{}, errCode string, err error) {
authInfo, err := getAuth2Info(params.Ctx)
authInfo, err := params.Ctx.GetV2AuthInfo()
if err == nil {
err = password.AutherObj.ChangePassword(authInfo.GetID(), params.OldPwd, params.NewPwd)
}
return retVal, "", err
})
}
func getAuth2Info(ctx *jxcontext.Context) (authInfo *auth2.AuthInfo, err error) {
if authInfo, ok := ctx.GetLoginInfo().(*auth2.AuthInfo); ok {
return authInfo, err
}
return nil, ErrNeedV2Token
}