Fix up membership date rendering

Author: jof

multipass/internal/handlers/public.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"multipass/internal/config"
 	"multipass/internal/models"
+	"multipass/internal/services"
 	"multipass/internal/utils"
 	"net/http"
 	"net/url"
@@ -33,14 +34,19 @@ func PublicCardHandler(c *gin.Context) {
 	// Load config
 	cfg := config.Load()
 
-	// Build membership info (simplified version)
-	// In a real implementation, this would be fetched from a database or service
-	membershipInfo := &models.MembershipInfo{
-		MembershipType: "Digital Member",
-		Status:         models.StatusActive,
-		UserLevel:      user.AccessLevel,
-		JoinDate:       getDefaultJoinDate(),
-		ExpiryDate:     getDefaultExpiryDate(),
+	// Get membership info from the membership service
+	membershipService := services.NewMembershipService()
+	membershipInfo, err := membershipService.GetMembershipInfo(user)
+	if err != nil {
+		log.Printf("[ERROR] Failed to retrieve membership info: %v", err)
+		// Fall back to default membership info if service fails
+		membershipInfo = &models.MembershipInfo{
+			MembershipType: "Digital Member",
+			Status:         models.StatusActive,
+			UserLevel:      user.AccessLevel,
+			JoinDate:       getDefaultJoinDate(),
+			ExpiryDate:     getDefaultExpiryDate(),
+		}
 	}
 
 	// Get debug info if available
@@ -74,6 +80,18 @@ func PublicCardHandler(c *gin.Context) {
 	// Convert to template.HTML to prevent escaping
 	qrCodeHTML := template.HTML("<img src=\"" + qrCodeBase64 + "\" alt=\"QR Code\" class=\"qr-code\">")
 
+	// Format dates for display
+	joinDateStr := "Unknown"
+	expiryDateStr := "Unknown"
+	
+	if membershipInfo.JoinDate != nil {
+		joinDateStr = membershipInfo.JoinDate.Format("Jan 2, 2006")
+	}
+	
+	if membershipInfo.ExpiryDate != nil {
+		expiryDateStr = membershipInfo.ExpiryDate.Format("Jan 2, 2006")
+	}
+	
 	// Prepare template data
 	templateData := gin.H{
 		"title":           "Digital ID Card - " + cfg.MakerspaceName,
@@ -84,6 +102,9 @@ func PublicCardHandler(c *gin.Context) {
 		"qr_code_html":    qrCodeHTML,          // Add QR code HTML
 		"qr_data":         fullURL,             // Keep the URL as data attribute for backward compatibility
 		"public_view":     true,                // Flag to indicate this is a public view
+		"current_time":    time.Now().Format("Jan 2, 2006 15:04:05"),  // Current time for reference
+		"join_date":       joinDateStr,         // Member since date
+		"expiry_date":     expiryDateStr,       // Membership expiry date
 	}
 
 	// Add debug info if available

multipass/internal/middleware/debug.go

@@ -41,8 +41,8 @@ func DebugAuthMiddleware() gin.HandlerFunc {
 		if debugMode || cfg.IsDevelopment() {
 			// Collect all headers for debugging
 			debugInfo := map[string]string{
-				"X-Authentik-Email": c.GetHeader("X-Authentik-Email"),
-				"X-Authentik-Name":  c.GetHeader("X-Authentik-Name"),
+				"X-Authentik-Email":  c.GetHeader("X-Authentik-Email"),
+				"X-Authentik-Name":   c.GetHeader("X-Authentik-Name"),
 				"X-Authentik-Groups": c.GetHeader("X-Authentik-Groups"),
 			}
 

multipass/internal/models/user.go

@@ -33,14 +33,18 @@ func (ul UserLevel) String() string {
 }
 
 type UserProfile struct {
-	Email       string    `json:"email"`
-	FullName    string    `json:"full_name"`
-	Groups      []string  `json:"groups"`
-	Avatar      *string   `json:"avatar,omitempty"`
-	Phone       *string   `json:"phone,omitempty"`
-	MemberID    string    `json:"member_id"`
-	AccessLevel UserLevel `json:"access_level"`
-	AuthentikID string    `json:"authentik_id,omitempty"`
+	Email            string    `json:"email"`
+	FullName         string    `json:"full_name"`
+	Groups           []string  `json:"groups"`
+	Avatar           *string   `json:"avatar,omitempty"`
+	Phone            *string   `json:"phone,omitempty"`
+	MemberID         string    `json:"member_id"`
+	AccessLevel      UserLevel `json:"access_level"`
+	AuthentikID      string    `json:"authentik_id,omitempty"`
+	MemberSince      string    `json:"member_since,omitempty"`
+	MembershipType   string    `json:"membership_type,omitempty"`
+	ExpiryDate       string    `json:"expiry_date,omitempty"`
+	MembershipStatus string    `json:"membership_status,omitempty"`
 }
 
 type UserFromHeaders struct {

multipass/internal/services/authentik.go

@@ -24,14 +24,15 @@ type AuthentikClient struct {
 
 // AuthentikUserResponse represents the response from Authentik's user API
 type AuthentikUserResponse struct {
-	ID        int      `json:"pk"`
-	Username  string   `json:"username"`
-	Name      string   `json:"name"`
-	Email     string   `json:"email"`
-	IsActive  bool     `json:"is_active"`
-	LastLogin string   `json:"last_login"`
-	Groups    []string `json:"groups"`
-	Avatar    string   `json:"avatar"`
+	ID         int                    `json:"pk"`
+	Username   string                 `json:"username"`
+	Name       string                 `json:"name"`
+	Email      string                 `json:"email"`
+	IsActive   bool                   `json:"is_active"`
+	LastLogin  string                 `json:"last_login"`
+	Groups     []string               `json:"groups"`
+	Avatar     string                 `json:"avatar"`
+	Attributes map[string]interface{} `json:"attributes"`
 }
 
 // NewAuthentikClient creates a new Authentik API client
@@ -230,6 +231,12 @@ func (ac *AuthentikClient) GetUserByEmail(email string) (*models.UserProfile, er
 		return createUserProfileFromAuthentikUser(ac, authUser)
 	}
 
+	// Check if we have any results
+	if len(paginatedResponse.Results) == 0 {
+		log.Printf("[ERROR] No user found with email: %s in paginated response", email)
+		return nil, errors.New("user not found")
+	}
+
 	// Get first user from paginated response
 	authUser := paginatedResponse.Results[0]
 	log.Printf("[DEBUG] Found user by email in paginated response: %s (ID: %d)", authUser.Name, authUser.ID)
@@ -264,6 +271,36 @@ func createUserProfileFromAuthentikUser(ac *AuthentikClient, authUser AuthentikU
 		userProfile.Avatar = &authUser.Avatar
 	}
 
+	// Extract user attributes/metadata
+	if authUser.Attributes != nil {
+		// Log available attributes for debugging
+		log.Printf("[DEBUG] User attributes for %s: %v", authUser.Email, authUser.Attributes)
+
+		// Extract member_since if available
+		if memberSince, ok := authUser.Attributes["member_since"].(string); ok {
+			log.Printf("[DEBUG] Found member_since attribute: %s", memberSince)
+			userProfile.MemberSince = memberSince
+		}
+		
+		// Extract membership_type if available
+		if membershipType, ok := authUser.Attributes["membership_type"].(string); ok {
+			log.Printf("[DEBUG] Found membership_type attribute: %s", membershipType)
+			userProfile.MembershipType = membershipType
+		}
+		
+		// Extract expiry_date if available
+		if expiryDate, ok := authUser.Attributes["expiry_date"].(string); ok {
+			log.Printf("[DEBUG] Found expiry_date attribute: %s", expiryDate)
+			userProfile.ExpiryDate = expiryDate
+		}
+		
+		// Extract membership_status if available
+		if status, ok := authUser.Attributes["membership_status"].(string); ok {
+			log.Printf("[DEBUG] Found membership_status attribute: %s", status)
+			userProfile.MembershipStatus = status
+		}
+	}
+
 	return userProfile, nil
 }