✨ Better Dashboard

pkg/server/accounts_api.go

@@ -27,6 +27,34 @@ func getPrincipal(c *fiber.Ctx) error {
 	return c.JSON(data)
 }
 
+func getEvents(c *fiber.Ctx) error {
+	user := c.Locals("principal").(models.Account)
+	take := c.QueryInt("take", 0)
+	offset := c.QueryInt("offset", 0)
+
+	var count int64
+	var events []models.ActionEvent
+	if err := database.C.
+		Where(&models.ActionEvent{AccountID: user.ID}).
+		Model(&models.ActionEvent{}).
+		Count(&count).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	if err := database.C.
+		Where(&models.ActionEvent{AccountID: user.ID}).
+		Limit(take).
+		Offset(offset).
+		Find(&events).Error; err != nil {
+		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
+	}
+
+	return c.JSON(fiber.Map{
+		"count": count,
+		"data":  events,
+	})
+}
+
 func doRegister(c *fiber.Ctx) error {
 	var data struct {
 		Name       string `json:"name"`

pkg/server/challanges_api.go

@@ -32,6 +32,7 @@ func startChallenge(c *fiber.Ctx) error {
 		return fiber.NewError(fiber.StatusNotFound, err.Error())
 	}
 
+	services.AddEvent(user, "challenges.start", data.ID, c.IP(), c.Get(fiber.HeaderUserAgent))
 	return c.JSON(fiber.Map{
 		"display_name": user.Nick,
 		"challenge":    challenge,
@@ -90,6 +91,7 @@ func doChallenge(c *fiber.Ctx) error {
 func exchangeToken(c *fiber.Ctx) error {
 	var data struct {
 		Code         string `json:"code" form:"code"`
+		RefreshToken string `json:"refresh_token" form:"refresh_token"`
 		ClientID     string `json:"client_id" form:"client_id"`
 		ClientSecret string `json:"client_secret" form:"client_secret"`
 		RedirectUri  string `json:"redirect_uri" form:"redirect_uri"`
@@ -125,7 +127,7 @@ func exchangeToken(c *fiber.Ctx) error {
 		})
 	case "refresh_token":
 		// Refresh Token
-		access, refresh, err := security.RefreshToken(data.Code)
+		access, refresh, err := security.RefreshToken(data.RefreshToken)
 		if err != nil {
 			return fiber.NewError(fiber.StatusBadRequest, err.Error())
 		}

pkg/server/oauth_api.go

@@ -4,6 +4,7 @@ import (
 	"code.smartsheep.studio/hydrogen/passport/pkg/database"
 	"code.smartsheep.studio/hydrogen/passport/pkg/models"
 	"code.smartsheep.studio/hydrogen/passport/pkg/security"
+	"code.smartsheep.studio/hydrogen/passport/pkg/services"
 	"github.com/gofiber/fiber/v2"
 	"github.com/samber/lo"
 	"strings"
@@ -67,13 +68,12 @@ func doConnect(c *fiber.Ctx) error {
 	switch response {
 	case "code":
 		// OAuth Authorization Mode
-		expired := time.Now().Add(7 * 24 * time.Hour)
 		session, err := security.GrantOauthSession(
 			user,
 			client,
 			strings.Split(scope, " "),
 			[]string{"Hydrogen.Passport", client.Alias},
-			&expired,
+			nil,
 			lo.ToPtr(time.Now()),
 			c.IP(),
 			c.Get(fiber.HeaderUserAgent),
@@ -82,6 +82,7 @@ func doConnect(c *fiber.Ctx) error {
 		if err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 		} else {
+			services.AddEvent(user, "oauth.connect", client.Alias, c.IP(), c.Get(fiber.HeaderUserAgent))
 			return c.JSON(fiber.Map{
 				"session":      session,
 				"redirect_uri": redirect,
@@ -89,13 +90,12 @@ func doConnect(c *fiber.Ctx) error {
 		}
 	case "token":
 		// OAuth Implicit Mode
-		expired := time.Now().Add(7 * 24 * time.Hour)
 		session, err := security.GrantOauthSession(
 			user,
 			client,
 			strings.Split(scope, " "),
 			[]string{"Hydrogen.Passport", client.Alias},
-			&expired,
+			nil,
 			lo.ToPtr(time.Now()),
 			c.IP(),
 			c.Get(fiber.HeaderUserAgent),
@@ -106,6 +106,7 @@ func doConnect(c *fiber.Ctx) error {
 		} else if access, refresh, err := security.GetToken(session); err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 		} else {
+			services.AddEvent(user, "oauth.connect", client.Alias, c.IP(), c.Get(fiber.HeaderUserAgent))
 			return c.JSON(fiber.Map{
 				"access_token":  access,
 				"refresh_token": refresh,

pkg/server/startup.go

@@ -25,6 +25,8 @@ func NewServer() {
 	api := A.Group("/api").Name("API")
 	{
 		api.Get("/users/me", auth, getPrincipal)
+		api.Get("/users/me/events", auth, getEvents)
+
 		api.Post("/users", doRegister)
 		api.Post("/users/me/confirm", doRegisterConfirm)