Remove deprecated elements

server/server_configuration_test.go

@@ -161,7 +161,6 @@ func TestServerLoadConfigEmptyBasicAuth(t *testing.T) {
 				"frontend": {
 					EntryPoints: []string{"http"},
 					Backend:     "backend",
-					BasicAuth:   []string{""},
 				},
 			},
 			Backends: map[string]*types.Backend{
@@ -248,7 +247,11 @@ func TestReuseBackend(t *testing.T) {
 					th.WithFrontendName("frontend1"),
 					th.WithEntryPoints("http"),
 					th.WithRoutes(th.WithRoute("/unauthorized", "Path: /unauthorized")),
-					th.WithBasicAuth("foo", "bar")),
+					th.WithFrontEndAuth(&types.Auth{
+						Basic: &types.Basic{
+							Users: []string{"foo:bar"},
+						},
+					})),
 			),
 			th.WithBackends(th.WithBackendNew("backend",
 				th.WithLBMethod("wrr"),

server/server_middlewares.go

@@ -95,19 +95,6 @@ func (s *Server) buildMiddlewares(frontendName string, frontend *types.Frontend,
 		middle = append(middle, handler)
 	}
 
-	// Basic auth
-	if len(frontend.BasicAuth) > 0 {
-		log.Debugf("Adding basic authentication for frontend %s", frontendName)
-
-		authMiddleware, err := s.buildBasicAuthMiddleware(frontend.BasicAuth)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-
-		handler := s.wrapNegroniHandlerWithAccessLog(authMiddleware, fmt.Sprintf("Basic Auth for %s", frontendName))
-		middle = append(middle, handler)
-	}
-
 	// Authentication
 	if frontend.Auth != nil {
 		authMiddleware, err := mauth.NewAuthenticator(frontend.Auth, s.tracingMiddleware)

server/server_middlewares_test.go

@@ -265,7 +265,10 @@ func TestServerGenericFrontendAuthFail(t *testing.T) {
 				"frontend": {
 					EntryPoints: []string{"http"},
 					Backend:     "backend",
-					BasicAuth:   []string{""},
+					Auth: &types.Auth{
+						Basic: &types.Basic{
+							Users: []string{""},
+						}},
 				},
 			},
 			Backends: map[string]*types.Backend{