Skip to content

refactor(auth): nest internal packages under pkg/auth #3338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tvi merged 3 commits into from
Jul 22, 2026
Merged

refactor(auth): nest internal packages under pkg/auth #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d25100e
feat(auth): re-export OIDC and provider verifiers through the public …
ben-fornefeld Jul 22, 2026
57128f5
refactor(auth): nest internal packages under pkg/auth
ben-fornefeld Jul 22, 2026
d7660f3
Merge branch 'main' into refactor/auth-internals-under-pkg-auth
ben-fornefeld Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN cd /build/shared && go mod download && \
WORKDIR /build

COPY ./auth/pkg ./auth/pkg
COPY ./auth/internal ./auth/internal
COPY ./clickhouse/pkg ./clickhouse/pkg
COPY ./shared/pkg ./shared/pkg
COPY ./db/client ./db/client
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth

import (
internalauthteam "github.com/e2b-dev/infra/packages/auth/internal/team"
internalauthteam "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/team"
"github.com/e2b-dev/infra/packages/shared/pkg/apierrors"
)

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/gin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
)

Expand Down
0 ...ages/auth/internal/authcontext/context.go → .../pkg/auth/internal/authcontext/context.go
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions ...es/auth/internal/middleware/middleware.go → ...kg/auth/internal/middleware/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
internalauthteam "github.com/e2b-dev/infra/packages/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
internalauthteam "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
"github.com/e2b-dev/infra/packages/shared/pkg/apierrors"
"github.com/e2b-dev/infra/packages/shared/pkg/telemetry"
Expand All @@ -35,7 +35,7 @@ const (

type APIError = apierrors.APIError

var tracer = otel.Tracer("github.com/e2b-dev/infra/packages/auth/internal/middleware")
var tracer = otel.Tracer("github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/middleware")

var (
ErrNoAuthHeader = errors.New("authorization header is missing")
Expand Down
2 changes: 1 addition & 1 deletion ...th/internal/middleware/middleware_test.go → ...th/internal/middleware/middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/require"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
)
Expand Down
0 packages/auth/internal/service/cache.go → ...s/auth/pkg/auth/internal/service/cache.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../auth/internal/service/identity_lookup.go → .../auth/internal/service/identity_lookup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/token/oidc"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/oidc"
authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
"github.com/e2b-dev/infra/packages/db/pkg/dberrors"
"github.com/e2b-dev/infra/packages/shared/pkg/cache"
Expand Down
2 changes: 1 addition & 1 deletion .../internal/service/identity_lookup_test.go → .../internal/service/identity_lookup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/token/oidc"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/oidc"
)

type countingIdentityLookup struct {
Expand Down
6 changes: 3 additions & 3 deletions packages/auth/internal/service/service.go → ...auth/pkg/auth/internal/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/google/uuid"
"github.com/redis/go-redis/v9"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
internalauthteam "github.com/e2b-dev/infra/packages/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
internalauthteam "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
authdb "github.com/e2b-dev/infra/packages/db/pkg/auth"
"github.com/e2b-dev/infra/packages/shared/pkg/apierrors"
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/internal/service/store.go → ...s/auth/pkg/auth/internal/service/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import (
"go.opentelemetry.io/otel"
"go.uber.org/zap"

internalauthteam "github.com/e2b-dev/infra/packages/auth/internal/team"
internalauthteam "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
authdb "github.com/e2b-dev/infra/packages/db/pkg/auth"
authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
"github.com/e2b-dev/infra/packages/shared/pkg/logger"
)

var tracer = otel.Tracer("github.com/e2b-dev/infra/packages/auth/internal/service")
var tracer = otel.Tracer("github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/service")

type authStoreImpl struct {
authDB *authdb.Client
Expand Down
0 packages/auth/internal/team/error.go → ...ages/auth/pkg/auth/internal/team/error.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/auth/internal/team/middleware.go → ...auth/pkg/auth/internal/team/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
"github.com/e2b-dev/infra/packages/shared/pkg/apierrors"
)
Expand Down
2 changes: 1 addition & 1 deletion ...ges/auth/internal/team/middleware_test.go → ...pkg/auth/internal/team/middleware_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
)
Expand Down
0 packages/auth/internal/team/state.go → ...ages/auth/pkg/auth/internal/team/state.go
View file
Open in desktop
File renamed without changes.
0 packages/auth/internal/team/state_test.go → ...auth/pkg/auth/internal/team/state_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/auth/internal/token/admin.go → ...ges/auth/pkg/auth/internal/token/admin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang-jwt/jwt/v5"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
)

// adminJWTClockSkew is the leeway applied to time-based claims of admin
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/internal/token/admin_test.go → ...uth/pkg/auth/internal/token/admin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/stretchr/testify/require"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
)

const (
Expand Down
0 ...ages/auth/internal/token/jwks/audience.go → .../pkg/auth/internal/token/jwks/audience.go
View file
Open in desktop
File renamed without changes.
0 ...auth/internal/token/jwks/audience_test.go → ...auth/internal/token/jwks/audience_test.go
View file
Open in desktop
File renamed without changes.
0 packages/auth/internal/token/jwks/config.go → ...th/pkg/auth/internal/token/jwks/config.go
View file
Open in desktop
File renamed without changes.
0 ...s/auth/internal/token/jwks/config_test.go → ...g/auth/internal/token/jwks/config_test.go
View file
Open in desktop
File renamed without changes.
0 ...es/auth/internal/token/jwks/testserver.go → ...kg/auth/internal/token/jwks/testserver.go
View file
Open in desktop
File renamed without changes.
0 ...ages/auth/internal/token/jwks/verifier.go → .../pkg/auth/internal/token/jwks/verifier.go
View file
Open in desktop
File renamed without changes.
0 ...auth/internal/token/jwks/verifier_test.go → ...auth/internal/token/jwks/verifier_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/auth/internal/token/oidc/oidc.go → ...auth/pkg/auth/internal/token/oidc/oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
)

// ErrIdentityNotFound is returned by Verify when the token is valid but no
Expand Down
2 changes: 1 addition & 1 deletion ...ges/auth/internal/token/oidc/oidc_test.go → ...pkg/auth/internal/token/oidc/oidc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/require"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
)

const testIssuerURL = "https://issuer.example.com"
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/internal/token/provider.go → .../auth/pkg/auth/internal/token/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/internal/token/oidc"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/oidc"
)

// ProviderConfig describes external auth provider verification.
Expand Down
0 ...h/internal/token/provider_config_parse.go → ...h/internal/token/provider_config_parse.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ages/auth/internal/token/provider_test.go → .../pkg/auth/internal/token/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"github.com/google/uuid"
"github.com/stretchr/testify/require"

"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/internal/token/oidc"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/oidc"
)

const testIssuerURL = "https://issuer.example.com"
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"

internalauthmiddleware "github.com/e2b-dev/infra/packages/auth/internal/middleware"
internalauthmiddleware "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/middleware"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
)

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/redis/go-redis/v9"

internalauthservice "github.com/e2b-dev/infra/packages/auth/internal/service"
internalauthservice "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/service"
authdb "github.com/e2b-dev/infra/packages/db/pkg/auth"
)

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/team.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package auth
import (
"github.com/gin-gonic/gin"

internalauthteam "github.com/e2b-dev/infra/packages/auth/internal/team"
internalauthteam "github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/team"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
authqueries "github.com/e2b-dev/infra/packages/db/pkg/auth/queries"
)
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/pkg/auth/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/google/uuid"

"github.com/e2b-dev/infra/packages/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/authcontext"
"github.com/e2b-dev/infra/packages/auth/pkg/types"
)

Expand Down
6 changes: 3 additions & 3 deletions packages/auth/pkg/auth/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

"github.com/e2b-dev/infra/packages/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/internal/token/oidc"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/jwks"
"github.com/e2b-dev/infra/packages/auth/pkg/auth/internal/token/oidc"
)

type ProviderConfig = token.ProviderConfig
Expand Down
1 change: 0 additions & 1 deletion packages/dashboard-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ RUN go mod download
WORKDIR /build

COPY ./auth/pkg ./auth/pkg
COPY ./auth/internal ./auth/internal
COPY ./clickhouse/pkg ./clickhouse/pkg
COPY ./shared/pkg ./shared/pkg
COPY ./db/client ./db/client
Expand Down
Loading