Refactor jwtutils to remove redundant key reader

sreya · sreya · commit 53dcf36a94a8 · 2024-10-17T00:54:05.000Z
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -169,7 +169,7 @@ func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
 
 	//nolint:gocritic // We need to read the system signing key
 	// in order to sign the token.
-	token, err := jwtutils.Sign(dbauthz.AsKeyReader(ctx), api.OIDCConvertKeyCache, claims)
+	token, err := jwtutils.Sign(ctx, api.OIDCConvertKeyCache, claims)
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Internal error signing state jwt.",
@@ -1681,7 +1681,7 @@ func (api *API) convertUserToOauth(ctx context.Context, r *http.Request, db data
 
 	//nolint:gocritic // We need to read the system signing key
 	// in order to verify the token.
-	err = jwtutils.Verify(dbauthz.AsKeyReader(ctx), api.OIDCConvertKeyCache, jwtCookie.Value, &claims)
+	err = jwtutils.Verify(ctx, api.OIDCConvertKeyCache, jwtCookie.Value, &claims)
 	if xerrors.Is(err, cryptokeys.ErrKeyNotFound) || xerrors.Is(err, cryptokeys.ErrKeyInvalid) || xerrors.Is(err, jose.ErrCryptoFailure) {
 		// These errors are probably because the user is mixing 2 coder deployments.
 		return database.User{}, idpsync.HTTPError{
