Added functionality to user page

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="GoDfaErrorMayBeNotNil" enabled="true" level="WARNING" enabled_by_default="true">
+      <methods>
+        <method importPath="github.com/fossyy/filekeeper/session" receiver="*StoreSession" name="Get" />
+      </methods>
+    </inspection_tool>
+  </profile>
+</component>

db/model/user/user.go

@@ -4,23 +4,31 @@ import (
 	"fmt"
 	"github.com/fossyy/filekeeper/db"
 	"github.com/fossyy/filekeeper/logger"
-	"github.com/fossyy/filekeeper/types"
+	"github.com/google/uuid"
 	"sync"
 	"time"
 )
 
 type Cache struct {
-	users map[string]*types.UserWithExpired
+	users map[string]*UserWithExpired
 	mu    sync.Mutex
 }
 
+type UserWithExpired struct {
+	UserID   uuid.UUID
+	Username string
+	Email    string
+	Password string
+	AccessAt time.Time
+}
+
 var log *logger.AggregatedLogger
 var UserCache *Cache
 
 func init() {
 	log = logger.Logger()
 
-	UserCache = &Cache{users: make(map[string]*types.UserWithExpired)}
+	UserCache = &Cache{users: make(map[string]*UserWithExpired)}
 	ticker := time.NewTicker(time.Hour * 8)
 
 	go func() {
@@ -44,7 +52,7 @@ func init() {
 	}()
 }
 
-func Get(email string) (*types.UserWithExpired, error) {
+func Get(email string) (*UserWithExpired, error) {
 	UserCache.mu.Lock()
 	defer UserCache.mu.Unlock()
 
@@ -52,13 +60,13 @@ func Get(email string) (*types.UserWithExpired, error) {
 		return user, nil
 	}
 
-	var userData types.UserWithExpired
+	var userData UserWithExpired
 	err := db.DB.Table("users").Where("email = ?", email).First(&userData).Error
 	if err != nil {
 		return nil, err
 	}
 
-	UserCache.users[email] = &types.UserWithExpired{
+	UserCache.users[email] = &UserWithExpired{
 		UserID:   userData.UserID,
 		Username: userData.Username,
 		Email:    userData.Email,

handler/signin/signin.go

@@ -9,6 +9,7 @@ import (
 	"github.com/fossyy/filekeeper/utils"
 	signinView "github.com/fossyy/filekeeper/view/signin"
 	"net/http"
+	"strings"
 )
 
 var log *logger.AggregatedLogger
@@ -64,8 +65,21 @@ func POST(w http.ResponseWriter, r *http.Request) {
 			Authenticated: true,
 		}
 
+		userAgent := r.Header.Get("User-Agent")
+		browserInfo, osInfo := parseUserAgent(userAgent)
+
+		sessionInfo := session.SessionInfo{
+			SessionID: storeSession.ID,
+			Browser:   browserInfo["browser"],
+			Version:   browserInfo["version"],
+			OS:        osInfo["os"],
+			OSVersion: osInfo["version"],
+			IP:        utils.ClientIP(r),
+			Location:  "Indonesia",
+		}
+
 		storeSession.Save(w)
-		session.AppendSession(email, storeSession)
+		session.AppendSession(email, &sessionInfo)
 
 		cookie, err := r.Cookie("redirect")
 		if errors.Is(err, http.ErrNoCookie) {
@@ -90,3 +104,64 @@ func POST(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 }
+
+func parseUserAgent(userAgent string) (map[string]string, map[string]string) {
+	browserInfo := make(map[string]string)
+	osInfo := make(map[string]string)
+	if strings.Contains(userAgent, "Firefox") {
+		browserInfo["browser"] = "Firefox"
+		parts := strings.Split(userAgent, "Firefox/")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], " ")[0]
+			browserInfo["version"] = version
+		}
+	} else if strings.Contains(userAgent, "Chrome") {
+		browserInfo["browser"] = "Chrome"
+		parts := strings.Split(userAgent, "Chrome/")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], " ")[0]
+			browserInfo["version"] = version
+		}
+	} else {
+		browserInfo["browser"] = "Unknown"
+		browserInfo["version"] = "Unknown"
+	}
+
+	if strings.Contains(userAgent, "Windows") {
+		osInfo["os"] = "Windows"
+		parts := strings.Split(userAgent, "Windows ")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], ";")[0]
+			osInfo["version"] = version
+		}
+	} else if strings.Contains(userAgent, "Macintosh") {
+		osInfo["os"] = "Mac OS"
+		parts := strings.Split(userAgent, "Mac OS X ")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], ";")[0]
+			osInfo["version"] = version
+		}
+	} else if strings.Contains(userAgent, "Linux") {
+		osInfo["os"] = "Linux"
+		osInfo["version"] = "Unknown"
+	} else if strings.Contains(userAgent, "Android") {
+		osInfo["os"] = "Android"
+		parts := strings.Split(userAgent, "Android ")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], ";")[0]
+			osInfo["version"] = version
+		}
+	} else if strings.Contains(userAgent, "iPhone") || strings.Contains(userAgent, "iPad") || strings.Contains(userAgent, "iPod") {
+		osInfo["os"] = "iOS"
+		parts := strings.Split(userAgent, "OS ")
+		if len(parts) > 1 {
+			version := strings.Split(parts[1], " ")[0]
+			osInfo["version"] = version
+		}
+	} else {
+		osInfo["os"] = "Unknown"
+		osInfo["version"] = "Unknown"
+	}
+
+	return browserInfo, osInfo
+}

handler/user/user.go

@@ -34,7 +34,8 @@ func GET(w http.ResponseWriter, r *http.Request) {
 		log.Error(err.Error())
 		return
 	}
-	component := userView.Main("User Page", userSession.Email, userSession.Username)
+
+	component := userView.Main("User Page", userSession.Email, userSession.Username, session.UserSessions[userSession.Email])
 	err = component.Render(r.Context(), w)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)

middleware/middleware.go

@@ -75,6 +75,7 @@ func Auth(next http.HandlerFunc, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	storeSession, err := session.Store.Get(cookie.Value)
+
 	if err != nil {
 		if errors.Is(err, &session.SessionNotFound{}) {
 			storeSession.Destroy(w)
@@ -87,6 +88,7 @@ func Auth(next http.HandlerFunc, w http.ResponseWriter, r *http.Request) {
 	}
 	userSession := GetUser(storeSession)
 	if userSession.Authenticated {
+		session.GetSessionInfo(storeSession.Values["user"].(types.User).Email, cookie.Value).UpdateAccessTime()
 		next.ServeHTTP(w, r)
 		return
 	}

routes/routes.go

@@ -1,6 +1,7 @@
 package routes
 
 import (
+	"encoding/json"
 	downloadHandler "github.com/fossyy/filekeeper/handler/download"
 	downloadFileHandler "github.com/fossyy/filekeeper/handler/download/file"
 	forgotPasswordHandler "github.com/fossyy/filekeeper/handler/forgotPassword"
@@ -15,6 +16,7 @@ import (
 	"github.com/fossyy/filekeeper/handler/upload/initialisation"
 	userHandler "github.com/fossyy/filekeeper/handler/user"
 	"github.com/fossyy/filekeeper/middleware"
+	"github.com/fossyy/filekeeper/session"
 	"net/http"
 )
 
@@ -35,6 +37,10 @@ func SetupRoutes() *http.ServeMux {
 		}
 	})
 
+	handler.HandleFunc("/test", func(w http.ResponseWriter, r *http.Request) {
+		json.NewEncoder(w).Encode(session.Getses())
+	})
+
 	handler.HandleFunc("/signin", func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:

session/session.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 	"strconv"
 	"sync"
+	"time"
 )
 
 type Session struct {
@@ -17,8 +18,21 @@ type StoreSession struct {
 	mu       sync.Mutex
 }
 
+type SessionInfo struct {
+	SessionID string
+	Browser   string
+	Version   string
+	OS        string
+	OSVersion string
+	IP        string
+	Location  string
+	AccessAt  string
+}
+
+type ListSessionInfo map[string][]*SessionInfo
+
 var Store = StoreSession{Sessions: make(map[string]*Session)}
-var userSessions = make(map[string][]string)
+var UserSessions = make(ListSessionInfo)
 
 type SessionNotFound struct{}
 
@@ -68,33 +82,48 @@ func (s *Session) Destroy(w http.ResponseWriter) {
 	})
 }
 
-func AppendSession(email string, session *Session) {
+func AppendSession(email string, sessionInfo *SessionInfo) {
-	userSessions[email] = append(userSessions[email], session.ID)
+	UserSessions[email] = append(UserSessions[email], sessionInfo)
 }
 
 func RemoveSession(email string, id string) {
-	sessions := userSessions[email]
+	sessions := UserSessions[email]
-	var updatedSessions []string
+	var updatedSessions []*SessionInfo
 	for _, userSession := range sessions {
-		if userSession != id {
+		if userSession.SessionID != id {
 			updatedSessions = append(updatedSessions, userSession)
 		}
 	}
 	if len(updatedSessions) > 0 {
-		userSessions[email] = updatedSessions
+		UserSessions[email] = updatedSessions
 		return
 	}
-	delete(userSessions, email)
+	delete(UserSessions, email)
 }
 
 func RemoveAllSession(email string) {
-	sessions := userSessions[email]
+	sessions := UserSessions[email]
 	for _, session := range sessions {
-		delete(Store.Sessions, session)
+		delete(Store.Sessions, session.SessionID)
 	}
-	delete(userSessions, email)
+	delete(UserSessions, email)
 }
 
-func Getses() map[string][]string {
+func GetSessionInfo(email string, id string) *SessionInfo {
-	return userSessions
+	for _, session := range UserSessions[email] {
+		if session.SessionID == id {
+			return session
+		}
+	}
+	return nil
+}
+
+func (user *SessionInfo) UpdateAccessTime() {
+	currentTime := time.Now()
+	formattedTime := currentTime.Format("01-02-2006")
+	user.AccessAt = formattedTime
+}
+
+func Getses() *ListSessionInfo {
+	return &UserSessions
 }

types/types.go

@@ -2,7 +2,6 @@ package types
 
 import (
 	"github.com/google/uuid"
-	"time"
 )
 
 type Message struct {
@@ -17,14 +16,6 @@ type User struct {
 	Authenticated bool
 }
 
-type UserWithExpired struct {
-	UserID   uuid.UUID
-	Username string
-	Email    string
-	Password string
-	AccessAt time.Time
-}
-
 type FileInfo struct {
 	Name  string `json:"name"`
 	Size  int    `json:"size"`

view/user/user.templ

@@ -1,8 +1,11 @@
 package userView
 
-import "github.com/fossyy/filekeeper/view/layout"
+import (
+    "github.com/fossyy/filekeeper/view/layout"
+    "github.com/fossyy/filekeeper/session"
+)
 
-templ content(email string, username string, title string) {
+templ content(email string, username string, title string, ListSession []*session.SessionInfo) {
     @layout.Base(title){
         <main class="container mx-auto px-4 py-12 md:px-6 md:py-16 lg:py-10">
             <div class="grid gap-10 lg:grid-cols-[1fr_300px]">
@@ -107,50 +110,33 @@ templ content(email string, username string, title string) {
                                                 </tr>
                                             </thead>
                                             <tbody class="[&amp;_tr:last-child]:border-0">
+                                                for _, ses := range ListSession {
                                                 <tr
                                                     class="border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted">
-                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">
+                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">{ses.IP}
-                                                        192.168.1.100</td>
-                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">Chrome 89
                                                     </td>
-                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">Desktop
+                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">{ses.Browser + ses.Version}
                                                     </td>
-                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">1 week
+                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">{ses.OS + ses.OSVersion}
-                                                        ago
+                                                    </td>
+                                                    <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">{ses.AccessAt}
                                                     </td>
                                                     <td class="p-4 align-middle [&amp;:has([role=checkbox])]:pr-0">
-                                                        <button
+                                                        <a
                                                             class="hover:bg-gray-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
                                                             type="button" id="radix-:rq:" aria-haspopup="menu"
-                                                            aria-expanded="false" data-state="closed">
+                                                            aria-expanded="false" data-state="closed"
+                                                            href="/">
                                                             Terminate
-                                                            <span class="sr-only">Actions</span>
+                                                        </a>
-                                                        </button>
                                                     </td>
                                                 </tr>
+                                                }
                                             </tbody>
                                         </table>
                                     </div>
                                 </div>
                             </div>
-                            <div class="grid gap-2">
-                                <label
-                                    class="text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                                    for="session-info">
-                                    Session Information
-                                </label>
-                                <div class="bg-gray-100 rounded-md p-4">
-                                    <p>
-                                        Logged in as <span class="font-medium">John Doe</span>
-                                    </p>
-                                    <p>
-                                        Logged in from <span class="font-medium">192.168.1.100</span>
-                                    </p>
-                                    <p>
-                                        Logged in at <span class="font-medium">2023-04-26 15:30:00</span>
-                                    </p>
-                                </div>
-                            </div>
                         </div>
                     </section>
                     <section>
@@ -218,18 +204,32 @@ templ content(email string, username string, title string) {
                         <div class="p-6 grid gap-4">
                             <div class="flex items-center justify-between">
                                 <span>Used</span>
-                                <span>12.5GB</span>
+                                <span>42.0GB</span>
                             </div>
                             <div class="w-full bg-gray-300 rounded-full h-2.5">
                                 <div class="bg-gray-800 h-2.5 rounded-full" style="width: 45%"></div>
                             </div>
                             <div class="flex items-center justify-between">
                                 <span>Available</span>
-                                <span>37.5GB</span>
+                                <span>6.9GB</span>
                             </div>
                             <div class="w-full bg-gray-300 rounded-full h-2.5">
                                 <div class="bg-gray-800 h-2.5 rounded-full" style="width: 100%"></div>
                             </div>
+                            <a
+                                class="hover:bg-gray-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
+                                type="button" id="radix-:rq:" aria-haspopup="menu"
+                                aria-expanded="false" data-state="closed"
+                                href="/upload">
+                                Upload
+                            </a>
+                            <a
+                                class="hover:bg-gray-200 inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
+                                type="button" id="radix-:rq:" aria-haspopup="menu"
+                                aria-expanded="false" data-state="closed"
+                                href="/download">
+                                Download
+                            </a>
                         </div>
                     </div>
                     <div class="rounded-lg border bg-card text-card-foreground shadow-sm" data-v0-t="card">
@@ -262,6 +262,6 @@ templ content(email string, username string, title string) {
     }
 }
 
-templ Main(title string, email string, username string) {
+templ Main(title string, email string, username string, ListSession []*session.SessionInfo) {
-	@content(email, username, title)
+	@content(email, username, title, ListSession)
 }