From 1940bca1f34fa96b477563c4e7c4c40dfba22a2c Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Fri, 6 Jun 2025 00:46:36 +0530 Subject: [PATCH] [server] Remove core1 and core2 imports --- .../api/authenticator/authenticator.go | 26 +++++++++---------- server/internal/api/v1/auth/routes.go | 9 +++---- server/internal/api/v1/fs/share.go | 3 +-- server/internal/api/v1/my/bookmarks.go | 3 +-- server/internal/api/v1/my/bootstrap.go | 3 +-- server/internal/api/v1/users/invite.go | 3 +-- server/internal/api/v1/users/users.go | 3 +-- server/internal/api/webdav/handler.go | 7 +++-- server/internal/api/webdav/impl/copy_move.go | 9 +++---- server/internal/command/admin/user/mod.go | 5 ++-- server/internal/command/common/common.go | 7 +++-- server/internal/command/fs/setfacl.go | 3 +-- 12 files changed, 34 insertions(+), 47 deletions(-) diff --git a/server/internal/api/authenticator/authenticator.go b/server/internal/api/authenticator/authenticator.go index 4f021d49..585b461f 100644 --- a/server/internal/api/authenticator/authenticator.go +++ b/server/internal/api/authenticator/authenticator.go @@ -7,21 +7,19 @@ import ( "github.com/gin-gonic/gin" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" - core2 "github.com/shroff/phylum/server/internal/core" ) -var errAuthRequired = core2.NewError(http.StatusUnauthorized, "auth_required", "authorization required") +var errAuthRequired = core.NewError(http.StatusUnauthorized, "auth_required", "authorization required") const keyUser = "user" const keyFileSystem = "filesystem" -func GetUser(c *gin.Context) core1.User { +func GetUser(c *gin.Context) core.User { val, ok := c.Get(keyUser) if !ok { - return core1.User{} + return core.User{} } - return val.(core1.User) + return val.(core.User) } func GetFileSystem(c *gin.Context) core.FileSystem { @@ -42,36 +40,36 @@ func Require(c *gin.Context) { } } -func extractUserDetails(c *gin.Context) (core1.User, error) { - userManager := core1.UserManagerFromContext(c.Request.Context()) +func extractUserDetails(c *gin.Context) (core.User, error) { + userManager := core.UserManagerFromContext(c.Request.Context()) if header := c.Request.Header.Get("Authorization"); header == "" { if cookie, err := c.Request.Cookie("auth_token"); err == nil { token := cookie.Value if u, err := userManager.ReadAccessToken(token); err == nil { return u, nil } else { - return core1.User{}, err + return core.User{}, err } } else if err != http.ErrNoCookie { - return core1.User{}, err + return core.User{}, err } - return core1.User{}, errAuthRequired + return core.User{}, errAuthRequired } else if auth, ok := checkAuthHeader(header, "basic"); ok { if email, password, ok := decodeBasicAuth(auth); ok { if u, err := userManager.VerifyUserPassword(email, password); err == nil { return u, nil } else { - return core1.User{}, err + return core.User{}, err } } } else if token, ok := checkAuthHeader(header, "bearer"); ok { if u, err := userManager.ReadAccessToken(token); err == nil { return u, nil } else { - return core1.User{}, err + return core.User{}, err } } - return core1.User{}, errAuthRequired + return core.User{}, errAuthRequired } func checkAuthHeader(header, prefix string) (string, bool) { diff --git a/server/internal/api/v1/auth/routes.go b/server/internal/api/v1/auth/routes.go index 0f24b89d..28a94c60 100644 --- a/server/internal/api/v1/auth/routes.go +++ b/server/internal/api/v1/auth/routes.go @@ -9,7 +9,6 @@ import ( "github.com/shroff/phylum/server/internal/api/v1/my" "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/shroff/phylum/server/internal/mail" ) @@ -40,7 +39,7 @@ func handlePasswordAuth(c *gin.Context) { var params passwordParams err := c.ShouldBind(¶ms) if err != nil { - panic(core1.NewError(http.StatusBadRequest, "missing_params", "Email or password not specified")) + panic(core.NewError(http.StatusBadRequest, "missing_params", "Email or password not specified")) } userManager := core.UserManagerFromContext(c.Request.Context()) @@ -63,7 +62,7 @@ func handleRequestPasswordReset(c *gin.Context) { var params requestPasswordResetParams err := c.ShouldBind(¶ms) if err != nil { - panic(core1.NewError(http.StatusBadRequest, "missing_params", "Missing Parameters")) + panic(core.NewError(http.StatusBadRequest, "missing_params", "Missing Parameters")) } userManager := core.UserManagerFromContext(c.Request.Context()) @@ -90,7 +89,7 @@ func handleResetPassword(c *gin.Context) { var params resetPasswordParams err := c.ShouldBind(¶ms) if err != nil { - panic(core1.NewError(http.StatusBadRequest, "missing_params", "Missing Parameters")) + panic(core.NewError(http.StatusBadRequest, "missing_params", "Missing Parameters")) } userManager := core.UserManagerFromContext(c.Request.Context()) @@ -113,7 +112,7 @@ func handleResetPassword(c *gin.Context) { func handleSetCookie(c *gin.Context) { token := authenticator.GetToken(c) if token == "" { - panic(core1.NewError(http.StatusBadRequest, "missing_token", "Auth Token Not Specified")) + panic(core.NewError(http.StatusBadRequest, "missing_token", "Auth Token Not Specified")) } secure := c.Request.URL.Scheme == "https" c.SetSameSite(http.SameSiteStrictMode) diff --git a/server/internal/api/v1/fs/share.go b/server/internal/api/v1/fs/share.go index cfd107cc..f1bc42ed 100644 --- a/server/internal/api/v1/fs/share.go +++ b/server/internal/api/v1/fs/share.go @@ -5,7 +5,6 @@ import ( "github.com/shroff/phylum/server/internal/api/authenticator" "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" ) type shareParams struct { @@ -30,7 +29,7 @@ func handleShareRequest(c *gin.Context) { panic(err) } - user, err := core1.UserManagerFromContext(c).UserByEmail(params.Email) + user, err := core.UserManagerFromContext(c).UserByEmail(params.Email) if err != nil { panic(err) } diff --git a/server/internal/api/v1/my/bookmarks.go b/server/internal/api/v1/my/bookmarks.go index ab43aaa4..c0f79a48 100644 --- a/server/internal/api/v1/my/bookmarks.go +++ b/server/internal/api/v1/my/bookmarks.go @@ -11,7 +11,6 @@ import ( "github.com/shroff/phylum/server/internal/api/authenticator" "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" ) type bookmarksResponse struct { @@ -41,7 +40,7 @@ func handleBookmarksGetRoute(c *gin.Context) { var err error since, err = strconv.ParseInt(s, 10, 64) if err != nil { - panic(core1.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Parameters")) + panic(core.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Parameters")) } } diff --git a/server/internal/api/v1/my/bootstrap.go b/server/internal/api/v1/my/bootstrap.go index 3093d1cc..35713f3a 100644 --- a/server/internal/api/v1/my/bootstrap.go +++ b/server/internal/api/v1/my/bootstrap.go @@ -11,7 +11,6 @@ import ( "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/api/v1/users" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" ) func handleBootstrapRoute(c *gin.Context) { @@ -20,7 +19,7 @@ func handleBootstrapRoute(c *gin.Context) { var err error since, err = strconv.ParseInt(s, 10, 64) if err != nil { - panic(core1.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Parameters")) + panic(core.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Parameters")) } } diff --git a/server/internal/api/v1/users/invite.go b/server/internal/api/v1/users/invite.go index c83fa25c..76998b11 100644 --- a/server/internal/api/v1/users/invite.go +++ b/server/internal/api/v1/users/invite.go @@ -7,7 +7,6 @@ import ( "github.com/shroff/phylum/server/internal/api/authenticator" "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/shroff/phylum/server/internal/mail" ) @@ -32,7 +31,7 @@ func handleInviteRequest(c *gin.Context) { u := authenticator.GetUser(c) if u.Permissions&core.PermissionUsersInvite == 0 { - panic(core1.NewError(http.StatusBadRequest, "insufficient_permissions", "You do not have permissions to invite users")) + panic(core.NewError(http.StatusBadRequest, "insufficient_permissions", "You do not have permissions to invite users")) } if user, err := userManager.CreateUser(params.Email, params.Name, params.NoCreateHome); err != nil { diff --git a/server/internal/api/v1/users/users.go b/server/internal/api/v1/users/users.go index 3daa4c27..05ef9283 100644 --- a/server/internal/api/v1/users/users.go +++ b/server/internal/api/v1/users/users.go @@ -8,10 +8,9 @@ import ( "github.com/gin-gonic/gin" "github.com/shroff/phylum/server/internal/api/v1/responses" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" ) -var errInvalidParams = core1.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Request Parameters") +var errInvalidParams = core.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Request Parameters") func SetupUserRoutes(r *gin.RouterGroup) { group := r.Group("/users") diff --git a/server/internal/api/webdav/handler.go b/server/internal/api/webdav/handler.go index 8754f8ea..4f0b1b3f 100644 --- a/server/internal/api/webdav/handler.go +++ b/server/internal/api/webdav/handler.go @@ -9,7 +9,6 @@ import ( "github.com/jackc/pgx/v5/pgtype" webdav "github.com/shroff/phylum/server/internal/api/webdav/impl" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/sirupsen/logrus" ) @@ -44,7 +43,7 @@ func (h *handler) HandleRequest(c *gin.Context) { var f core.FileSystem if email, pass, ok := c.Request.BasicAuth(); ok { ctx := c.Request.Context() - userManager := core1.UserManagerFromContext(ctx) + userManager := core.UserManagerFromContext(ctx) if u, err := userManager.VerifyUserPassword(email, pass); err == nil { authSuccess = true root := c.Param("root") @@ -52,7 +51,7 @@ func (h *handler) HandleRequest(c *gin.Context) { if root[0] == '~' { id, err := userManager.UserHome(root[1:]) if err != nil { - if errors.Is(err, core1.ErrUserNotFound) { + if errors.Is(err, core.ErrUserNotFound) { c.AbortWithStatus(http.StatusNotFound) return } else { @@ -66,7 +65,7 @@ func (h *handler) HandleRequest(c *gin.Context) { c.AbortWithStatus(http.StatusNotFound) return } - } else if !errors.Is(err, core1.ErrCredentialsInvalid) { + } else if !errors.Is(err, core.ErrCredentialsInvalid) { panic(err) } } diff --git a/server/internal/api/webdav/impl/copy_move.go b/server/internal/api/webdav/impl/copy_move.go index 993cd2f2..19c15c3a 100644 --- a/server/internal/api/webdav/impl/copy_move.go +++ b/server/internal/api/webdav/impl/copy_move.go @@ -6,7 +6,6 @@ import ( "github.com/google/uuid" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" ) func (h *Handler) handleCopyMove(_ http.ResponseWriter, r *http.Request) (status int, err error) { @@ -86,7 +85,7 @@ func (h *Handler) handleCopyMove(_ http.ResponseWriter, r *http.Request) (status // See section 9.9.4 for when various HTTP status codes apply. func moveFiles(f FileSystem, srcPath, dstPath string, overwrite bool) (status int, err error) { if src, err := f.ResourceByPath(srcPath); err != nil { - if e, ok := err.(*core1.Error); ok { + if e, ok := err.(*core.Error); ok { return e.Status, e } return http.StatusInternalServerError, err @@ -96,7 +95,7 @@ func moveFiles(f FileSystem, srcPath, dstPath string, overwrite bool) (status in conflictResolution = core.ResourceBindConflictResolutionDelete } if _, deleted, err := f.Move(src, dstPath, conflictResolution); err != nil { - if e, ok := err.(*core1.Error); ok { + if e, ok := err.(*core.Error); ok { return e.Status, e } return http.StatusForbidden, err @@ -115,7 +114,7 @@ func moveFiles(f FileSystem, srcPath, dstPath string, overwrite bool) (status in // See section 9.8.5 for when various HTTP status codes apply. func copyFiles(f FileSystem, srcPath, dstPath string, overwrite bool, depth int) (status int, err error) { if src, err := f.ResourceByPath(srcPath); err != nil { - if e, ok := err.(*core1.Error); ok { + if e, ok := err.(*core.Error); ok { return e.Status, e } return http.StatusInternalServerError, err @@ -126,7 +125,7 @@ func copyFiles(f FileSystem, srcPath, dstPath string, overwrite bool, depth int) conflictResolution = core.ResourceBindConflictResolutionOverwrite } if _, deleted, err := f.Copy(src, dstPath, id, depth != 0, conflictResolution); err != nil { - if e, ok := err.(*core1.Error); ok { + if e, ok := err.(*core.Error); ok { return e.Status, e } return http.StatusForbidden, err diff --git a/server/internal/command/admin/user/mod.go b/server/internal/command/admin/user/mod.go index 9b3cf8b0..909fecbf 100644 --- a/server/internal/command/admin/user/mod.go +++ b/server/internal/command/admin/user/mod.go @@ -7,7 +7,6 @@ import ( "github.com/jackc/pgx/v5/pgtype" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/shroff/phylum/server/internal/db" "github.com/spf13/cobra" ) @@ -19,7 +18,7 @@ func setupModCommand() *cobra.Command { Args: cobra.ExactArgs(1), Run: func(cmd *cobra.Command, args []string) { email := args[0] - u, err := core1.UserManagerFromContext(context.Background()).UserByEmail(email) + u, err := core.UserManagerFromContext(context.Background()).UserByEmail(email) if err != nil { fmt.Println("could not update user '" + email + "': " + err.Error()) os.Exit(1) @@ -43,7 +42,7 @@ func setupModCommand() *cobra.Command { } err = db.Get(context.Background()).RunInTx(func(db db.Handler) error { - m := core1.UserManagerFromDB(db) + m := core.UserManagerFromDB(db) if name != "" { if err := m.UpdateUserName(u, name); err != nil { return err diff --git a/server/internal/command/common/common.go b/server/internal/command/common/common.go index 11970c2f..d94d1a31 100644 --- a/server/internal/command/common/common.go +++ b/server/internal/command/common/common.go @@ -6,15 +6,14 @@ import ( "os" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/shroff/phylum/server/internal/db" "github.com/spf13/cobra" ) -var u *core1.User +var u *core.User var f core.FileSystem -func User(cmd *cobra.Command) *core1.User { +func User(cmd *cobra.Command) *core.User { if u == nil { if value, err := cmd.Flags().GetString("user-email"); err != nil { fmt.Println("could not read user: " + err.Error()) @@ -22,7 +21,7 @@ func User(cmd *cobra.Command) *core1.User { } else if value == "" { u = nil } else { - if user, err := core1.UserManagerFromContext(context.Background()).UserByEmail(value); err != nil { + if user, err := core.UserManagerFromContext(context.Background()).UserByEmail(value); err != nil { fmt.Println("could not find user '" + value + "': " + err.Error()) os.Exit(1) } else { diff --git a/server/internal/command/fs/setfacl.go b/server/internal/command/fs/setfacl.go index da1e161e..410f225d 100644 --- a/server/internal/command/fs/setfacl.go +++ b/server/internal/command/fs/setfacl.go @@ -8,7 +8,6 @@ import ( "github.com/shroff/phylum/server/internal/command/common" "github.com/shroff/phylum/server/internal/core" - core1 "github.com/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) @@ -32,7 +31,7 @@ func setupSetfaclCommand() *cobra.Command { } email := args[1] - if user, err := core1.UserManagerFromContext(context.Background()).UserByEmail(email); err != nil { + if user, err := core.UserManagerFromContext(context.Background()).UserByEmail(email); err != nil { fmt.Println("cannot update permissions for user '" + email + "': " + err.Error()) os.Exit(1) } else {