Merge pull request #1539 from erwinvaneyk/replace-context-import

Replace x/net/context with stdlib context
dexidp · Aug 31, 2019 · c854e76 · c854e76
2 parents 4f3ab1e + 3e2217b
commit c854e76
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/server/api.go b/server/api.go
@@ -1,15 +1,12 @@
 package server
 
 import (
+	"context"
 	"errors"
 	"fmt"
 
 	"golang.org/x/crypto/bcrypt"
 
-	// go-grpc doesn't use the standard library's context.
-	// https://github.com/grpc/grpc-go/issues/711
-	"golang.org/x/net/context"
-
 	"github.com/dexidp/dex/api"
 	"github.com/dexidp/dex/pkg/log"
 	"github.com/dexidp/dex/server/internal"