-
Notifications
You must be signed in to change notification settings - Fork 1
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 #759 from NUTFes/develop
パスワードリセット機能と課程の変更対応
- Loading branch information
Showing
44 changed files
with
1,338 additions
and
317 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
78 changes: 78 additions & 0 deletions
78
api/externals/controller/password_reset_token_controller.go
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,78 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "errors" | ||
| "net/http" | ||
|
|
||
| "github.com/NUTFes/FinanSu/api/internals/domain" | ||
| "github.com/NUTFes/FinanSu/api/internals/usecase" | ||
| "github.com/labstack/echo/v4" | ||
| ) | ||
|
|
||
| type passwordResetTokenController struct { | ||
| u usecase.PasswordResetTokenUseCase | ||
| } | ||
|
|
||
| type PasswordResetTokenController interface { | ||
| SendPasswordResetRequest(echo.Context) error | ||
| ValidPasswordResetToken(echo.Context) error | ||
| ChangePassword(echo.Context) error | ||
| } | ||
|
|
||
| func NewPasswordResetTokenController(u usecase.PasswordResetTokenUseCase) PasswordResetTokenController { | ||
| return &passwordResetTokenController{u} | ||
| } | ||
|
|
||
| // パスワード変更リクエスト | ||
| func (p *passwordResetTokenController) SendPasswordResetRequest(c echo.Context) error { | ||
| email := c.QueryParam("email") | ||
| err := p.u.PasswordResetTokenRequest(c.Request().Context(), email) | ||
| if err != nil { | ||
| return c.String(http.StatusOK, err.Error()) | ||
| } | ||
| return c.String(http.StatusOK, "PasswordResetTokenを送信しました") | ||
| } | ||
|
|
||
| // トークンが有効チェック | ||
| func (p *passwordResetTokenController) ValidPasswordResetToken(c echo.Context) error { | ||
| id := c.Param("id") | ||
| token := c.QueryParam("token") | ||
| err := p.u.ValidPasswordResetToken(c.Request().Context(), id, token) | ||
| if err != nil { | ||
| return c.String(http.StatusBadRequest, err.Error()) | ||
| } | ||
|
|
||
| return c.String(http.StatusOK, "Tokenは有効です") | ||
| } | ||
|
|
||
|
|
||
| // パスワード変更 | ||
| func (p *passwordResetTokenController) ChangePassword(c echo.Context) error { | ||
| id := c.Param("id") | ||
| passwordResetData := new(domain.PasswordResetData) | ||
|
|
||
| if err := c.Bind(passwordResetData); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| //トークンの有効チェック | ||
| err := p.u.ValidPasswordResetToken(c.Request().Context(), id, passwordResetData.Token) | ||
| if err != nil { | ||
| return c.String(http.StatusBadRequest, err.Error()) | ||
| } | ||
|
|
||
| //パスワードのバリデーション | ||
| isValidPassword := passwordResetData.Password != passwordResetData.ConfirmPassword || passwordResetData.Password == "" || len(passwordResetData.Password)<6 | ||
| if isValidPassword { | ||
| err = errors.New("パスワードが不正です") | ||
| return c.String(http.StatusBadRequest, err.Error()) | ||
| } | ||
|
|
||
| //パスワード変更 | ||
| err = p.u.ChangePassword(c.Request().Context(), id, passwordResetData.Password) | ||
| if err != nil { | ||
| return c.String(http.StatusBadRequest, err.Error()) | ||
| } | ||
|
|
||
| return c.String(http.StatusOK, "パスワードを変更しました") | ||
| } |
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.