Skip to content

Commit 61d9025

Browse files
committed
refactor: modified ParseAuthorizationMetadataAsHeader too and AuthenticationParser interface
1 parent e4b083b commit 61d9025

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

http/grpc/interfaces.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
package grpc
22

33
import (
4-
"context"
54
"net/http"
5+
6+
"google.golang.org/grpc/metadata"
67
)
78

89
type (
910
// AuthenticationParser parses the metadata authentication from a gRPC to the header or as a cookie
1011
AuthenticationParser interface {
1112
ParseAuthorizationMetadataAsHeader(
12-
ctx context.Context,
13+
md metadata.MD,
1314
w http.ResponseWriter,
1415
) error
1516
ParseAuthorizationMetadataAsCookie(
16-
ctx context.Context,
17+
md metadata.MD,
1718
w http.ResponseWriter,
1819
) error
1920
}

http/grpc/types.go

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package grpc
22

33
import (
4-
"context"
54
"net/http"
65
"time"
76

@@ -10,7 +9,6 @@ import (
109

1110
gonethttp "github.com/ralvarezdev/go-net/http"
1211
gonethttpcookie "github.com/ralvarezdev/go-net/http/cookie"
13-
gonethttpresponse "github.com/ralvarezdev/go-net/http/response"
1412
)
1513

1614
type (
@@ -60,26 +58,16 @@ func NewDefaultAuthenticationParser(
6058
//
6159
// Parameters:
6260
//
63-
// - ctx: context.Context
61+
// - md: The gRPC metadata with authorization information
6462
// - w: http.ResponseWriter
6563
//
6664
// Returns:
6765
//
6866
// - error: error if something goes wrong
6967
func (d DefaultAuthenticationParser) ParseAuthorizationMetadataAsHeader(
70-
ctx context.Context,
68+
md metadata.MD,
7169
w http.ResponseWriter,
7270
) error {
73-
// Get the metadata from the context
74-
md, err := gogrpcmd.GetIncomingCtxMetadata(ctx)
75-
if err != nil {
76-
return gonethttpresponse.NewDebugError(
77-
err,
78-
gonethttp.ErrInternalServerError,
79-
http.StatusInternalServerError,
80-
)
81-
}
82-
8371
// Get the authorization metadata from the context
8472
authorization, err := gogrpcmd.GetMetadataAuthorizationToken(md)
8573
if err != nil {
@@ -112,7 +100,7 @@ func (d DefaultAuthenticationParser) ParseAuthorizationMetadataAsHeader(
112100
//
113101
// Parameters:
114102
//
115-
// - ctx: context.Context
103+
// - md: The gRPC metadata with authorization information
116104
// - w: http.ResponseWriter
117105
//
118106
// Returns:

0 commit comments

Comments
 (0)