From 21ff8ba7978ea80ac6b015e6b838a4e974299aee Mon Sep 17 00:00:00 2001
From: Steven <stevenlgtm@gmail.com>
Date: Mon, 17 Jul 2023 21:14:40 +0800
Subject: [PATCH] chore: code clean

---
 api/v1/jwt.go              |  2 ++
 api/v1/shortcut.go         | 48 ++++++++++++++++++--------------------
 store/workspace_setting.go |  8 +------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/api/v1/jwt.go b/api/v1/jwt.go
index 6292646..43fbd76 100644
--- a/api/v1/jwt.go
+++ b/api/v1/jwt.go
@@ -88,6 +88,7 @@ func JWTMiddleware(server *APIV1Service, next echo.HandlerFunc, secret string) e
 			if util.HasPrefixes(path, "/s/*") && method == http.MethodGet {
 				return next(c)
 			}
+			auth.RemoveTokensAndCookies(c)
 			return echo.NewHTTPError(http.StatusUnauthorized, "Missing access token")
 		}
 
@@ -116,6 +117,7 @@ func JWTMiddleware(server *APIV1Service, next echo.HandlerFunc, secret string) e
 					generateToken = true
 				}
 			} else {
+				auth.RemoveTokensAndCookies(c)
 				return echo.NewHTTPError(http.StatusUnauthorized, errors.Wrap(err, "Invalid or expired access token"))
 			}
 		}
diff --git a/api/v1/shortcut.go b/api/v1/shortcut.go
index f3a6354..29d9e7a 100644
--- a/api/v1/shortcut.go
+++ b/api/v1/shortcut.go
@@ -261,37 +261,14 @@ func (s *APIV1Service) registerShortcutRoutes(g *echo.Group) {
 			return echo.NewHTTPError(http.StatusForbidden, "Unauthorized to delete shortcut")
 		}
 
-		if err := s.Store.DeleteShortcut(ctx, &store.DeleteShortcut{
-			ID: shortcutID,
-		}); err != nil {
+		err = s.Store.DeleteShortcut(ctx, &store.DeleteShortcut{ID: shortcutID})
+		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, fmt.Sprintf("failed to delete shortcut, err: %s", err)).SetInternal(err)
 		}
-
 		return c.JSON(http.StatusOK, true)
 	})
 }
 
-func (s *APIV1Service) createShortcutCreateActivity(ctx context.Context, shortcut *store.Shortcut) error {
-	payload := &ActivityShorcutCreatePayload{
-		ShortcutID: shortcut.ID,
-	}
-	payloadStr, err := json.Marshal(payload)
-	if err != nil {
-		return errors.Wrap(err, "Failed to marshal activity payload")
-	}
-	activity := &store.Activity{
-		CreatorID: shortcut.CreatorID,
-		Type:      store.ActivityShortcutCreate,
-		Level:     store.ActivityInfo,
-		Payload:   string(payloadStr),
-	}
-	_, err = s.Store.CreateActivity(ctx, activity)
-	if err != nil {
-		return errors.Wrap(err, "Failed to create activity")
-	}
-	return nil
-}
-
 func (s *APIV1Service) composeShortcut(ctx context.Context, shortcut *Shortcut) (*Shortcut, error) {
 	if shortcut == nil {
 		return nil, nil
@@ -340,3 +317,24 @@ func convertShortcutFromStore(shortcut *store.Shortcut) *Shortcut {
 		Tags:        tags,
 	}
 }
+
+func (s *APIV1Service) createShortcutCreateActivity(ctx context.Context, shortcut *store.Shortcut) error {
+	payload := &ActivityShorcutCreatePayload{
+		ShortcutID: shortcut.ID,
+	}
+	payloadStr, err := json.Marshal(payload)
+	if err != nil {
+		return errors.Wrap(err, "Failed to marshal activity payload")
+	}
+	activity := &store.Activity{
+		CreatorID: shortcut.CreatorID,
+		Type:      store.ActivityShortcutCreate,
+		Level:     store.ActivityInfo,
+		Payload:   string(payloadStr),
+	}
+	_, err = s.Store.CreateActivity(ctx, activity)
+	if err != nil {
+		return errors.Wrap(err, "Failed to create activity")
+	}
+	return nil
+}
diff --git a/store/workspace_setting.go b/store/workspace_setting.go
index 949f62c..a61c08a 100644
--- a/store/workspace_setting.go
+++ b/store/workspace_setting.go
@@ -17,13 +17,7 @@ const (
 
 // String returns the string format of WorkspaceSettingKey type.
 func (key WorkspaceSettingKey) String() string {
-	switch key {
-	case WorkspaceDisallowSignUp:
-		return "disallow-signup"
-	case WorkspaceSecretSessionName:
-		return "secret-session-name"
-	}
-	return ""
+	return string(key)
 }
 
 type WorkspaceSetting struct {