go.mod

@@ -5,14 +5,13 @@ go 1.22
 toolchain go1.22.1
 
 require (
+	git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951
 	git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745
-	git.solsynth.dev/hydrogen/passport v0.0.0-20240623083719-86b2cd81400a
 	github.com/go-playground/validator/v10 v10.17.0
 	github.com/gofiber/contrib/websocket v1.3.0
 	github.com/gofiber/fiber/v2 v2.52.4
 	github.com/gofiber/template/html/v2 v2.1.1
-	github.com/golang-jwt/jwt/v5 v5.2.0
+	github.com/google/uuid v1.6.0
-	github.com/hashicorp/consul/api v1.29.1
 	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
 	github.com/json-iterator/go v1.1.12
 	github.com/livekit/protocol v1.14.0
@@ -54,8 +53,8 @@ require (
 	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/gofiber/template v1.8.3 // indirect
 	github.com/gofiber/utils v1.1.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
+	github.com/hashicorp/consul/api v1.29.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-hclog v1.6.3 // indirect

go.sum

@@ -1,9 +1,7 @@
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951 h1:RgZJK4PXhrjhUX75BclBCg2xfetMkswcMwMqfTBtryQ=
+git.solsynth.dev/hydrogen/dealer v0.0.0-20240716024524-cfb73fde1951/go.mod h1:eZwAwP7ahL7TO8GWBlYFYDdjlna+8zHYbDfNabnuUEU=
 git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745 h1:40BUsQMNXjqHyytkyF9py1HjTAWlRgO6R57YXUrHNy4=
 git.solsynth.dev/hydrogen/paperclip v0.0.0-20240622051057-0f56dba45745/go.mod h1:FsQGSLTl0gvo+9Jmbot02S72suyF9tFTrzDj70Xhifo=
-git.solsynth.dev/hydrogen/passport v0.0.0-20240623081149-7ddbea8bcb86 h1:cxjBOhemnyxf49CJyPmnt1RKFHerK45rXXBPwsIFrhA=
-git.solsynth.dev/hydrogen/passport v0.0.0-20240623081149-7ddbea8bcb86/go.mod h1:tUr7x1v0trG3ALDacdDuhJiPRPgFhJ1Si9OqNlYbgSk=
-git.solsynth.dev/hydrogen/passport v0.0.0-20240623083719-86b2cd81400a h1:oxNbS6Q+sSOfYUQTcx9/awCmlk/lpVP997hgpMmFsyw=
-git.solsynth.dev/hydrogen/passport v0.0.0-20240623083719-86b2cd81400a/go.mod h1:tUr7x1v0trG3ALDacdDuhJiPRPgFhJ1Si9OqNlYbgSk=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -103,8 +101,6 @@ github.com/gofiber/template/html/v2 v2.1.1/go.mod h1:2G0GHHOUx70C1LDncoBpe4T6maQ
 github.com/gofiber/utils v1.1.0 h1:vdEBpn7AzIUJRhe+CiTOJdUcTg4Q9RK+pEa0KPbLdrM=
 github.com/gofiber/utils v1.1.0/go.mod h1:poZpsnhBykfnY1Mc0KeEa6mSHrS3dV0+oBWyeQmb2e0=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/golang-jwt/jwt/v5 v5.2.0 h1:d/ix8ftRUorsN+5eMIlF4T6J8CAt9rch3My2winC1Jw=
-github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=

pkg/internal/gap/client.go

@@ -1,12 +0,0 @@
-package gap
-
-import (
-	"git.solsynth.dev/hydrogen/passport/pkg/hyper"
-	"github.com/spf13/viper"
-)
-
-var H *hyper.HyperConn
-
-func NewHyperClient() {
-	H = hyper.NewHyperConn(viper.GetString("consul.addr"))
-}

pkg/internal/gap/server.go

@@ -2,38 +2,41 @@ package gap
 
 import (
 	"fmt"
-	"strconv"
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
+	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
+	"github.com/rs/zerolog/log"
 	"strings"
 
-	"github.com/hashicorp/consul/api"
 	"github.com/spf13/viper"
 )
 
-func Register() error {
+var H *hyper.HyperConn
-	cfg := api.DefaultConfig()
-	cfg.Address = viper.GetString("consul.addr")
-
-	client, err := api.NewClient(cfg)
-	if err != nil {
-		return err
-	}
 
+func RegisterService() error {
 	grpcBind := strings.SplitN(viper.GetString("grpc_bind"), ":", 2)
+	httpBind := strings.SplitN(viper.GetString("bind"), ":", 2)
 
 	outboundIp, _ := GetOutboundIP()
-	port, _ := strconv.Atoi(grpcBind[1])
 
-	registration := new(api.AgentServiceRegistration)
+	grpcOutbound := fmt.Sprintf("%s:%s", outboundIp, grpcBind[1])
-	registration.ID = viper.GetString("id")
+	httpOutbound := fmt.Sprintf("%s:%s", outboundIp, httpBind[1])
-	registration.Name = "Hydrogen.Messaging"
+
-	registration.Address = outboundIp.String()
+	var err error
-	registration.Port = port
+	H, err = hyper.NewHyperConn(viper.GetString("dealer.addr"), &proto.ServiceInfo{
-	registration.Check = &api.AgentServiceCheck{
+		Id:       viper.GetString("id"),
-		GRPC:                           fmt.Sprintf("%s:%s", outboundIp, grpcBind[1]),
+		Type:     hyper.ServiceTypeMessagingProvider,
-		Timeout:                        "5s",
+		Label:    "Messaging",
-		Interval:                       "1m",
+		GrpcAddr: grpcOutbound,
-		DeregisterCriticalServiceAfter: "3m",
+		HttpAddr: &httpOutbound,
+	})
+	if err == nil {
+		go func() {
+			err := H.KeepRegisterService()
+			if err != nil {
+				log.Error().Err(err).Msg("An error occurred while registering service...")
+			}
+		}()
 	}
 
-	return client.Agent().ServiceRegister(registration)
+	return err
 }

pkg/internal/server/exts/auth.go

@@ -1,13 +1,13 @@
 package exts
 
 import (
+	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/services"
-	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/gofiber/fiber/v2"
 )
 
 func LinkAccountMiddleware(c *fiber.Ctx) error {
-	if val, ok := c.Locals("p_user").(*proto.Userinfo); ok {
+	if val, ok := c.Locals("p_user").(*proto.UserInfo); ok {
 		if account, err := services.LinkAccount(val); err != nil {
 			return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 		} else {

pkg/internal/services/accounts.go

@@ -3,57 +3,69 @@ package services
 import (
 	"context"
 	"fmt"
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
+	jsoniter "github.com/json-iterator/go"
 	"time"
 
+	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/proto"
-	"github.com/spf13/viper"
 )
 
-func GetAccountFriend(userId, relatedId uint, status int) (*proto.FriendshipResponse, error) {
+func CheckUserPerm(userId, otherId uint, key string, val any) error {
 	var user models.Account
 	if err := database.C.Where("id = ?", userId).First(&user).Error; err != nil {
-		return nil, err
+		return fmt.Errorf("account not found: %v", err)
 	}
-	var related models.Account
+	var other models.Account
-	if err := database.C.Where("id = ?", relatedId).First(&related).Error; err != nil {
+	if err := database.C.Where("id = ?", otherId).First(&other).Error; err != nil {
-		return nil, err
+		return fmt.Errorf("other not found: %v", err)
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	encodedData, _ := jsoniter.Marshal(val)
-	if err != nil {
-		return nil, err
-	}
-	return proto.NewFriendshipsClient(pc).GetFriendship(ctx, &proto.FriendshipTwoSideLookupRequest{
-		AccountId: uint64(user.ExternalID),
-		RelatedId: uint64(related.ExternalID),
-		Status:    uint32(status),
-	})
-}
 
-func NotifyAccountMessager(user models.Account, t, s, c string, realtime bool, forcePush bool, links ...*proto.NotifyLink) error {
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-	defer cancel()
-
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
 	if err != nil {
 		return err
 	}
-	_, err = proto.NewNotifyClient(pc).NotifyUser(ctx, &proto.NotifyRequest{
+	out, err := proto.NewAuthClient(pc).EnsureUserPermGranted(ctx, &proto.CheckUserPermRequest{
-		ClientId:     viper.GetString("passport.client_id"),
+		UserId:  uint64(user.ExternalID),
-		ClientSecret: viper.GetString("passport.client_secret"),
+		OtherId: uint64(other.ExternalID),
-		Type:         fmt.Sprintf("messaging.%s", t),
+		Key:     key,
-		Subject:      s,
+		Value:   encodedData,
-		Content:      c,
+	})
-		Links:        links,
+
-		RecipientId:  uint64(user.ExternalID),
+	if err != nil {
+		return err
+	} else if !out.IsValid {
+		return fmt.Errorf("missing permission: %v", key)
+	}
+
+	return nil
+}
+
+func NotifyAccountMessager(user models.Account, title, body string, subtitle *string, realtime bool, forcePush bool) error {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
+	if err != nil {
+		return err
+	}
+	_, err = proto.NewNotifierClient(pc).NotifyUser(ctx, &proto.NotifyUserRequest{
+		UserId: uint64(user.ID),
+		Notify: &proto.NotifyRequest{
+			Topic:       "messaging.message",
+			Title:       title,
+			Subtitle:    subtitle,
+			Body:        body,
 			IsRealtime:  realtime,
 			IsForcePush: forcePush,
+		},
 	})
 
 	return err

pkg/internal/services/attachments.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
 
 	"git.solsynth.dev/hydrogen/paperclip/pkg/proto"
@@ -9,7 +10,7 @@ import (
 )
 
 func CheckAttachmentByIDExists(id uint, usage string) bool {
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
 	if err != nil {
 		return false
 	}

pkg/internal/services/auth.go

@@ -3,14 +3,14 @@ package services
 import (
 	"errors"
 	"fmt"
+	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"gorm.io/gorm"
 	"reflect"
 )
 
-func LinkAccount(userinfo *proto.Userinfo) (models.Account, error) {
+func LinkAccount(userinfo *proto.UserInfo) (models.Account, error) {
 	var account models.Account
 	if userinfo == nil {
 		return account, fmt.Errorf("remote userinfo was not found")

pkg/internal/services/calls.go

@@ -99,9 +99,9 @@ func NewCall(channel models.Channel, founder models.ChannelMember) (models.Call,
 		for _, member := range members {
 			if member.ID != call.Founder.ID {
 				err = NotifyAccountMessager(member.Account,
-					"incomingCall",
 					fmt.Sprintf("Call in #%s", channel.Alias),
 					fmt.Sprintf("%s started a new call", call.Founder.Account.Name),
+					nil,
 					false,
 					true,
 				)

pkg/internal/services/channel_members.go

@@ -33,8 +33,8 @@ func GetChannelMember(user models.Account, channelId uint) (models.ChannelMember
 }
 
 func AddChannelMemberWithCheck(user models.Account, target models.Channel) error {
-	if _, err := GetAccountFriend(user.ID, target.AccountID, 1); err != nil {
+	if err := CheckUserPerm(user.ID, target.AccountID, "ChannelAdd", true); err != nil {
-		return fmt.Errorf("you only can invite your friends to your channel")
+		return fmt.Errorf("unable to add user into your channel")
 	}
 
 	member := models.ChannelMember{

pkg/internal/services/events.go

@@ -136,9 +136,9 @@ func NotifyMessageEvent(members []models.ChannelMember, event models.Event) {
 			}
 
 			err := NotifyAccountMessager(member.Account,
-				"incomingMessage",
 				fmt.Sprintf("%s in %s", event.Sender.Account.Nick, channelDisplay),
 				fmt.Sprintf("%s", displayText),
+				nil,
 				true,
 				false,
 			)

pkg/internal/services/jwt.go

@@ -1,81 +0,0 @@
-package services
-
-import (
-	"fmt"
-	"github.com/gofiber/fiber/v2"
-	"time"
-
-	"github.com/golang-jwt/jwt/v5"
-	"github.com/spf13/viper"
-)
-
-type PayloadClaims struct {
-	jwt.RegisteredClaims
-
-	Type string `json:"typ"`
-}
-
-const (
-	JwtAccessType  = "access"
-	JwtRefreshType = "refresh"
-)
-
-const (
-	CookieAccessKey  = "identity_auth_key"
-	CookieRefreshKey = "identity_refresh_key"
-)
-
-func EncodeJwt(id string, typ, sub string, aud []string, exp time.Time) (string, error) {
-	tk := jwt.NewWithClaims(jwt.SigningMethodHS512, PayloadClaims{
-		jwt.RegisteredClaims{
-			Subject:   sub,
-			Audience:  aud,
-			Issuer:    fmt.Sprintf("https://%s", viper.GetString("domain")),
-			ExpiresAt: jwt.NewNumericDate(exp),
-			NotBefore: jwt.NewNumericDate(time.Now()),
-			IssuedAt:  jwt.NewNumericDate(time.Now()),
-			ID:        id,
-		},
-		typ,
-	})
-
-	return tk.SignedString([]byte(viper.GetString("secret")))
-}
-
-func DecodeJwt(str string) (PayloadClaims, error) {
-	var claims PayloadClaims
-	tk, err := jwt.ParseWithClaims(str, &claims, func(token *jwt.Token) (interface{}, error) {
-		if _, ok := token.Method.(*jwt.SigningMethodHMAC); !ok {
-			return nil, fmt.Errorf("unexpected signing method: %v", token.Header["alg"])
-		}
-		return []byte(viper.GetString("secret")), nil
-	})
-	if err != nil {
-		return claims, err
-	}
-
-	if data, ok := tk.Claims.(*PayloadClaims); ok {
-		return *data, nil
-	} else {
-		return claims, fmt.Errorf("unexpected token payload: not payload claims type")
-	}
-}
-
-func SetJwtCookieSet(c *fiber.Ctx, access, refresh string) {
-	c.Cookie(&fiber.Cookie{
-		Name:     CookieAccessKey,
-		Value:    access,
-		Domain:   viper.GetString("security.cookie_domain"),
-		SameSite: viper.GetString("security.cookie_samesite"),
-		Expires:  time.Now().Add(60 * time.Minute),
-		Path:     "/",
-	})
-	c.Cookie(&fiber.Cookie{
-		Name:     CookieRefreshKey,
-		Value:    refresh,
-		Domain:   viper.GetString("security.cookie_domain"),
-		SameSite: viper.GetString("security.cookie_samesite"),
-		Expires:  time.Now().Add(24 * 30 * time.Hour),
-		Path:     "/",
-	})
-}

pkg/internal/services/realms.go

@@ -4,10 +4,11 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"git.solsynth.dev/hydrogen/dealer/pkg/hyper"
+	"git.solsynth.dev/hydrogen/dealer/pkg/proto"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/gap"
 	"git.solsynth.dev/hydrogen/messaging/pkg/internal/models"
-	"git.solsynth.dev/hydrogen/passport/pkg/proto"
 	"github.com/samber/lo"
 	"gorm.io/gorm"
 	"reflect"
@@ -15,11 +16,11 @@ import (
 
 func GetRealmWithExtID(id uint) (models.Realm, error) {
 	var realm models.Realm
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
 	if err != nil {
 		return realm, err
 	}
-	response, err := proto.NewRealmsClient(pc).GetRealm(context.Background(), &proto.RealmLookupRequest{
+	response, err := proto.NewRealmClient(pc).GetRealm(context.Background(), &proto.LookupRealmRequest{
 		Id: lo.ToPtr(uint64(id)),
 	})
 	if err != nil {
@@ -30,11 +31,11 @@ func GetRealmWithExtID(id uint) (models.Realm, error) {
 
 func GetRealmWithAlias(alias string) (models.Realm, error) {
 	var realm models.Realm
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
 	if err != nil {
 		return realm, err
 	}
-	response, err := proto.NewRealmsClient(pc).GetRealm(context.Background(), &proto.RealmLookupRequest{
+	response, err := proto.NewRealmClient(pc).GetRealm(context.Background(), &proto.LookupRealmRequest{
 		Alias: &alias,
 	})
 	if err != nil {
@@ -43,16 +44,16 @@ func GetRealmWithAlias(alias string) (models.Realm, error) {
 	return LinkRealm(response)
 }
 
-func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, error) {
+func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberInfo, error) {
 	var realm models.Realm
 	if err := database.C.Where("id = ?", realmId).First(&realm).Error; err != nil {
 		return nil, err
 	}
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
 	if err != nil {
 		return nil, err
 	}
-	response, err := proto.NewRealmsClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
+	response, err := proto.NewRealmClient(pc).GetRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
 		RealmId: uint64(realm.ExternalID),
 		UserId:  lo.ToPtr(uint64(userId)),
 	})
@@ -63,12 +64,12 @@ func GetRealmMember(realmId uint, userId uint) (*proto.RealmMemberResponse, erro
 	}
 }
 
-func ListRealmMember(realmId uint) ([]*proto.RealmMemberResponse, error) {
+func ListRealmMember(realmId uint) ([]*proto.RealmMemberInfo, error) {
-	pc, err := gap.H.DiscoverServiceGRPC("Hydrogen.Passport")
+	pc, err := gap.H.GetServiceGrpcConn(hyper.ServiceTypeAuthProvider)
 	if err != nil {
 		return nil, err
 	}
-	response, err := proto.NewRealmsClient(pc).ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
+	response, err := proto.NewRealmClient(pc).ListRealmMember(context.Background(), &proto.RealmMemberLookupRequest{
 		RealmId: uint64(realmId),
 	})
 	if err != nil {
@@ -78,7 +79,7 @@ func ListRealmMember(realmId uint) ([]*proto.RealmMemberResponse, error) {
 	}
 }
 
-func LinkRealm(info *proto.RealmResponse) (models.Realm, error) {
+func LinkRealm(info *proto.RealmInfo) (models.Realm, error) {
 	var realm models.Realm
 	if info == nil {
 		return realm, fmt.Errorf("remote realm info was not found")

pkg/main.go

@@ -44,12 +44,10 @@ func main() {
 	}
 
 	// Connect other services
-	services.SetupLiveKit()
+	if err := gap.RegisterService(); err != nil {
-	if err := gap.Register(); err != nil {
 		log.Fatal().Err(err).Msg("An error occurred when connecting to consul...")
-	} else {
-		gap.NewHyperClient()
 	}
+	services.SetupLiveKit()
 
 	// Server
 	server.NewServer()

settings.toml

@@ -7,11 +7,11 @@ grpc_bind = "0.0.0.0:7447"
 domain = "im.solsynth.dev"
 secret = "LtTjzAGFLshwXhN4ZD4nG5KlMv1MWcsvfv03TSZYnT1VhiAnLIZFTnHUwR0XhGgi"
 
-[consul]
+[dealer]
-addr = "127.0.0.1:8500"
+addr = "127.0.0.1:7442"
 
 [debug]
-database = true
+database = false
 print_routes = false
 
 [calling]