🐛 Fix attachment transfer issue

pkg/cmd/main.go

@@ -43,7 +43,7 @@ func main() {
 	// Connect other services
 	go func() {
 		if err := grpc.ConnectPassport(); err != nil {
-			log.Fatal().Err(err).Msg("An error occurred when connecting to identity grpc endpoint...")
+			log.Fatal().Err(err).Msg("An error occurred when connecting to passport grpc endpoint...")
 		}
 	}()
 

pkg/grpc/client.go

@@ -1,7 +1,7 @@
 package grpc
 
 import (
-	idpb "git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
+	idpb "git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"google.golang.org/grpc/credentials/insecure"
 
 	"github.com/spf13/viper"
@@ -13,7 +13,7 @@ var Notify idpb.NotifyClient
 var Auth idpb.AuthClient
 
 func ConnectPassport() error {
-	addr := viper.GetString("identity.grpc_endpoint")
+	addr := viper.GetString("passport.grpc_endpoint")
 	if conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials())); err != nil {
 		return err
 	} else {

pkg/security/jwt.go

@@ -21,8 +21,8 @@ const (
 )
 
 const (
-	CookieAccessKey  = "identity_auth_key"
-	CookieRefreshKey = "identity_refresh_key"
+	CookieAccessKey  = "passport_auth_key"
+	CookieRefreshKey = "passport_refresh_key"
 )
 
 func EncodeJwt(id string, typ, sub string, aud []string, exp time.Time) (string, error) {

pkg/server/attachments_api.go

@@ -13,7 +13,7 @@ func readAttachment(c *fiber.Ctx) error {
 	id := c.Params("fileId")
 	basepath := viper.GetString("content")
 
-	return c.SendFile(filepath.Join(basepath, id))
+	return c.SendFile(filepath.Join(basepath, id), true)
 }
 
 func uploadAttachment(c *fiber.Ctx) error {

pkg/server/startup.go

@@ -2,20 +2,17 @@ package server
 
 import (
 	"git.solsynth.dev/hydrogen/interactive/pkg"
-	"github.com/gofiber/fiber/v2/middleware/favicon"
-	"net/http"
-	"strings"
-	"time"
-
 	"github.com/gofiber/fiber/v2"
-	"github.com/gofiber/fiber/v2/middleware/cache"
 	"github.com/gofiber/fiber/v2/middleware/cors"
+	"github.com/gofiber/fiber/v2/middleware/favicon"
 	"github.com/gofiber/fiber/v2/middleware/idempotency"
 	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/template/html/v2"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/viper"
+	"net/http"
+	"strings"
 )
 
 var A *fiber.App
@@ -68,10 +65,7 @@ func NewServer() {
 		api.Get("/users/:accountId/follow", authMiddleware, getAccountFollowed)
 		api.Post("/users/:accountId/follow", authMiddleware, doFollowAccount)
 
-		api.Get("/attachments/o/:fileId", cache.New(cache.Config{
-			Expiration:   365 * 24 * time.Hour,
-			CacheControl: true,
-		}), readAttachment)
+		api.Get("/attachments/o/:fileId", readAttachment)
 		api.Post("/attachments", authMiddleware, uploadAttachment)
 		api.Delete("/attachments/:id", authMiddleware, deleteAttachment)
 

pkg/server/well_known_api.go

@@ -10,7 +10,7 @@ func getMetadata(c *fiber.Ctx) error {
 		"name":   viper.GetString("name"),
 		"domain": viper.GetString("domain"),
 		"components": fiber.Map{
-			"identity": viper.GetString("identity.endpoint"),
+			"passport": viper.GetString("passport.endpoint"),
 		},
 	})
 }

pkg/services/accounts.go

@@ -2,10 +2,10 @@ package services
 
 import (
 	"context"
-	"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
 	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
 	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"github.com/spf13/viper"
 	"time"
 )
@@ -59,8 +59,8 @@ func NotifyAccount(user models.Account, subject, content string, realtime bool,
 	defer cancel()
 
 	_, err := grpc.Notify.NotifyUser(ctx, &proto.NotifyRequest{
-		ClientId:     viper.GetString("identity.client_id"),
-		ClientSecret: viper.GetString("identity.client_secret"),
+		ClientId:     viper.GetString("passport.client_id"),
+		ClientSecret: viper.GetString("passport.client_secret"),
 		Subject:      subject,
 		Content:      content,
 		Links:        links,

pkg/services/auth.go

@@ -7,10 +7,10 @@ import (
 	"reflect"
 	"time"
 
-	"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
 	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/grpc"
 	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"gorm.io/gorm"
 )
 

pkg/services/comments.go

@@ -2,7 +2,7 @@ package services
 
 import (
 	"fmt"
-	"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
+	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"github.com/rs/zerolog/log"
 	"time"
 

pkg/services/posts.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"time"
 
-	"git.solsynth.dev/hydrogen/identity/pkg/grpc/proto"
 	"git.solsynth.dev/hydrogen/interactive/pkg/database"
 	"git.solsynth.dev/hydrogen/interactive/pkg/models"
+	"git.solsynth.dev/hydrogen/passport/pkg/grpc/proto"
 	"github.com/rs/zerolog/log"
 	"github.com/samber/lo"
 	"github.com/spf13/viper"