Skip to content

Commit

Permalink
name
Browse files Browse the repository at this point in the history
  • Loading branch information
Allyson-English committed Aug 12, 2024
1 parent 24d87a9 commit 0358267
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions internal/auth/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,13 @@ func newError(msg string, args ...any) error {

func NewVehicleTokenCheck(contractAddr string) func(context.Context, any, graphql.Resolver) (any, error) {
requiredAddr := common.HexToAddress(contractAddr)

return func(ctx context.Context, _ any, next graphql.Resolver) (any, error) {
vehicleTokenID, err := getArg[int](ctx, tokenIdArg)
if err != nil {
return nil, UnauthorizedError{err: err}
}

if err := headerTokenMatchesQuery(ctx, requiredAddr, vehicleTokenID); err != nil {
if err := validateHeader(ctx, requiredAddr, vehicleTokenID); err != nil {
return nil, UnauthorizedError{err: err}
}

Expand All @@ -86,7 +85,6 @@ func NewVehicleTokenCheck(contractAddr string) func(context.Context, any, graphq

func NewManufacturerTokenCheck(contractAddr string, identitySvc IdentityService) func(context.Context, any, graphql.Resolver) (any, error) {
requiredAddr := common.HexToAddress(contractAddr)

return func(ctx context.Context, _ any, next graphql.Resolver) (any, error) {
adFilter, err := getArg[model.AftermarketDeviceBy](ctx, byArg)
if err != nil {
Expand All @@ -98,15 +96,15 @@ func NewManufacturerTokenCheck(contractAddr string, identitySvc IdentityService)
return nil, err
}

if err := headerTokenMatchesQuery(ctx, requiredAddr, adResp.ManufacturerTokenID); err != nil {
if err := validateHeader(ctx, requiredAddr, adResp.ManufacturerTokenID); err != nil {
return nil, UnauthorizedError{err: err}
}

return next(ctx)
}
}

func headerTokenMatchesQuery(ctx context.Context, requiredAddr common.Address, tokenID int) error {
func validateHeader(ctx context.Context, requiredAddr common.Address, tokenID int) error {
claim, err := getTelemetryClaim(ctx)
if err != nil {
return err
Expand Down

0 comments on commit 0358267

Please sign in to comment.