HyperNet/Messaging
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

⬆️ Upgrade Passport

Browse Source
This commit is contained in:
LittleSheep
2024-05-05 00:39:59 +08:00
parent 3929f502ec
commit e6407bbe4d
16 changed files with 159 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/server/auth.go
View File

@ -3,14 +3,13 @@ package server
import (
"strings"
"git.solsynth.dev/hydrogen/messaging/pkg/security"
"git.solsynth.dev/hydrogen/messaging/pkg/services"
"github.com/gofiber/fiber/v2"
)
func authMiddleware(c *fiber.Ctx) error {
var token string
if cookie := c.Cookies(security.CookieAccessKey); len(cookie) > 0 {
if cookie := c.Cookies(services.CookieAccessKey); len(cookie) > 0 {
token = cookie
}
if header := c.Get(fiber.HeaderAuthorization); len(header) > 0 {
@ -42,10 +41,10 @@ func authFunc(c *fiber.Ctx, overrides ...string) error {
}
}
rtk := c.Cookies(security.CookieRefreshKey)
rtk := c.Cookies(services.CookieRefreshKey)
if user, atk, rtk, err := services.Authenticate(token, rtk); err == nil {
if atk != token {
security.SetJwtCookieSet(c, atk, rtk)
services.SetJwtCookieSet(c, atk, rtk)
}
c.Locals("principal", user)
return nil

35
pkg/server/channel_members_api.go
View File

@ -1,6 +1,7 @@
package server
import (
"fmt"
"git.solsynth.dev/hydrogen/messaging/pkg/database"
"git.solsynth.dev/hydrogen/messaging/pkg/models"
"git.solsynth.dev/hydrogen/messaging/pkg/services"
@ -22,7 +23,7 @@ func listChannelMembers(c *fiber.Ctx) error {
}
}
func inviteChannel(c *fiber.Ctx) error {
func addChannelMember(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")
@ -49,14 +50,14 @@ func inviteChannel(c *fiber.Ctx) error {
return fiber.NewError(fiber.StatusNotFound, err.Error())
}
if err := services.InviteChannelMember(account, channel); err != nil {
if err := services.AddChannelMemberWithCheck(account, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)
}
}
func kickChannel(c *fiber.Ctx) error {
func removeChannelMember(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")
@ -124,6 +125,34 @@ func editChannelMembership(c *fiber.Ctx) error {
}
}
func joinChannel(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")
var channel models.Channel
if err := database.C.Where(&models.Channel{
Alias: alias,
}).First(&channel).Error; err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
} else if _, _, err := services.GetAvailableChannel(channel.ID, user); err == nil {
return fiber.NewError(fiber.StatusBadRequest, "you already joined the channel")
} else if channel.RealmID == nil {
return fiber.NewError(fiber.StatusBadRequest, "you was impossible to join a channel without related realm")
}
if realm, err := services.GetRealm(channel.ID); err != nil {
return fiber.NewError(fiber.StatusInternalServerError, fmt.Sprintf("invalid channel, related realm was not found: %v", err))
} else if _, err := services.GetRealmMember(realm.ID, user.ExternalID); err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("you are not a part of the realm: %v", err))
}
if err := services.AddChannelMember(user, channel); err != nil {
return fiber.NewError(fiber.StatusBadRequest, err.Error())
} else {
return c.SendStatus(fiber.StatusOK)
}
}
func leaveChannel(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")

5
pkg/server/messages_api.go
View File

@ -9,6 +9,7 @@ import (
)
func listMessage(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
take := c.QueryInt("take", 0)
offset := c.QueryInt("offset", 0)
alias := c.Params("channel")
@ -16,6 +17,8 @@ func listMessage(c *fiber.Ctx) error {
channel, err := services.GetChannelWithAlias(alias)
if err != nil {
return fiber.NewError(fiber.StatusNotFound, err.Error())
} else if _, _, err := services.GetAvailableChannel(channel.ID, user); err != nil {
return fiber.NewError(fiber.StatusForbidden, fmt.Sprintf("you need join the channel before you read the messages: %v", err))
}
count := services.CountMessage(channel)
@ -30,7 +33,7 @@ func listMessage(c *fiber.Ctx) error {
})
}
func newTextMessage(c *fiber.Ctx) error {
func newMessage(c *fiber.Ctx) error {
user := c.Locals("principal").(models.Account)
alias := c.Params("channel")

11
pkg/server/startup.go
View File

@ -88,12 +88,13 @@ func NewServer() {
channels.Get("/:channel/members", listChannelMembers)
channels.Put("/:channel/members", authMiddleware, editChannelMembership)
channels.Post("/:channel/invite", authMiddleware, inviteChannel)
channels.Post("/:channel/kick", authMiddleware, kickChannel)
channels.Post("/:channel/leave", authMiddleware, leaveChannel)
channels.Post("/:channel/members", authMiddleware, addChannelMember)
channels.Post("/:channel/members/me", authMiddleware, joinChannel)
channels.Delete("/:channel/members", authMiddleware, removeChannelMember)
channels.Delete("/:channel/members/me", authMiddleware, leaveChannel)
channels.Get("/:channel/messages", listMessage)
channels.Post("/:channel/messages", authMiddleware, newTextMessage)
channels.Get("/:channel/messages", authMiddleware, listMessage)
channels.Post("/:channel/messages", authMiddleware, newMessage)
channels.Put("/:channel/messages/:messageId", authMiddleware, editMessage)
channels.Delete("/:channel/messages/:messageId", authMiddleware, deleteMessage)