Fix rebase

lib/auth/join/join.go

@@ -21,6 +21,7 @@ import (
 	"crypto"
 	"crypto/x509"
 	"log/slog"
+	"net/http"
 	"os"
 	"time"
 
@@ -812,20 +813,30 @@ func registerUsingTPMMethod(
 	return certs, trace.Wrap(err)
 }
 
+func mapFromHeader(header http.Header) map[string]string {
+	out := make(map[string]string, len(header))
+	for k := range header {
+		out[k] = header.Get(k)
+	}
+	return out
+}
+
 func registerUsingOracleMethod(
 	ctx context.Context, client joinServiceClient, token string, hostKeys *newHostKeys, params RegisterParams,
 ) (*proto.Certs, error) {
-	certs, err := client.RegisterUsingOracleMethod(ctx, func(challenge string) (*proto.RegisterUsingOracleMethodRequest, error) {
-		innerHeaders, outerHeaders, err := oracle.CreateSignedRequest(challenge)
-		if err != nil {
-			return nil, trace.Wrap(err)
-		}
-		return &proto.RegisterUsingOracleMethodRequest{
-			RegisterUsingTokenRequest: registerUsingTokenRequestForParams(token, hostKeys, params),
-			Headers:                   mapFromHeader(outerHeaders),
-			PayloadHeaders:            mapFromHeader(innerHeaders),
-		}, nil
-	})
+	certs, err := client.RegisterUsingOracleMethod(
+		ctx,
+		registerUsingTokenRequestForParams(token, hostKeys, params),
+		func(challenge string) (*proto.OracleSignedRequest, error) {
+			innerHeaders, outerHeaders, err := oracle.CreateSignedRequest(challenge)
+			if err != nil {
+				return nil, trace.Wrap(err)
+			}
+			return &proto.OracleSignedRequest{
+				Headers:        mapFromHeader(outerHeaders),
+				PayloadHeaders: mapFromHeader(innerHeaders),
+			}, nil
+		})
 	return certs, trace.Wrap(err)
 }