fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
eson 2023-08-29 14:27:00 +08:00
parent 7559777df7
commit 8908273af5
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/auth/internal/logic/useremailconfirmationlogic.go
View File

@ -6,7 +6,6 @@ import (
"fusenapi/utils/auth" "fusenapi/utils/auth"
"fusenapi/utils/basic" "fusenapi/utils/basic"
"fusenapi/utils/wevent" "fusenapi/utils/wevent"
"log"
"time" "time"
"context" "context"
@ -92,19 +91,16 @@ func (l *UserEmailConfirmationLogic) UserEmailConfirmation(req *types.RequestEma
token, err := l.svcCtx.OAuthTokenManger.Decrypt(req.Token) token, err := l.svcCtx.OAuthTokenManger.Decrypt(req.Token)
if err != nil { if err != nil {
logx.Info(req.Token)
logx.Error(err) logx.Error(err)
return resp.SetStatus(basic.CodeOAuthRegisterTokenErr) return resp.SetStatus(basic.CodeOAuthRegisterTokenErr)
} }
log.Println("aaaa", "接收校验token", token.Platform)
switch token.OperateType { switch token.OperateType {
case auth.OpTypeRegister: case auth.OpTypeRegister:
if time.Since(token.CreateAt) >= 24*time.Hour { if time.Since(token.CreateAt) >= 24*time.Hour {
return resp.SetStatus(basic.CodeOAuthConfirmationTimeoutErr) return resp.SetStatus(basic.CodeOAuthConfirmationTimeoutErr)
} }
logx.Info(token.Platform)
switch token.Platform { switch token.Platform {
case "google": case "google":
// 谷歌平台的注册流程 // 谷歌平台的注册流程

2
server/auth/internal/types/types.go
View File

@ -44,7 +44,7 @@ type RequestGoogleLogin struct {
} }
type RequestEmailConfirmation struct { type RequestEmailConfirmation struct {
Token string `query:"token"` // 操作Token Token string `form:"token"` // 操作Token
} }
type RequestEmailRegister struct { type RequestEmailRegister struct {

16
server_api/auth.api
View File

@ -12,25 +12,25 @@ import "basic.api"
service auth { service auth {
@handler UserLoginHandler @handler UserLoginHandler
post /api/auth/login(RequestUserLogin) returns (response); post /api/auth/login(RequestUserLogin) returns (response);
@handler UserRegisterHandler @handler UserRegisterHandler
post /api/auth/register(RequestUserRegister) returns (response); post /api/auth/register(RequestUserRegister) returns (response);
@handler AcceptCookieHandler @handler AcceptCookieHandler
post /api/auth/accept-cookie(request) returns (response); post /api/auth/accept-cookie(request) returns (response);
@handler UserGoogleLoginHandler @handler UserGoogleLoginHandler
get /api/auth/oauth2/login/google(RequestGoogleLogin) returns (response); get /api/auth/oauth2/login/google(RequestGoogleLogin) returns (response);
@handler UserEmailConfirmationHandler @handler UserEmailConfirmationHandler
get /api/auth/email/confirmation(RequestEmailConfirmation) returns (response); get /api/auth/email/confirmation(RequestEmailConfirmation) returns (response);
@handler UserEmailRegisterHandler @handler UserEmailRegisterHandler
post /api/auth/oauth2/register(RequestEmailRegister) returns (response); post /api/auth/oauth2/register(RequestEmailRegister) returns (response);
@handler UserResetTokenHandler @handler UserResetTokenHandler
get /api/auth/reset/token(RequestUserResetToken) returns (response); get /api/auth/reset/token(RequestUserResetToken) returns (response);
@handler UserResetPasswordHandler @handler UserResetPasswordHandler
post /api/auth/reset/password(RequestUserResetPassword) returns (response); post /api/auth/reset/password(RequestUserResetPassword) returns (response);
} }
@ -94,7 +94,7 @@ type RequestGoogleLogin {
} }
type RequestEmailConfirmation { type RequestEmailConfirmation {
Token string `query:"token"` // 操作Token Token string `form:"token"` // 操作Token
} }
type RequestEmailRegister { type RequestEmailRegister {