diff --git a/.env.example b/.env.example index 76ca780..a19a2f8 100644 --- a/.env.example +++ b/.env.example @@ -2,8 +2,6 @@ IMAGE_PATH=/tmp REDIRECT_URI=http://localhost:8081/api/auth/callback CLIENT_ID= CLIENT_SECRET= -FRONTEND_URI= -DOMAIN=localhost PORT= # can be either postgres or sqlite diff --git a/internal/api/routes/auth.go b/internal/api/routes/auth.go index 90ef30f..b4a2f38 100644 --- a/internal/api/routes/auth.go +++ b/internal/api/routes/auth.go @@ -38,13 +38,10 @@ func RegisterAuthRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { } // TODO: redirect to dashboard - /*c.JSON(http.StatusOK, gin.H{ + c.JSON(http.StatusOK, gin.H{ "jwt": jwt, "known": res.RowsAffected == 0, }) - */ - c.SetCookie("jwt", jwt, int(t.ExpiresIn), "", cfg.Domain, true, true) - c.Redirect(http.StatusTemporaryRedirect, cfg.FrontendUri) }) api.GET("/auth/me", auth.JwtMiddleware(cfg.JWTSecret), func(c *gin.Context) { diff --git a/internal/api/routes/files.go b/internal/api/routes/files.go index 0d987f4..c54489d 100644 --- a/internal/api/routes/files.go +++ b/internal/api/routes/files.go @@ -48,6 +48,7 @@ func RegisterFileRoutes(cfg *types.StereoConfig, api *gin.RouterGroup) { fileMeta := types.File{ ID: uid + "_" + file.Filename, + Path: filePath, Owner: uid, CreatedAt: time.Now(), Size: file.Size, diff --git a/internal/types/types.go b/internal/types/types.go index abae4ee..505c1fe 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -15,17 +15,16 @@ type Route struct { } type StereoConfig struct { - ImagePath string - Router *gin.Engine - Client client.Client - Database *gorm.DB - JWTSecret string - FrontendUri string - Domain string + ImagePath string + Router *gin.Engine + Client client.Client + Database *gorm.DB + JWTSecret string } type File struct { ID string `gorm:"primaryKey"` + Path string `gorm:"not null;index"` Owner string `gorm:"not null;index"` Size int64 `gorm:"not null;type:bigint"` CreatedAt time.Time `gorm:"autoCreateTime"` diff --git a/main.go b/main.go index 5b58333..92466c0 100644 --- a/main.go +++ b/main.go @@ -54,14 +54,9 @@ func main() { requireEnv("CLIENT_ID"), requireEnv("CLIENT_SECRET"), ), - FrontendUri: requireEnv("FRONTEND_URI"), - Domain: requireEnv("DOMAIN"), JWTSecret: requireEnv("JWT_SECRET"), } - log.Println(c.Domain) - log.Println(c.FrontendUri) - switch databaseType { case "sqlite": db, err := gorm.Open(sqlite.Open(sqliteFile), &gorm.Config{}) @@ -91,6 +86,6 @@ func main() { c.Database.AutoMigrate(&auth.User{}, &types.File{}) api.Register(&c) - fmt.Printf("Running on port %s\n", getEnv("PORT", "8081")) + fmt.Printf("Running on port %s\n", getEnv("PORT", "8080")) c.Router.Run() } diff --git a/testing.md b/testing.md deleted file mode 100644 index eb1e991..0000000 --- a/testing.md +++ /dev/null @@ -1,4 +0,0 @@ -## curl -### uploading - -curl -F "file=@(path_to_test_img)" "http://localhost:8081/api/upload" -H "Authorization: Bearer (jwt here)"