Skip to content

Commit a09388c

Browse files
committed
Clean whitespace
1 parent b064ab5 commit a09388c

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

multipass/cmd/multipass/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func createTemplateRenderer(logger *services.Logger) multitemplate.Renderer {
7171
func main() {
7272
// Load configuration
7373
cfg := config.Load()
74-
74+
7575
// Create logger
7676
logger := services.NewLogger(cfg)
7777

multipass/internal/handlers/public.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ func PublicCardHandler(c *gin.Context) {
8484
// Format dates for display
8585
joinDateStr := "Unknown"
8686
expiryDateStr := "Unknown"
87-
87+
8888
if membershipInfo.JoinDate != nil {
8989
joinDateStr = membershipInfo.JoinDate.Format("Jan 2, 2006")
9090
}
91-
91+
9292
if membershipInfo.ExpiryDate != nil {
9393
expiryDateStr = membershipInfo.ExpiryDate.Format("Jan 2, 2006")
9494
}
95-
95+
9696
// Prepare template data
9797
templateData := gin.H{
9898
"title": "Digital ID Card - " + cfg.MakerspaceName,

multipass/internal/middleware/debug.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func DebugAuthMiddleware() gin.HandlerFunc {
2121
cfg := config.Load()
2222
// Create logger instance
2323
logger := services.NewLogger(cfg)
24-
24+
2525
if cfg.IsDevelopment() && c.GetHeader("X-Authentik-Email") == "" {
2626
// Add mock Authentik headers for testing
2727
testEmail := "test.user@example.com"

multipass/internal/services/authentik.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,19 +285,19 @@ func createUserProfileFromAuthentikUser(ac *AuthentikClient, authUser AuthentikU
285285
ac.logger.Debug("Found member_since attribute: %s", memberSince)
286286
userProfile.MemberSince = memberSince
287287
}
288-
288+
289289
// Extract membership_type if available
290290
if membershipType, ok := authUser.Attributes["membership_type"].(string); ok {
291291
ac.logger.Debug("Found membership_type attribute: %s", membershipType)
292292
userProfile.MembershipType = membershipType
293293
}
294-
294+
295295
// Extract expiry_date if available
296296
if expiryDate, ok := authUser.Attributes["expiry_date"].(string); ok {
297297
ac.logger.Debug("Found expiry_date attribute: %s", expiryDate)
298298
userProfile.ExpiryDate = expiryDate
299299
}
300-
300+
301301
// Extract membership_status if available
302302
if status, ok := authUser.Attributes["membership_status"].(string); ok {
303303
ac.logger.Debug("Found membership_status attribute: %s", status)

multipass/internal/services/membership.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (s *MembershipService) getMembershipType(user *models.UserProfile) string {
8686
s.logger.Debug("Using membership_type metadata: %s for user %s", user.MembershipType, user.Email)
8787
return user.MembershipType
8888
}
89-
89+
9090
// Fall back to access level mapping if no metadata
9191
switch user.AccessLevel {
9292
case models.NoAccess:
@@ -109,7 +109,7 @@ func (s *MembershipService) determineMembershipStatus(user *models.UserProfile)
109109
// Check if we have membership_status metadata from Authentik
110110
if user.MembershipStatus != "" {
111111
s.logger.Debug("Using membership_status metadata: %s for user %s", user.MembershipStatus, user.Email)
112-
112+
113113
// Map the status string to our enum
114114
switch strings.ToLower(user.MembershipStatus) {
115115
case "active":
@@ -122,7 +122,7 @@ func (s *MembershipService) determineMembershipStatus(user *models.UserProfile)
122122
return models.StatusInactive
123123
}
124124
}
125-
125+
126126
// Fall back to checking groups if no metadata or unrecognized status
127127
// Check for specific groups that might indicate a suspended or expired status
128128
for _, group := range user.Groups {
@@ -152,16 +152,16 @@ func (s *MembershipService) getJoinDate(user *models.UserProfile) *time.Time {
152152
// Check if we have member_since metadata from Authentik
153153
if user.MemberSince != "" {
154154
s.logger.Debug("Using member_since metadata: %s for user %s", user.MemberSince, user.Email)
155-
155+
156156
// Parse the date string (expected format: YYYY-MM-DD)
157157
memberSince, err := time.Parse("2006-01-02", user.MemberSince)
158158
if err == nil {
159159
return &memberSince
160160
}
161-
161+
162162
s.logger.Error("Failed to parse member_since date: %v", err)
163163
}
164-
164+
165165
// Default to 1 year ago if we don't have real data
166166
t := time.Now().AddDate(-1, 0, 0)
167167
return &t
@@ -173,34 +173,34 @@ func (s *MembershipService) getExpiryDate(user *models.UserProfile) *time.Time {
173173
// Check if we have expiry_date metadata from Authentik
174174
if user.ExpiryDate != "" {
175175
s.logger.Debug("Using expiry_date metadata: %s for user %s", user.ExpiryDate, user.Email)
176-
176+
177177
// Parse the date string (expected format: YYYY-MM-DD)
178178
expiryDate, err := time.Parse("2006-01-02", user.ExpiryDate)
179179
if err == nil {
180180
return &expiryDate
181181
}
182-
182+
183183
s.logger.Error("Failed to parse expiry_date: %v", err)
184184
}
185-
185+
186186
// For annual members, expiry is 1 year from now
187187
if containsAny(user.Groups, []string{"annual-members"}) {
188188
expiry := time.Now().AddDate(1, 0, 0)
189189
return &expiry
190190
}
191-
191+
192192
// For lifetime members, expiry is 100 years from now (effectively forever)
193193
if containsAny(user.Groups, []string{"lifetime-members"}) {
194194
expiryDate := time.Now().AddDate(100, 0, 0)
195195
return &expiryDate
196196
}
197-
197+
198198
// For monthly members, expiry is 1 month from now
199199
if containsAny(user.Groups, []string{"monthly-members"}) {
200200
expiryDate := time.Now().AddDate(0, 1, 0)
201201
return &expiryDate
202202
}
203-
203+
204204
// Check for specific groups that indicate a specific expiry year
205205
if containsAny(user.Groups, []string{"expires-2023"}) {
206206
expiryDate := time.Date(2023, 12, 31, 23, 59, 59, 0, time.UTC)

0 commit comments

Comments
 (0)