diff --git a/.env b/.env new file mode 100644 index 0000000..880a247 --- /dev/null +++ b/.env @@ -0,0 +1,11 @@ +# Used when creating a JWT. It can be anything. +API_SECRET=nyEX8BZ44KqTXeV2 + +API_PORT=3800 +API_RELEASE="Desenvolvimento" +DB_HOST=191.252.214.157 +DB_DRIVER=postgres +DB_USER=auth +DB_PASSWORD=@407Smc837 +DB_NAME=auth +DB_PORT=5432 diff --git a/database/database.go b/database/database.go new file mode 100644 index 0000000..85f0f74 --- /dev/null +++ b/database/database.go @@ -0,0 +1,97 @@ +package database + +import ( + "api/globals" + // "api/models" + // "api/utils" + "fmt" + "log" + "os" + + "github.com/joho/godotenv" + + "gorm.io/driver/postgres" + "gorm.io/gorm" +) + +// Our database +var DB *gorm.DB + +// ConnectDB - returns a pointer to a new database connection +func ConnectDB() error { + var erre error + + log.Println("Getting environment values") + erre = godotenv.Load() + if erre != nil { + log.Printf("Error getting env, not comming through %v\n", erre) + return erre + } + + globals.API_RELEASE = os.Getenv("API_RELEASE") + + DBURL := fmt.Sprintf("%s://%s:%s@%s:%s/%s", os.Getenv("DB_DRIVER"), os.Getenv("DB_USER"), os.Getenv("DB_PASSWORD"), os.Getenv("DB_HOST"), os.Getenv("DB_PORT"), os.Getenv("DB_NAME")) + + log.Println("Opening connection to database") + + db, err := gorm.Open(postgres.Open(DBURL), &gorm.Config{}) + + if err != nil { + return err + } + + log.Println("Migrating database tables") + + // if result := db.AutoMigrate(&models.User{}); result != nil { + // return result + // } + + // if result := db.AutoMigrate(&models.Event{}); result != nil { + // return result + // } + + // if result := db.AutoMigrate(&models.Server{}); result != nil { + // return result + // } + + // Count how many servers we have on the database. If none, creates our initial server. + // var servers []models.Server + + // db.Find(&servers) + + // if len(servers) == 0 { + // server := models.Server{ + // Name: "Pcast Main Server", + // IP: "177.153.50.98", + // } + + // db.Create(&server) + // } + + // Count how many users we have on the database. If none, creates our initial admin user. + // var users []models.User + + // db.Find(&users) + + // if len(users) == 0 { + // passwd, _ := utils.HashPassword("123456") + + // user := models.User{ + // Name: "Pcast Admin", + // Email: "pcast@pcast.com.br", + // CompanyName: "PCast", + // Password: passwd, + // Channel: "PCast", + // UserType: "A", + // Blocked: "N", + // Cancelled: "N", + // CreatedBy: "Auto", + // } + + // db.Create(&user) + // } + + DB = db + + return nil +} diff --git a/globals/globals.go b/globals/globals.go new file mode 100644 index 0000000..729a913 --- /dev/null +++ b/globals/globals.go @@ -0,0 +1,6 @@ +package globals + +var ( + API_VERSION = "1.0.0" + API_RELEASE = "" +) diff --git a/go.mod b/go.mod index 3c5cfaa..fb28b70 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,21 @@ module api go 1.20 -require github.com/gofiber/fiber/v2 v2.48.0 +require ( + github.com/gofiber/fiber/v2 v2.48.0 + github.com/joho/godotenv v1.5.1 + gorm.io/driver/postgres v1.5.2 + gorm.io/gorm v1.25.3 +) require ( github.com/andybalholm/brotli v1.0.5 // indirect github.com/google/uuid v1.3.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect + github.com/jackc/pgx/v5 v5.3.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect github.com/klauspost/compress v1.16.3 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect @@ -15,5 +25,7 @@ require ( github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasthttp v1.48.0 // indirect github.com/valyala/tcplisten v1.0.0 // indirect + golang.org/x/crypto v0.8.0 // indirect golang.org/x/sys v0.10.0 // indirect + golang.org/x/text v0.9.0 // indirect ) diff --git a/go.sum b/go.sum index 6841e01..74ecfcc 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,23 @@ github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs= github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/gofiber/fiber/v2 v2.48.0 h1:cRVMCb9aUJDsyHxGFLwz/sGzDggdailZZyptU9F9cU0= github.com/gofiber/fiber/v2 v2.48.0/go.mod h1:xqJgfqrc23FJuqGOW6DVgi3HyZEm2Mn9pRqUb2kHSX8= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU= +github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -13,15 +27,32 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.48.0 h1:oJWvHb9BIZToTQS3MuQ2R3bJZiNSa2KiNdeI8A+79Tc= github.com/valyala/fasthttp v1.48.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8= github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= +golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0= +gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8= +gorm.io/gorm v1.25.3 h1:zi4rHZj1anhZS2EuEODMhDisGy+Daq9jtPrNGgbQYD8= +gorm.io/gorm v1.25.3/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= diff --git a/main.go b/main.go index d86fc4a..dbe84cf 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,10 @@ package main import ( + "api/database" "api/routes" + "log" + "os" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/cors" @@ -9,6 +12,10 @@ import ( func main() { + if err := database.ConnectDB(); err != nil { + panic("Could not connect to database") + } + app := fiber.New(fiber.Config{ StrictRouting: false, DisableStartupMessage: true, @@ -23,6 +30,7 @@ func main() { routes.Setup(app) + log.Println("Server started in port " + os.Getenv("API_PORT")) if err := app.Listen(":3800"); err != nil { panic(err) } diff --git a/routes/setup_routes.go b/routes/setup_routes.go index 127ae88..07a3fad 100644 --- a/routes/setup_routes.go +++ b/routes/setup_routes.go @@ -5,4 +5,5 @@ import "github.com/gofiber/fiber/v2" func Setup(app *fiber.App) { app.Get("/", GetVersion) + } diff --git a/routes/version_route.go b/routes/version_route.go index 16b2634..abfe876 100644 --- a/routes/version_route.go +++ b/routes/version_route.go @@ -1,6 +1,8 @@ package routes import ( + "api/globals" + "github.com/gofiber/fiber/v2" ) @@ -8,10 +10,12 @@ func GetVersion(c *fiber.Ctx) error { type Version struct { Version string `json:"version"` + Release string `json:"release"` } v := Version{ - Version: "1.0.0", + Version: globals.API_VERSION, + Release: globals.API_RELEASE, } return c.JSON(v)