fix: fixing import

delivery/grpc/auth/handler.go

@@ -7,8 +7,8 @@ package auth
 import (
 	"context"
 
-	app "github.com/isaqueveras/powersso/application/auth"
-	domain "github.com/isaqueveras/powersso/domain/auth"
+	app "github.com/isaqueveras/powersso/application/authentication"
+	domain "github.com/isaqueveras/powersso/domain/authentication"
 	"github.com/isaqueveras/powersso/oops"
 	"github.com/isaqueveras/powersso/utils"
 )

middleware/auth.go

@@ -6,15 +6,16 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v4"
+	"github.com/google/uuid"
 	"github.com/isaqueveras/powersso/config"
-	"github.com/isaqueveras/powersso/domain/auth"
+	"github.com/isaqueveras/powersso/domain/authentication"
 	"github.com/isaqueveras/powersso/tokens"
 )
 
 // Session models the session data
 type Session struct {
-	SessionID string
-	UserID    string
+	SessionID uuid.UUID
+	UserID    uuid.UUID
 	UserLevel string
 	FirstName string
 }
@@ -29,8 +30,8 @@ func GetSession(ctx *gin.Context) *Session {
 
 	value := session.(jwt.MapClaims)
 	return &Session{
-		SessionID: value["SessionID"].(string),
-		UserID:    value["UserID"].(string),
+		SessionID: uuid.MustParse(value["SessionID"].(string)),
+		UserID:    uuid.MustParse(value["UserID"].(string)),
 		UserLevel: value["UserLevel"].(string),
 		FirstName: value["FirstName"].(string),
 	}
@@ -58,7 +59,7 @@ func Auth() gin.HandlerFunc {
 // OnlyAdmin check if the user is an administrator
 func OnlyAdmin() gin.HandlerFunc {
 	return func(ctx *gin.Context) {
-		if GetSession(ctx).UserLevel != string(auth.AdminLevel) {
+		if GetSession(ctx).UserLevel != string(authentication.AdminLevel) {
 			session := GetSession(ctx)
 			log.Printf("WARNING: user (%v - %v) tried to access user tried to access route for administrators only", session.UserID, session.FirstName)
 			ctx.AbortWithStatus(http.StatusForbidden)
@@ -74,7 +75,7 @@ func Yourself() gin.HandlerFunc {
 		session := GetSession(ctx)
 		userIn := ctx.Param("user_id")
 
-		if session.UserID != userIn {
+		if session.UserID.String() != userIn {
 			log.Printf("WARNING: user (%v - %v) tried to access information for user (%v)", session.UserID, session.FirstName, userIn)
 			ctx.AbortWithStatus(http.StatusForbidden)
 			return

scripts/create_user_admin.go

@@ -9,9 +9,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/isaqueveras/powersso/application/auth"
+	app "github.com/isaqueveras/powersso/application/authentication"
 	"github.com/isaqueveras/powersso/database/postgres"
-	domain "github.com/isaqueveras/powersso/domain/auth"
+	domain "github.com/isaqueveras/powersso/domain/authentication"
 	"github.com/isaqueveras/powersso/utils"
 )
 
@@ -26,7 +26,7 @@ func CreateUserAdmin(logg *utils.Logger) {
 	}
 	defer tx.Rollback()
 
-	if _, err = auth.CreateAccount(ctx, &domain.CreateAccount{
+	if _, err = app.CreateAccount(ctx, &domain.CreateAccount{
 		FirstName: utils.Pointer("User Power"),
 		LastName:  utils.Pointer("Admin"),
 		Email:     utils.Pointer("[email protected]"),

server/rest.go

@@ -12,10 +12,10 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/isaqueveras/endless"
 
-	"github.com/isaqueveras/powersso/delivery/http/auth"
-	"github.com/isaqueveras/powersso/delivery/http/box"
-	"github.com/isaqueveras/powersso/delivery/http/permissions"
-	"github.com/isaqueveras/powersso/delivery/http/project"
+	"github.com/isaqueveras/powersso/delivery/http/authentication"
+	"github.com/isaqueveras/powersso/delivery/http/authorization/box"
+	"github.com/isaqueveras/powersso/delivery/http/authorization/organization"
+	"github.com/isaqueveras/powersso/delivery/http/authorization/permission"
 	"github.com/isaqueveras/powersso/middleware"
 )
 
@@ -40,11 +40,11 @@ func (s *Server) ServerHTTP() (err error) {
 	)
 
 	v1 := router.Group("v1")
-	auth.Router(v1.Group("auth"))
-	auth.RouterAuthorization(v1.Group("auth", middleware.Auth()))
-	project.Router(v1.Group("project", middleware.Auth()))
+	authentication.Router(v1.Group("auth"))
+	authentication.RouterAuthorization(v1.Group("auth", middleware.Auth()))
+	organization.Router(v1.Group("organization", middleware.Auth()))
 	box.Router(v1.Group("box", middleware.Auth()))
-	permissions.Router(v1.Group("permission", middleware.Auth()))
+	permission.Router(v1.Group("permission", middleware.Auth()))
 
 	endless.DefaultReadTimeOut = s.cfg.Server.ReadTimeout * time.Second
 	endless.DefaultWriteTimeOut = s.cfg.Server.WriteTimeout * time.Second

tokens/token.go

@@ -7,13 +7,14 @@ package tokens
 import (
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/google/uuid"
+
 	"github.com/isaqueveras/powersso/config"
-	"github.com/isaqueveras/powersso/domain/auth"
+	"github.com/isaqueveras/powersso/domain/authentication"
 	"github.com/isaqueveras/powersso/utils"
 )
 
 // NewAuthToken generates and returns a new authentication token
-func NewAuthToken(user *auth.User, sessionID *uuid.UUID) (*string, error) {
+func NewAuthToken(user *authentication.User, sessionID *uuid.UUID) (*string, error) {
 	claims := jwt.MapClaims{
 		"SessionID": sessionID,
 		"UserID":    user.ID,