refactor: replace session package with context package

This commit is contained in:
Prad Nukala 2024-12-10 13:47:07 -05:00
parent bb7724ece1
commit fb234ed339

View File

@ -4,7 +4,7 @@ import (
"net/http" "net/http"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
session "github.com/onsonr/sonr/internal/vault/session" "github.com/onsonr/sonr/internal/vault/context"
) )
func Handler(c echo.Context) error { func Handler(c echo.Context) error {
@ -25,24 +25,24 @@ func Handler(c echo.Context) error {
// Initial users have no authorization, user handle, or vault address // Initial users have no authorization, user handle, or vault address
func isInitial(c echo.Context) bool { func isInitial(c echo.Context) bool {
noAuth := !session.HasAuthorization(c) noAuth := !context.HasAuthorization(c)
noUserHandle := !session.HasUserHandle(c) noUserHandle := !context.HasUserHandle(c)
noVaultAddress := !session.HasVaultAddress(c) noVaultAddress := !context.HasVaultAddress(c)
return noUserHandle && noVaultAddress && noAuth return noUserHandle && noVaultAddress && noAuth
} }
// Expired users have either a user handle or vault address // Expired users have either a user handle or vault address
func isExpired(c echo.Context) bool { func isExpired(c echo.Context) bool {
noAuth := !session.HasAuthorization(c) noAuth := !context.HasAuthorization(c)
hasUserHandle := session.HasUserHandle(c) hasUserHandle := context.HasUserHandle(c)
hasVaultAddress := session.HasVaultAddress(c) hasVaultAddress := context.HasVaultAddress(c)
return noAuth && hasUserHandle || noAuth && hasVaultAddress return noAuth && hasUserHandle || noAuth && hasVaultAddress
} }
// Returning users have a valid authorization, and either a user handle or vault address // Returning users have a valid authorization, and either a user handle or vault address
func isReturning(c echo.Context) bool { func isReturning(c echo.Context) bool {
hasAuth := session.HasAuthorization(c) hasAuth := context.HasAuthorization(c)
hasUserHandle := session.HasUserHandle(c) hasUserHandle := context.HasUserHandle(c)
hasVaultAddress := session.HasVaultAddress(c) hasVaultAddress := context.HasVaultAddress(c)
return hasAuth && (hasUserHandle || hasVaultAddress) return hasAuth && (hasUserHandle || hasVaultAddress)
} }