-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from frankiejun/main
实现邮箱验证功能
- Loading branch information
Showing
25 changed files
with
910 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,9 @@ import ( | |
| "bytes" | ||
| "context" | ||
| "database/sql" | ||
| "github.com/ecodeclub/webook/internal/ioc" | ||
| "github.com/ecodeclub/webook/internal/service/email" | ||
| //"github.com/golang-jwt/jwt/v5" | ||
| "fmt" | ||
| "log" | ||
| "net/http" | ||
|
|
@@ -175,14 +178,75 @@ func TestUserHandler_e2e_SignUp(t *testing.T) { | |
| } | ||
| } | ||
|
|
||
| func TestUserHandler_e2e_EmailVerify(t *testing.T) { | ||
| r := initWebServer() | ||
| db := initDB() | ||
| u := initUser(db) | ||
| u.RegisterRoutes(r) | ||
| testCases := []struct { | ||
| name string | ||
| body string | ||
| before func(t *testing.T) | ||
| after func(t *testing.T) | ||
| token string | ||
| email string | ||
| wantCode int | ||
| wantBody string | ||
| }{ | ||
| { | ||
| name: "验证成功!", | ||
| before: func(t *testing.T) { | ||
| }, | ||
| after: func(t *testing.T) { | ||
|
|
||
| }, | ||
| body: "", | ||
| token: genToken("[email protected]", 1), | ||
| email: "[email protected]", | ||
| wantCode: http.StatusOK, | ||
| wantBody: "验证成功!", | ||
| }, | ||
| { | ||
| name: "验证失败!", | ||
| before: func(t *testing.T) { | ||
|
|
||
| }, | ||
| after: func(t *testing.T) { | ||
|
|
||
| }, | ||
| body: "", | ||
| email: "[email protected]", | ||
| wantCode: http.StatusOK, | ||
| wantBody: "验证失败!", | ||
| token: "eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJFbWFpbCI6Imp1bm55ZmVuZ0AxNjMuY29tIiwiZXhwIjoxNjk0NTIxODQzfQ.gwGcIDcaKuFG6DyyLnWfEn5poIZ3BMUk2lNQsDhyA3DMBSTo9HkEJ1eyIUQ0XDqp29XVme5dOOMuY2LgRfI60Q", | ||
| }, | ||
| } | ||
| for _, tc := range testCases { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| tc.before(t) | ||
| req, err := http.NewRequest(http.MethodPost, "/users/email/verify/"+tc.token, bytes.NewBuffer([]byte(tc.body))) | ||
| assert.NoError(t, err) | ||
| req.Header.Set("Content-Type", "application/json") | ||
|
|
||
| resp := httptest.NewRecorder() | ||
| r.ServeHTTP(resp, req) | ||
|
|
||
| assert.Equal(t, tc.wantCode, resp.Code) | ||
| assert.Equal(t, tc.wantBody, resp.Body.String()) | ||
| tc.after(t) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func TestUserHandler_e2e_Login(t *testing.T) { | ||
| // server := InitWebServer() | ||
| server := gin.Default() | ||
| //db := initDB() | ||
| var db *gorm.DB | ||
| da := dao.NewUserInfoDAO(db) | ||
| repo := repository.NewUserInfoRepository(da) | ||
| svc := service.NewUserService(repo) | ||
| evc := email.NewEmailService(ioc.InitEmailCfg()) | ||
| svc := service.NewUserService(repo, evc) | ||
|
|
||
| userHandle := web.NewUserHandler(svc) | ||
| userHandle.RegisterRoutes(server) | ||
|
|
@@ -314,11 +378,23 @@ func initWebServer() *gin.Engine { | |
| func initUser(db *gorm.DB) *web.UserHandler { | ||
| da := dao.NewUserInfoDAO(db) | ||
| repo := repository.NewUserInfoRepository(da) | ||
| svc := service.NewUserService(repo) | ||
| evc := email.NewEmailService(ioc.InitEmailCfg()) | ||
| svc := service.NewUserService(repo, evc) | ||
| u := web.NewUserHandler(svc) | ||
| return u | ||
| } | ||
|
|
||
| func genToken(emailAddr string, timeout int) string { | ||
| token := jwt.NewWithClaims(jwt.SigningMethodHS512, service.EmailClaims{ | ||
| Email: emailAddr, | ||
| RegisteredClaims: jwt.RegisteredClaims{ | ||
| ExpiresAt: jwt.NewNumericDate(time.Now().Add(time.Minute * time.Duration(timeout))), | ||
| }, | ||
| }) | ||
| tokenStr, _ := token.SignedString([]byte(service.EmailJWTKey)) | ||
| return tokenStr | ||
| } | ||
|
|
||
| func Decrypt(encryptString string, secret string) (interface{}, error) { | ||
| claims := &web.TokenClaims{} | ||
| token, err := jwt.ParseWithClaims(encryptString, claims, func(token *jwt.Token) (interface{}, error) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package ioc | ||
|
|
||
| import ( | ||
| "crypto/tls" | ||
| "github.com/go-gomail/gomail" | ||
| "os" | ||
| "strconv" | ||
| ) | ||
|
|
||
| func InitEmailCfg() *gomail.Dialer { | ||
| //服务邮箱地址 | ||
| host := os.Getenv("EmailHost") | ||
| //服务邮箱端口 | ||
| portstr := os.Getenv("EmailPort") | ||
| //发送者或邮箱名称 | ||
| username := os.Getenv("EmailUsername") | ||
| //邮箱的授权密码 | ||
| password := os.Getenv("EmailPassword") | ||
|
|
||
| port, err := strconv.Atoi(portstr) | ||
| if err != nil { | ||
| panic("读取邮箱端口失败!") | ||
| } | ||
|
|
||
| dialer := gomail.NewDialer(host, port, username, password) | ||
| dialer.TLSConfig = &tls.Config{InsecureSkipVerify: true} | ||
| return dialer | ||
|
|
||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.