Merge pull request #74 from gedorinku/logout

ログアウト

Author: gedorinku

app/interceptor/session_auth.go

@@ -31,6 +31,7 @@ var (
 )
 
 type currentUserIDKey struct{}
+type sessionIDKey struct{}
 
 // GetCurrentUserID returns the current user's id from context
 func GetCurrentUserID(ctx context.Context) (id model.UserID, ok bool) {
@@ -39,6 +40,13 @@ func GetCurrentUserID(ctx context.Context) (id model.UserID, ok bool) {
 	return
 }
 
+// GetSessionID returns the session id from context
+func GetSessionID(ctx context.Context) (id string, ok bool) {
+	v := ctx.Value(sessionIDKey{})
+	id, ok = v.(string)
+	return
+}
+
 // Authorizator provide the authorization interceptor
 type Authorizator struct {
 	di.StoreComponent
@@ -75,6 +83,7 @@ func (a *Authorizator) authorization(ctx context.Context, req interface{}, info
 	}
 
 	newCtx := context.WithValue(ctx, currentUserIDKey{}, s.UserID)
+	newCtx = context.WithValue(newCtx, sessionIDKey{}, sessionID)
 	return handler(newCtx, req)
 }
 

app/server/sessions_server.go

@@ -13,6 +13,8 @@ import (
 
 	api_pb "github.com/ProgrammingLab/prolab-accounts/api"
 	"github.com/ProgrammingLab/prolab-accounts/app/di"
+	"github.com/ProgrammingLab/prolab-accounts/app/interceptor"
+	"github.com/ProgrammingLab/prolab-accounts/app/util"
 )
 
 // NewSessionServiceServer creates a new SessionServiceServer instance.
@@ -52,6 +54,17 @@ func (s *sessionServiceServerImpl) CreateSession(ctx context.Context, req *api_p
 }
 
 func (s *sessionServiceServerImpl) DeleteSession(ctx context.Context, req *api_pb.DeleteSessionRequest) (*empty.Empty, error) {
-	// TODO: Not yet implemented.
-	return nil, status.Error(codes.Unimplemented, "TODO: You should implement it!")
+	_, ok := interceptor.GetCurrentUserID(ctx)
+	if !ok {
+		return nil, util.ErrUnauthenticated
+	}
+
+	session, _ := interceptor.GetSessionID(ctx)
+	ss := s.SessionStore(ctx)
+	err := ss.DeleteSession(session)
+	if err != nil {
+		return nil, err
+	}
+
+	return &empty.Empty{}, nil
 }

infra/store/session/session_store.go

@@ -92,6 +92,20 @@ func (s *sessionStoreImpl) GetSession(sessionID string) (*model.Session, error)
 	}, nil
 }
 
+func (s *sessionStoreImpl) DeleteSession(sessionID string) error {
+	keys, err := s.client.Keys(redisKey(sessionID) + ":*").Result()
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	if len(keys) == 0 {
+		return errors.WithStack(errSessionNotFound)
+	}
+
+	_, err = s.client.Del(keys...).Result()
+	return errors.WithStack(err)
+}
+
 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 {

infra/store/session_store.go

@@ -7,4 +7,5 @@ type SessionStore interface {
 	CreateSession(nameOrEmail, password string) (*model.Session, error)
 	GetSession(sessionID string) (*model.Session, error)
 	ResetSession(userID model.UserID) (*model.Session, error)
+	DeleteSession(sessionID string) error
 }