Skip to content
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

Jump to bottom

Register updated OAuth2 middlewares #6619

Closed
wants to merge 1 commit into from
Closed

Register updated OAuth2 middlewares #6619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...aprd/components/middleware_http_oauth2.go → ...mponents/middleware_http_oauth2_cookie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"context"

"github.com/dapr/components-contrib/middleware"
"github.com/dapr/components-contrib/middleware/http/oauth2"
oauth2header "github.com/dapr/components-contrib/middleware/http/oauth2/header"
httpMiddlewareLoader "github.com/dapr/dapr/pkg/components/middleware/http"
httpMiddleware "github.com/dapr/dapr/pkg/middleware/http"
"github.com/dapr/kit/logger"
Expand All @@ -28,7 +28,7 @@ import (
func init() {
httpMiddlewareLoader.DefaultRegistry.RegisterComponent(func(log logger.Logger) httpMiddlewareLoader.FactoryMethod {
return func(metadata middleware.Metadata) (httpMiddleware.Middleware, error) {
return oauth2.NewOAuth2Middleware(log).GetHandler(context.TODO(), metadata)
return oauth2header.NewOAuth2HeaderMiddleware(log).GetHandler(context.TODO(), metadata)
}
}, "oauth2")
}, "oauth2.header")
}
34 changes: 34 additions & 0 deletions cmd/daprd/components/middleware_http_oauth2_header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
//go:build allcomponents

/*
Copyright 2021 The Dapr Authors
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package components

import (
"context"

"github.com/dapr/components-contrib/middleware"
oauth2cookie "github.com/dapr/components-contrib/middleware/http/oauth2/cookie"
httpMiddlewareLoader "github.com/dapr/dapr/pkg/components/middleware/http"
httpMiddleware "github.com/dapr/dapr/pkg/middleware/http"
"github.com/dapr/kit/logger"
)

func init() {
httpMiddlewareLoader.DefaultRegistry.RegisterComponent(func(log logger.Logger) httpMiddlewareLoader.FactoryMethod {
return func(metadata middleware.Metadata) (httpMiddleware.Middleware, error) {
return oauth2cookie.NewOAuth2CookieMiddleware(log).GetHandler(context.TODO(), metadata)
}
}, "oauth2.cookie", "oauth2")
}
Loading