Impl UpdatePassword

Author: gedorinku

api/protos/password_resets.proto

@@ -41,6 +41,7 @@ message CreatePasswordResetRequest {
 
 message UpdatePasswordRequest {
   string token = 1;
+  // updateの時はemailはquery parameterじゃなくてrequest bodyに入れて欲しい
   string email = 2;
   string new_password = 3;
 }

app/server/password_resets_server.go

@@ -7,8 +7,6 @@ import (
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/izumin5210/grapi/pkg/grapiserver"
 	"github.com/pkg/errors"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 
 	api_pb "github.com/ProgrammingLab/prolab-accounts/api"
 	"github.com/ProgrammingLab/prolab-accounts/app/config"
@@ -64,13 +62,13 @@ func (s *passwordResetServiceServerImpl) CreatePasswordReset(ctx context.Context
 	}
 
 	ps := s.PasswordResetStore(ctx)
-	p, token, err := ps.CreateConfirmation(model.UserID(u.ID), email)
+	r, token, err := ps.CreateConfirmation(model.UserID(u.ID), email)
 	if err != nil {
 		return nil, err
 	}
 
 	sender := s.EmailSender(ctx)
-	err = sender.SendPasswordReset(p, token)
+	err = sender.SendPasswordReset(r, token)
 	if err != nil {
 		return nil, err
 	}
@@ -79,6 +77,38 @@ func (s *passwordResetServiceServerImpl) CreatePasswordReset(ctx context.Context
 }
 
 func (s *passwordResetServiceServerImpl) UpdatePassword(ctx context.Context, req *api_pb.UpdatePasswordRequest) (*api_pb.Session, error) {
-	// TODO: Not yet implemented.
-	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")
+	password := req.GetNewPassword()
+	if len(password) < MinPasswordLength || MaxPasswordLength < len(password) {
+		return nil, ErrOutOfRangePasswordLength
+	}
+
+	ps := s.PasswordResetStore(ctx)
+	r, err := ps.GetConfirmation(req.GetEmail(), req.GetToken())
+	if err != nil {
+		if errors.Cause(err) == sql.ErrNoRows {
+			return nil, util.ErrNotFound
+		}
+		return nil, err
+	}
+
+	err = ps.UpdatePassword(r, password)
+	if err != nil {
+		return nil, err
+	}
+
+	ss := s.SessionStore(ctx)
+	session, err := ss.ResetSession(model.UserID(r.R.User.ID))
+	if err != nil {
+		return nil, err
+	}
+
+	sender := s.EmailSender(ctx)
+	err = sender.SendPasswordChanged(r.R.User)
+	if err != nil {
+		return nil, err
+	}
+
+	return &api_pb.Session{
+		SessionId: session.ID,
+	}, nil
 }

app/server/users_server.go

@@ -44,6 +44,8 @@ const (
 	MaxIconSize = 1024 * 1024 // 1MiB
 	// MaxPasswordLength represents max length of password
 	MaxPasswordLength = 72
+	// MinPasswordLength represents min length of password
+	MinPasswordLength = 6
 )
 
 var (
@@ -55,8 +57,8 @@ var (
 	ErrInvalidImageFormat = status.Error(codes.InvalidArgument, "invalid iamge format")
 	// ErrNameAlreadyInUse is returned when name is already in use
 	ErrNameAlreadyInUse = status.Error(codes.AlreadyExists, "name is already in use")
-	// ErrTooLongPassword will be returned when password is too long
-	ErrTooLongPassword = status.Error(codes.InvalidArgument, fmt.Sprintf("length of password must be less than %v", MaxPasswordLength+1))
+	// ErrOutOfRangePasswordLength will be returned when password length is out of range
+	ErrOutOfRangePasswordLength = status.Error(codes.InvalidArgument, fmt.Sprintf("length of password must be less than %v and more than %v", MaxPasswordLength+1, MinPasswordLength-1))
 )
 
 func (s *userServiceServerImpl) ListPublicUsers(ctx context.Context, req *api_pb.ListUsersRequest) (*api_pb.ListUsersResponse, error) {
@@ -172,8 +174,8 @@ func (s *userServiceServerImpl) CreateUser(ctx context.Context, req *api_pb.Crea
 	}
 
 	password := req.GetPassword()
-	if MaxPasswordLength < len(password) {
-		return nil, ErrTooLongPassword
+	if len(password) < MinPasswordLength || MaxPasswordLength < len(password) {
+		return nil, ErrOutOfRangePasswordLength
 	}
 
 	d, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)

infra/email/email.go

@@ -19,6 +19,7 @@ type Sender interface {
 	SendEmailConfirmation(conf *record.EmailConfirmation) error
 	SendEmailChanged(user *record.User, oldEmail string) error
 	SendPasswordReset(reset *record.PasswordReset, token string) error
+	SendPasswordChanged(user *record.User) error
 }
 
 // NewSender creates new sender
@@ -97,6 +98,17 @@ func (s *senderImpl) SendPasswordReset(reset *record.PasswordReset, token string
 	return s.send(reset.Email, "パスワードのリセット", "password_reset.tmpl", d)
 }
 
+type passwordChangedData struct {
+	Name string
+}
+
+func (s *senderImpl) SendPasswordChanged(user *record.User) error {
+	d := passwordChangedData{
+		Name: user.Name,
+	}
+	return s.send(user.Email, "パスワードが変更されました", "password_changed.tmpl", d)
+}
+
 func (s *senderImpl) send(to, subject, tmplName string, d interface{}) error {
 	tmpl, err := s.asset.GetTemplate(tmplName)
 	if err != nil {

infra/store/session/session_store.go

@@ -27,6 +27,12 @@ type sessionStoreImpl struct {
 const (
 	// SessionExpiration is sessions expiration
 	SessionExpiration = time.Hour * 24 * 7
+
+	keyPrefix = "session"
+)
+
+var (
+	errSessionNotFound = fmt.Errorf("session not found")
 )
 
 // NewSessionStore returns new session store
@@ -52,22 +58,25 @@ func (s *sessionStoreImpl) CreateSession(nameOrEmail, password string) (*model.S
 		return nil, errors.WithStack(err)
 	}
 
-	session, err := model.NewSession(model.UserID(u.ID))
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	key := redisKey(session.ID)
-	err = s.client.Set(key, strconv.FormatInt(u.ID, 10), SessionExpiration).Err()
+	session, err := s.setSession(model.UserID(u.ID))
 	if err != nil {
-		return nil, errors.Wrap(err, "")
+		return nil, err
 	}
 
 	return session, nil
 }
 
 func (s *sessionStoreImpl) GetSession(sessionID string) (*model.Session, error) {
-	v, err := s.client.Get(redisKey(sessionID)).Result()
+	keys, err := s.client.Keys(redisKey(sessionID) + ":*").Result()
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	if len(keys) == 0 {
+		return nil, errors.WithStack(errSessionNotFound)
+	}
+
+	v, err := s.client.Get(keys[0]).Result()
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
@@ -83,6 +92,40 @@ func (s *sessionStoreImpl) GetSession(sessionID string) (*model.Session, error)
 	}, nil
 }
 
+func (s *sessionStoreImpl) ResetSession(userID model.UserID) (*model.Session, error) {
+	keys, err := s.client.Keys(fmt.Sprintf("%s:*:%v", keyPrefix, userID)).Result()
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+	_, err = s.client.Del(keys...).Result()
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	session, err := s.setSession(userID)
+	if err != nil {
+		return nil, err
+	}
+
+	return session, nil
+}
+
+func (s *sessionStoreImpl) setSession(userID model.UserID) (*model.Session, error) {
+	session, err := model.NewSession(userID)
+	if err != nil {
+		return nil, errors.WithStack(err)
+	}
+
+	id := strconv.FormatInt(int64(userID), 10)
+	key := redisKey(session.ID) + ":" + id
+	err = s.client.Set(key, id, SessionExpiration).Err()
+	if err != nil {
+		return nil, errors.Wrap(err, "")
+	}
+
+	return session, nil
+}
+
 func redisKey(sessionID string) string {
-	return fmt.Sprintf("session:%s", sessionID)
+	return fmt.Sprintf("%s:%s", keyPrefix, sessionID)
 }

infra/store/session_store.go

@@ -6,4 +6,5 @@ import "github.com/ProgrammingLab/prolab-accounts/model"
 type SessionStore interface {
 	CreateSession(nameOrEmail, password string) (*model.Session, error)
 	GetSession(sessionID string) (*model.Session, error)
+	ResetSession(userID model.UserID) (*model.Session, error)
 }

packrd/packed-packr.go

@@ -0,0 +1,8 @@
+@{{.Name}} さん
+
+プロラボアカウントのパスワードが変更されました。
+
+-----------------------------------------------
+久留米高専 プログラミングラボ部
+https://kurume-nct.com
+-----------------------------------------------