use MarshalIndent for token and sessions
+10
-25
+2
-1
auth/auth.go
+2
-1
auth/auth.go
···
340
340
341
341
// if session is near expiration, extend it
342
342
if time.Now().Add(7 * 24 * time.Hour).After(session.ExpiresAt) {
343
-
if err := ExtendSession(cookie.Value, time.Now().Add(14*24*time.Hour)); err != nil {
343
+
session.ExpiresAt = time.Now().Add(14 * 24 * time.Hour)
344
+
if err := SaveSession(session); err != nil {
344
345
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
345
346
return
346
347
}
+7
-23
auth/session.go
+7
-23
auth/session.go
···
41
41
ExpiresAt: time.Now().Add(14 * 24 * time.Hour),
42
42
}
43
43
44
-
sessionPath := sessionPath(sessionID)
45
-
sessionBytes, err := json.Marshal(session)
46
-
if err != nil {
47
-
return "", fmt.Errorf("failed to marshal session: %w", err)
48
-
}
49
-
50
-
if err := os.MkdirAll(sessionDir(), 0700); err != nil {
51
-
return "", fmt.Errorf("failed to create session directory: %w", err)
52
-
}
53
-
54
-
if err := os.WriteFile(sessionPath, sessionBytes, 0600); err != nil {
55
-
return "", fmt.Errorf("failed to write session: %w", err)
44
+
if err := SaveSession(session); err != nil {
45
+
return "", fmt.Errorf("failed to save session: %w", err)
56
46
}
57
47
58
48
if err := DeleteExpiredSessions(); err != nil {
···
64
54
65
55
func SaveSession(session Session) error {
66
56
sessionPath := sessionPath(session.ID)
67
-
sessionBytes, err := json.Marshal(session)
57
+
if err := os.MkdirAll(sessionDir(), 0700); err != nil {
58
+
return fmt.Errorf("failed to create session directory: %w", err)
59
+
}
60
+
61
+
sessionBytes, err := json.MarshalIndent(session, "", " ")
68
62
if err != nil {
69
63
return fmt.Errorf("failed to marshal session: %w", err)
70
64
}
···
127
121
128
122
return session, nil
129
123
}
130
-
131
-
func ExtendSession(sessionID string, expiresAt time.Time) error {
132
-
session, err := GetSession(sessionID)
133
-
if err != nil {
134
-
return fmt.Errorf("failed to load session: %w", err)
135
-
}
136
-
137
-
session.ExpiresAt = expiresAt
138
-
return SaveSession(session)
139
-
}