dry the duplicated functions and add comments

Author: suqin-haha

pkg/client/client.go

@@ -265,6 +265,8 @@ type DeviceAccessTokenRequest struct {
 	oidc.DeviceAccessTokenRequest
 }
 
+// CallDeviceAccessTokenEndpointWithAuthFn code moved from the CallDeviceAccessTokenEndpoint function
+// but allows for the authFn function to be passed in.
 func CallDeviceAccessTokenEndpointWithAuthFn(ctx context.Context, request *DeviceAccessTokenRequest, caller TokenEndpointCaller, authFn any) (*oidc.AccessTokenResponse, error) {
 	ctx, span := Tracer.Start(ctx, "CallDeviceAccessTokenEndpoint")
 	defer span.End()
@@ -281,6 +283,14 @@ func CallDeviceAccessTokenEndpointWithAuthFn(ctx context.Context, request *Devic
 	return resp, nil
 }
 
+// CallDeviceAccessTokenEndpoint code moved to CallDeviceAccessTokenEndpointWithAuthFn
+// Deprecated: Use CallDeviceAccessTokenEndpointWithAuthFn instead.
+func CallDeviceAccessTokenEndpoint(ctx context.Context, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
+	return CallDeviceAccessTokenEndpointWithAuthFn(ctx, request, caller, nil)
+}
+
+// PollDeviceAccessTokenEndpointWithAuthFn code moved from the PollDeviceAccessTokenEndpoint function
+// but allows for the authFn function to be passed in.
 func PollDeviceAccessTokenEndpointWithAuthFn(ctx context.Context, interval time.Duration, request *DeviceAccessTokenRequest, caller TokenEndpointCaller, authFn any) (*oidc.AccessTokenResponse, error) {
 	ctx, span := Tracer.Start(ctx, "PollDeviceAccessTokenEndpoint")
 	defer span.End()
@@ -319,56 +329,8 @@ func PollDeviceAccessTokenEndpointWithAuthFn(ctx context.Context, interval time.
 	}
 }
 
-func CallDeviceAccessTokenEndpoint(ctx context.Context, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
-	ctx, span := Tracer.Start(ctx, "CallDeviceAccessTokenEndpoint")
-	defer span.End()
-
-	req, err := httphelper.FormRequest(ctx, caller.TokenEndpoint(), request, Encoder, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := new(oidc.AccessTokenResponse)
-	if err := httphelper.HttpRequest(caller.HttpClient(), req, &resp); err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
+// PollDeviceAccessTokenEndpoint code moved to PollDeviceAccessTokenEndpointWithAuthFn
+// Deprecated: Use PollDeviceAccessTokenEndpointWithAuthFn instead.
 func PollDeviceAccessTokenEndpoint(ctx context.Context, interval time.Duration, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
-	ctx, span := Tracer.Start(ctx, "PollDeviceAccessTokenEndpoint")
-	defer span.End()
-
-	for {
-		timer := time.After(interval)
-		select {
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		case <-timer:
-		}
-
-		ctx, cancel := context.WithTimeout(ctx, interval)
-		defer cancel()
-
-		resp, err := CallDeviceAccessTokenEndpoint(ctx, request, caller)
-		if err == nil {
-			return resp, nil
-		}
-		if errors.Is(err, context.DeadlineExceeded) {
-			interval += 5 * time.Second
-		}
-		var target *oidc.Error
-		if !errors.As(err, &target) {
-			return nil, err
-		}
-		switch target.ErrorType {
-		case oidc.AuthorizationPending:
-			continue
-		case oidc.SlowDown:
-			interval += 5 * time.Second
-			continue
-		default:
-			return nil, err
-		}
-	}
+	return PollDeviceAccessTokenEndpointWithAuthFn(ctx, interval, request, caller, nil)
 }