diff --git a/cmd/frontend/external/BUILD.bazel b/cmd/frontend/external/BUILD.bazel deleted file mode 100644 index 068dfdf9c8d..00000000000 --- a/cmd/frontend/external/BUILD.bazel +++ /dev/null @@ -1,8 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "external", - srcs = ["doc.go"], - importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/external", - visibility = ["//visibility:public"], -) diff --git a/cmd/frontend/external/doc.go b/cmd/frontend/external/doc.go deleted file mode 100644 index d0d1c949507..00000000000 --- a/cmd/frontend/external/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -// Package external is a parent package whose sub-packages exist solely to -// export certain types and variables from internal packages. An internal -// package should *never* import a sub-package of this package. -package external diff --git a/cmd/frontend/external/session/BUILD.bazel b/cmd/frontend/external/session/BUILD.bazel deleted file mode 100644 index 93376bb7c5a..00000000000 --- a/cmd/frontend/external/session/BUILD.bazel +++ /dev/null @@ -1,9 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "session", - srcs = ["session.go"], - importpath = "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session", - visibility = ["//visibility:public"], - deps = ["//cmd/frontend/internal/auth/session"], -) diff --git a/cmd/frontend/external/session/session.go b/cmd/frontend/external/session/session.go deleted file mode 100644 index 7940e73c2c1..00000000000 --- a/cmd/frontend/external/session/session.go +++ /dev/null @@ -1,22 +0,0 @@ -// Package session exports symbols from frontend/internal/session. See the -// parent package godoc for more information. -package session - -import "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" - -var ( - ResetMockSessionStore = session.ResetMockSessionStore - // SetActor sets the actor in the session, or removes it if actor == nil. If no session exists, a - // new session is created. - // - // 🚨 SECURITY: Should only be called after user is successfully authenticated. - SetActor = session.SetActor - // SetActorFromUser creates an actor from a user, sets it in the session, and - // returns a context with the user attached. - // - // 🚨 SECURITY: Should only be called after user is successfully authenticated. - SetActorFromUser = session.SetActorFromUser - SetData = session.SetData - GetData = session.GetData - InvalidateSessionsByIDs = session.InvalidateSessionsByIDs -) diff --git a/cmd/frontend/graphqlbackend/BUILD.bazel b/cmd/frontend/graphqlbackend/BUILD.bazel index 4ff4764ebac..f7f62fe6347 100644 --- a/cmd/frontend/graphqlbackend/BUILD.bazel +++ b/cmd/frontend/graphqlbackend/BUILD.bazel @@ -237,13 +237,13 @@ go_library( "//cmd/frontend/auth", "//cmd/frontend/backend", "//cmd/frontend/envvar", - "//cmd/frontend/external/session", "//cmd/frontend/globals", "//cmd/frontend/graphqlbackend/externallink", "//cmd/frontend/graphqlbackend/graphqlutil", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//cmd/frontend/internal/auth/sourcegraphoperator", "//cmd/frontend/internal/auth/userpasswd", "//cmd/frontend/internal/cloneurls", diff --git a/cmd/frontend/graphqlbackend/site_admin.go b/cmd/frontend/graphqlbackend/site_admin.go index 1f81fe31706..2128f29d845 100644 --- a/cmd/frontend/graphqlbackend/site_admin.go +++ b/cmd/frontend/graphqlbackend/site_admin.go @@ -6,7 +6,7 @@ import ( "github.com/graph-gophers/graphql-go" "github.com/sourcegraph/log" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/authz" diff --git a/cmd/frontend/internal/auth/authutil/BUILD.bazel b/cmd/frontend/internal/auth/authutil/BUILD.bazel index 6aefbd1491d..b71d26d0ff0 100644 --- a/cmd/frontend/internal/auth/authutil/BUILD.bazel +++ b/cmd/frontend/internal/auth/authutil/BUILD.bazel @@ -7,7 +7,7 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/database", ], diff --git a/cmd/frontend/internal/auth/authutil/authutil.go b/cmd/frontend/internal/auth/authutil/authutil.go index 05b163fbbeb..df630df6c1d 100644 --- a/cmd/frontend/internal/auth/authutil/authutil.go +++ b/cmd/frontend/internal/auth/authutil/authutil.go @@ -6,7 +6,7 @@ import ( "time" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" ) diff --git a/cmd/frontend/internal/auth/azureoauth/BUILD.bazel b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel index 506c8e7f8de..6cf832fac09 100644 --- a/cmd/frontend/internal/auth/azureoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/azureoauth/BUILD.bazel @@ -13,10 +13,10 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/collections", "//internal/conf", diff --git a/cmd/frontend/internal/auth/azureoauth/session.go b/cmd/frontend/internal/auth/azureoauth/session.go index 4016ec65ec3..44f4c0d5788 100644 --- a/cmd/frontend/internal/auth/azureoauth/session.go +++ b/cmd/frontend/internal/auth/azureoauth/session.go @@ -10,10 +10,10 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel index f6f260a7c17..219ac42eb05 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/BUILD.bazel @@ -13,7 +13,6 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", "//cmd/frontend/internal/auth/oauth", @@ -56,9 +55,9 @@ go_test( ], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/database", diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go index c8704c22fab..1dce12e30b0 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/middleware_test.go @@ -17,9 +17,9 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" diff --git a/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go b/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go index 14c9a47a744..3c23d756139 100644 --- a/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go +++ b/cmd/frontend/internal/auth/bitbucketcloudoauth/provider.go @@ -13,8 +13,8 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/lazyregexp" diff --git a/cmd/frontend/internal/auth/githuboauth/BUILD.bazel b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel index ff585eb9ade..4bfdd8e78bf 100644 --- a/cmd/frontend/internal/auth/githuboauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/githuboauth/BUILD.bazel @@ -13,11 +13,11 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/collections", "//internal/conf", @@ -60,9 +60,9 @@ go_test( ], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/database", diff --git a/cmd/frontend/internal/auth/githuboauth/middleware_test.go b/cmd/frontend/internal/auth/githuboauth/middleware_test.go index f2eddc8e135..269980cdbf9 100644 --- a/cmd/frontend/internal/auth/githuboauth/middleware_test.go +++ b/cmd/frontend/internal/auth/githuboauth/middleware_test.go @@ -15,9 +15,9 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/githuboauth/session.go b/cmd/frontend/internal/auth/githuboauth/session.go index 5d38ef1a29c..a072a122e13 100644 --- a/cmd/frontend/internal/auth/githuboauth/session.go +++ b/cmd/frontend/internal/auth/githuboauth/session.go @@ -16,11 +16,11 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel b/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel index 9be9090af81..f2fe4ac37b4 100644 --- a/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/gitlaboauth/BUILD.bazel @@ -15,11 +15,11 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/collections", "//internal/conf", @@ -55,9 +55,9 @@ go_test( ], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/oauth", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/database", diff --git a/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go b/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go index 8e4373e4175..3173a0fae82 100644 --- a/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go +++ b/cmd/frontend/internal/auth/gitlaboauth/middleware_test.go @@ -15,9 +15,9 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/gitlaboauth/session.go b/cmd/frontend/internal/auth/gitlaboauth/session.go index a9460ebd5d7..8b9e1c2f32c 100644 --- a/cmd/frontend/internal/auth/gitlaboauth/session.go +++ b/cmd/frontend/internal/auth/gitlaboauth/session.go @@ -12,11 +12,11 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot/hubspotutil" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/oauth" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/oauth/BUILD.bazel b/cmd/frontend/internal/auth/oauth/BUILD.bazel index 3c939a5bd03..d9fe6cc57c7 100644 --- a/cmd/frontend/internal/auth/oauth/BUILD.bazel +++ b/cmd/frontend/internal/auth/oauth/BUILD.bazel @@ -14,9 +14,9 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/cookie", diff --git a/cmd/frontend/internal/auth/oauth/provider.go b/cmd/frontend/internal/auth/oauth/provider.go index 6d125058ebb..bbbed30be06 100644 --- a/cmd/frontend/internal/auth/oauth/provider.go +++ b/cmd/frontend/internal/auth/oauth/provider.go @@ -13,8 +13,8 @@ import ( "github.com/inconshreveable/log15" //nolint:logging // TODO move all logging to sourcegraph/log "golang.org/x/oauth2" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/extsvc" "github.com/sourcegraph/sourcegraph/internal/extsvc/azuredevops" diff --git a/cmd/frontend/internal/auth/oauth/session.go b/cmd/frontend/internal/auth/oauth/session.go index 53e6a656c75..b04db7ccea7 100644 --- a/cmd/frontend/internal/auth/oauth/session.go +++ b/cmd/frontend/internal/auth/oauth/session.go @@ -13,9 +13,9 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/cookie" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/openidconnect/BUILD.bazel b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel index 9df5ba8d20d..2fc1eda2d94 100644 --- a/cmd/frontend/internal/auth/openidconnect/BUILD.bazel +++ b/cmd/frontend/internal/auth/openidconnect/BUILD.bazel @@ -14,10 +14,10 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/hubspot/hubspotutil", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/conf/conftypes", @@ -55,9 +55,9 @@ go_test( tags = [TAG_PLATFORM_SOURCE], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/hubspot", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/database", diff --git a/cmd/frontend/internal/auth/openidconnect/middleware.go b/cmd/frontend/internal/auth/openidconnect/middleware.go index 81b0668d4bd..ac15a38816d 100644 --- a/cmd/frontend/internal/auth/openidconnect/middleware.go +++ b/cmd/frontend/internal/auth/openidconnect/middleware.go @@ -19,9 +19,9 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/hubspot" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/cookie" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/openidconnect/middleware_test.go b/cmd/frontend/internal/auth/openidconnect/middleware_test.go index 90ffc925d74..c0ccc5c8fbc 100644 --- a/cmd/frontend/internal/auth/openidconnect/middleware_test.go +++ b/cmd/frontend/internal/auth/openidconnect/middleware_test.go @@ -19,8 +19,8 @@ import ( "github.com/sourcegraph/log/logtest" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" diff --git a/cmd/frontend/internal/auth/openidconnect/session.go b/cmd/frontend/internal/auth/openidconnect/session.go index 04d35b5f204..6cf5051396b 100644 --- a/cmd/frontend/internal/auth/openidconnect/session.go +++ b/cmd/frontend/internal/auth/openidconnect/session.go @@ -7,8 +7,8 @@ import ( sams "github.com/sourcegraph/sourcegraph-accounts-sdk-go" "github.com/sourcegraph/sourcegraph-accounts-sdk-go/scopes" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/dotcom" "github.com/sourcegraph/sourcegraph/lib/errors" ) diff --git a/cmd/frontend/internal/auth/saml/BUILD.bazel b/cmd/frontend/internal/auth/saml/BUILD.bazel index 827152cdf83..bba4bdf1c39 100644 --- a/cmd/frontend/internal/auth/saml/BUILD.bazel +++ b/cmd/frontend/internal/auth/saml/BUILD.bazel @@ -15,8 +15,8 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/conf/conftypes", @@ -51,8 +51,8 @@ go_test( tags = [TAG_PLATFORM_SOURCE], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/conf", "//internal/database/dbmocks", diff --git a/cmd/frontend/internal/auth/saml/middleware.go b/cmd/frontend/internal/auth/saml/middleware.go index c25a9662d04..04b1a1eb1bc 100644 --- a/cmd/frontend/internal/auth/saml/middleware.go +++ b/cmd/frontend/internal/auth/saml/middleware.go @@ -12,8 +12,8 @@ import ( "github.com/inconshreveable/log15" //nolint:logging // TODO move all logging to sourcegraph/log "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" sgactor "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/database" ) diff --git a/cmd/frontend/internal/auth/saml/middleware_test.go b/cmd/frontend/internal/auth/saml/middleware_test.go index 9ce508cc02b..f7eb6ca2f4a 100644 --- a/cmd/frontend/internal/auth/saml/middleware_test.go +++ b/cmd/frontend/internal/auth/saml/middleware_test.go @@ -22,8 +22,8 @@ import ( "github.com/crewjam/saml/samlidp" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" "github.com/sourcegraph/sourcegraph/internal/conf" "github.com/sourcegraph/sourcegraph/internal/database/dbmocks" diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel index fd50aa32b72..7681a099771 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel +++ b/cmd/frontend/internal/auth/sourcegraphoperator/BUILD.bazel @@ -13,9 +13,9 @@ go_library( visibility = ["//cmd/frontend:__subpackages__"], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/openidconnect", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/auth", "//internal/cloud", @@ -47,9 +47,9 @@ go_test( ], deps = [ "//cmd/frontend/auth", - "//cmd/frontend/external/session", "//cmd/frontend/internal/auth/openidconnect", "//cmd/frontend/internal/auth/providers", + "//cmd/frontend/internal/auth/session", "//internal/actor", "//internal/auth", "//internal/cloud", diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go index 5c2a81c9a0d..4169589b4ec 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware.go @@ -8,9 +8,9 @@ import ( "github.com/sourcegraph/log" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" internalauth "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/database" diff --git a/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go index 909c237ed9a..67c5bd07d46 100644 --- a/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go +++ b/cmd/frontend/internal/auth/sourcegraphoperator/middleware_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" "github.com/sourcegraph/sourcegraph/cmd/frontend/auth" - "github.com/sourcegraph/sourcegraph/cmd/frontend/external/session" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/openidconnect" "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/providers" + "github.com/sourcegraph/sourcegraph/cmd/frontend/internal/auth/session" "github.com/sourcegraph/sourcegraph/internal/actor" internalauth "github.com/sourcegraph/sourcegraph/internal/auth" "github.com/sourcegraph/sourcegraph/internal/cloud"