diff --git a/backend/kubernetes/resources/namespace.go b/backend/kubernetes/resources/namespace.go index e3b80cf83..75efaf6ef 100644 --- a/backend/kubernetes/resources/namespace.go +++ b/backend/kubernetes/resources/namespace.go @@ -61,7 +61,7 @@ func CreateNamespace(ctx context.Context, client client.Client, generateNamePref name := identityHash(identity) namespace := &corev1.Namespace{ ObjectMeta: metav1.ObjectMeta{ - Name: fmt.Sprintf("%s-%s", generateNamePrefix, name), + Name: fmt.Sprintf("%s%s", generateNamePrefix, name), Annotations: map[string]string{ IdentityAnnotationKey: identity, AuthorAnnotationKey: author, diff --git a/backend/kubernetes/resources/namespace_test.go b/backend/kubernetes/resources/namespace_test.go index 6d83ba284..0db219ab6 100644 --- a/backend/kubernetes/resources/namespace_test.go +++ b/backend/kubernetes/resources/namespace_test.go @@ -60,7 +60,7 @@ func TestCreateNamespace(t *testing.T) { }, { name: "create new namespace with generateName already ending with dash", - generateName: "test-ns-", + generateName: "test-ns", identity: "test-id-456", author: "alice", wantErr: false, @@ -98,7 +98,7 @@ func TestCreateNamespace(t *testing.T) { expectedPrefix := tt.generateName expectedHash := expectedIdentityHash(tt.identity) - expectedName := fmt.Sprintf("%s-%s", expectedPrefix, expectedHash) + expectedName := fmt.Sprintf("%s%s", expectedPrefix, expectedHash) if result.Name != expectedName { t.Errorf("CreateNamespace() name = %v, expected %v", result.Name, expectedName) diff --git a/backend/options/options.go b/backend/options/options.go index 0f1b1b216..53df9c4f4 100644 --- a/backend/options/options.go +++ b/backend/options/options.go @@ -102,7 +102,7 @@ func NewOptions() *Options { ExtraOptions: ExtraOptions{ Provider: "kubernetes", - NamespacePrefix: "cluster", + NamespacePrefix: "cluster-", PrettyName: "Backend", ConsumerScope: string(kubebindv1alpha2.NamespacedScope), ClusterScopedIsolation: string(kubebindv1alpha2.IsolationPrefixed), diff --git a/deploy/examples/template-cowboys.yaml b/deploy/examples/template-cowboys.yaml index ee5d14074..5e9c7c805 100644 --- a/deploy/examples/template-cowboys.yaml +++ b/deploy/examples/template-cowboys.yaml @@ -16,6 +16,3 @@ spec: labelSelector: matchLabels: app: cowboy - namespaces: - - name: wild-west - diff --git a/deploy/examples/template-sheriffs.yaml b/deploy/examples/template-sheriffs.yaml index 8fb19c12f..b70a46577 100644 --- a/deploy/examples/template-sheriffs.yaml +++ b/deploy/examples/template-sheriffs.yaml @@ -21,6 +21,4 @@ spec: group: wildwest.dev jsonPath: name: spec.secretRefs.#.name - namespace: spec.secretRefs.#.namespace - namespaces: - - name: wild-west + namespace: spec.secretRefs.#.namespace \ No newline at end of file diff --git a/test/e2e/bind/happy-case_test.go b/test/e2e/bind/happy-case_test.go index 1fa8db252..a685a4501 100644 --- a/test/e2e/bind/happy-case_test.go +++ b/test/e2e/bind/happy-case_test.go @@ -47,6 +47,62 @@ import ( "github.com/kube-bind/kube-bind/test/e2e/framework" ) +// TestClusterScoped tests scenarios where consumer-side resources are cluster-scoped (Sheriffs). +// Uses: template-sheriffs.yaml (scope=Cluster) & cr-sheriff.yaml +// +// ARCHITECTURE FLOW: +// +// CONSUMER CLUSTER PROVIDER CLUSTER (Backend) +// ================ ========================== +// +// ┌─────────────────────────────┐ ┌────────────────────────────────────────────┐ +// │ Namespace: wild-west │ │ Contract Namespace (per consumer): │ +// │ - Secret: sheriff-badge- │──────────▶│ kube-bind- │ +// │ credentials (ref) │ Sync │ │ +// │ - Secret: sheriff-juris- │ │ APIServiceNamespace CR: │ +// │ diction-config (label) │ │ metadata.name: wild-west │ +// └─────────────────────────────┘ │ status.namespace: ─────────────────┐ │ +// │ kube-bind--wild-west│ │ +// ┌─────────────────────────────┐ └────────────────────────────────────────┼───┘ +// │ Sheriff: wyatt-earp │ │ +// │ (cluster-scoped) │──────────▶ ACTUAL PROVIDER NAMESPACE: ◀───────────┘ +// │ spec.intent │ Sync ┌────────────────────────────────────────────┐ +// │ spec.secretRefs: [...] │ │ Namespace: kube-bind--wild- │ +// └─────────────────────────────┘ │ west │ +// ▲ │ - Secret: sheriff-badge-credentials │ +// │ Status updates │ - Secret: sheriff-jurisdiction-config │ +// └────────────────────────────────│ │ +// │ RBAC (for secret access): │ +// │ - ClusterRole: kube-binder-export-wild- │ +// │ west-sheriffs (scope=ClusterScope) │ +// │ - Role: ... (scope=NamespacedScope) │ +// └────────────────────────────────────────────┘ +// +// Sheriff resource location (3 strategies): +// ┌────────────────────────────────────────────┐ +// │ [cc-prefixed] IsolationPrefixed: │ +// │ Sheriff: -wyatt-earp │ +// │ (cluster-scoped, prefixed name) │ +// └────────────────────────────────────────────┘ +// +// ┌────────────────────────────────────────────┐ +// │ [cc-none] IsolationNone: │ +// │ Sheriff: wyatt-earp │ +// │ (cluster-scoped, shared name!) │ +// │ ⚠ Last write wins between consumers │ +// └────────────────────────────────────────────┘ +// +// ┌────────────────────────────────────────────┐ +// │ [cc-namespaced] IsolationNamespaced: │ +// │ Sheriff: wyatt-earp │ +// │ in namespace: kube-bind-- │ +// │ wild-west │ +// │ (CRD toggled to NamespaceScoped) │ +// └────────────────────────────────────────────┘ +// +// KEY INSIGHT: Secrets are ALWAYS isolated per consumer via the contract namespace +// (kube-bind--wild-west), even with IsolationNone. The isolation +// strategy only affects cluster-scoped Sheriff resource naming/placement. func TestClusterScoped(t *testing.T) { // name & test type defined by letters - cc - cluster-cluster so its easier to identify failures in the logs. testHappyCase(t, "cc-prefixed", apiextensionsv1.ClusterScoped, apiextensionsv1.ClusterScoped, kubebindv1alpha2.ClusterScope, kubebindv1alpha2.IsolationPrefixed) @@ -54,11 +110,170 @@ func TestClusterScoped(t *testing.T) { testHappyCase(t, "cc-namespaced", apiextensionsv1.ClusterScoped, apiextensionsv1.NamespaceScoped, kubebindv1alpha2.ClusterScope, kubebindv1alpha2.IsolationNamespaced) } +// TestNamespacedScoped tests scenarios where consumer-side resources are namespaced (Cowboys). +// Uses: template-cowboys.yaml (scope=Namespaced) & cr-cowboy.yaml +// +// ARCHITECTURE FLOW: +// +// CONSUMER CLUSTER PROVIDER CLUSTER (Backend) +// ================ ========================== +// +// ┌─────────────────────────────┐ ┌────────────────────────────────────────────┐ +// │ Namespace: wild-west │ │ Contract Namespace (per consumer): │ +// │ │──────────▶│ kube-bind- │ +// │ Cowboy: billy-the-kid │ Sync │ │ +// │ (namespaced) │ │ APIServiceNamespace CR: │ +// │ spec.intent │ │ metadata.name: wild-west │ +// │ spec.secretRefs: [...] │ │ status.namespace: ─────────────────┐ │ +// │ │ │ kube-bind--wild-west│ │ +// │ - Secret: colt-45-permit │ └────────────────────────────────────────┼───┘ +// │ (ref) │ │ +// │ - Secret: cowboy-gang- │ ACTUAL PROVIDER NAMESPACE: ◀─────────────┘ +// │ affiliation (label) │ ┌────────────────────────────────────────────┐ +// └─────────────────────────────┘ │ Namespace: kube-bind--wild- │ +// ▲ │ west │ +// │ Status updates │ │ +// └────────────────────────────────│ Cowboy: billy-the-kid (namespaced) │ +// │ - Secret: colt-45-permit │ +// │ - Secret: cowboy-gang-affiliation │ +// │ │ +// │ RBAC (for secret access): │ +// │ - Role: kube-binder-export-wild-west- │ +// │ cowboys (in this namespace) │ +// │ - RoleBinding: ... (in this namespace) │ +// └────────────────────────────────────────────┘ +// +// Two test scenarios: +// ┌────────────────────────────────────────────────────────────────────┐ +// │ [nn] Namespaced → Namespaced (informerScope=NamespacedScope): │ +// │ - Consumer: Cowboy in namespace wild-west │ +// │ - Provider: Cowboy in namespace kube-bind--wild-west │ +// │ - Konnector watches only its own namespace on provider side │ +// │ - Natural isolation via namespaces │ +// └────────────────────────────────────────────────────────────────────┘ +// +// ┌────────────────────────────────────────────────────────────────────┐ +// │ [nc] Namespaced → Cluster (informerScope=ClusterScope): │ +// │ - Consumer: Cowboy in namespace wild-west │ +// │ - Provider: Cowboy in namespace kube-bind--wild-west │ +// │ - Konnector watches cluster-wide on provider side │ +// │ - Still isolated via namespaces, but different RBAC model │ +// └────────────────────────────────────────────────────────────────────┘ +// +// KEY INSIGHT: Namespaced resources are ALWAYS isolated per consumer because +// each consumer gets its own provider namespace (kube-bind--wild-west). +// The informerScope parameter only affects whether the konnector watches at namespace +// or cluster level, not the isolation model. func TestNamespacedScoped(t *testing.T) { testHappyCase(t, "nn", apiextensionsv1.NamespaceScoped, apiextensionsv1.NamespaceScoped, kubebindv1alpha2.NamespacedScope, "") testHappyCase(t, "nc", apiextensionsv1.NamespaceScoped, apiextensionsv1.NamespaceScoped, kubebindv1alpha2.ClusterScope, "") } +// testHappyCase is the main test function that validates end-to-end kube-bind functionality. +// It tests the complete lifecycle of binding, syncing, and managing resources between +// consumer and provider clusters. +// +// TEST EXECUTION FLOW (with 2 consumers for isolation verification): +// +// SETUP PHASE +// =========== +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 1. Create provider workspace (KCP) │ +// │ - Install kube-bind CRDs │ +// │ - Start backend server (HTTP API for binding) │ +// │ - Bootstrap example CRDs (Cowboys/Sheriffs) via examples.Bootstrap() │ +// │ - Apply templates (template-cowboys.yaml / template-sheriffs.yaml) │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 2. Create consumer workspaces (consumer1, consumer2) │ +// │ - Start konnector on each consumer (watches APIServiceBinding) │ +// └──────────────────────────────────────────────────────────────────────────┘ +// +// BINDING PHASE (executed for each consumer) +// ============= +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 3. Login to provider │ +// │ - Simulate browser auth flow │ +// │ - Save credentials to kube-bind-config.yaml │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 4. List templates & collections │ +// │ - Verify backend returns 2 templates (cowboys, sheriffs) │ +// │ - Verify 1 collection exists │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 5. Bind API (consumer.Bind()) │ +// │ - Send BindableResourcesRequest with: │ +// │ • templateRef: "cowboys" or "sheriffs" │ +// │ • clusterIdentity: │ +// │ - Backend creates on provider: │ +// │ • Contract namespace: kube-bind- │ +// │ • APIServiceExportRequest │ +// │ • APIServiceNamespace: wild-west → kube-bind--wild-west │ +// │ • RBAC resources for secret access │ +// │ - Backend returns BindingResourceResponse with CRDs, RBAC manifests │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 6. Apply binding on consumer (BindFromResponse()) │ +// │ - Create APIServiceBinding (watched by konnector) │ +// │ - Apply CRDs (Cowboys.wildwest.dev or Sheriffs.wildwest.dev) │ +// │ - Wait for CRD to be established │ +// └──────────────────────────────────────────────────────────────────────────┘ +// +// SYNCHRONIZATION & VERIFICATION PHASE (per consumer) +// =================================== +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 7. Create instance on consumer (from cr-cowboy.yaml / cr-sheriff.yaml) │ +// │ - Namespace: wild-west │ +// │ - Resource: billy-the-kid (Cowboy) or wyatt-earp (Sheriff) │ +// │ - Secrets: colt-45-permit, cowboy-gang-affiliation, etc. │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 8. Verify sync to provider │ +// │ ✓ Instance created on provider (with ClusterNamespaceAnnotation) │ +// │ ✓ providerContractNamespace extracted from annotation │ +// │ ✓ providerObjectNamespace captured (may be empty for cluster-scoped) │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 9. Verify namespace pre-seeding & RBAC │ +// │ ✓ APIServiceNamespace created with .status.namespace populated │ +// │ ✓ Actual provider namespace exists (kube-bind--wild-west) │ +// │ ✓ RBAC created (ClusterRole/Role + Bindings) for secret access │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 10. Test bi-directional sync │ +// │ ✓ Update spec on consumer → synced to provider │ +// │ ✓ Update status on provider → synced to consumer │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 11. Verify secret sync (from permissionClaims in template) │ +// │ ✓ Referenced secret (spec.secretRefs) synced to provider namespace │ +// │ ✓ Label-selected secret (app=cowboy/sheriff) synced │ +// │ Location: kube-bind--wild-west/ │ +// └──────────────────────────────────────────────────────────────────────────┘ +// ▼ +// ┌──────────────────────────────────────────────────────────────────────────┐ +// │ 12. Test deletion │ +// │ ✓ Delete on consumer → deleted on provider │ +// └──────────────────────────────────────────────────────────────────────────┘ +// +// MULTI-CONSUMER ISOLATION VERIFICATION: +// ====================================== +// Running with 2 consumers validates that: +// - Each consumer gets isolated contract namespace (kube-bind-, kube-bind-) +// - Each consumer gets isolated provider namespace (kube-bind--wild-west, etc.) +// - Secrets are fully isolated between consumers +// - For cluster-scoped resources with IsolationNone, last-write-wins (both write to same Sheriff name) +// - For cluster-scoped resources with IsolationPrefixed, resources are name-prefixed +// - For cluster-scoped resources with IsolationNamespaced, provider CRD is toggled to NamespaceScoped func testHappyCase( t *testing.T, name string, @@ -70,9 +285,6 @@ func testHappyCase( ctx, cancel := context.WithCancel(context.Background()) t.Cleanup(cancel) // Commented out to prevent cleanup of kcp assets - clusterIdentity, err := uuid.NewUUID() - require.NoError(t, err) - suffix := framework.RandomString(4) t.Logf("Creating provider workspace") @@ -101,8 +313,11 @@ func testHappyCase( } t.Logf("Creating consumer workspace and starting konnector") - consumerConfig, consumerKubeconfig := framework.NewWorkspace(t, framework.ClientConfig(t), framework.WithName("%s-consumer-%s", name, suffix)) - framework.StartKonnector(t, consumerConfig, "--kubeconfig="+consumerKubeconfig) + consumer1Config, consumer1Kubeconfig := framework.NewWorkspace(t, framework.ClientConfig(t), framework.WithName("%s-consumer-%s", name, suffix)) + framework.StartKonnector(t, consumer1Config, "--kubeconfig="+consumer1Kubeconfig, "--server-address=:0") + + consumer2Config, consumer2Kubeconfig := framework.NewWorkspace(t, framework.ClientConfig(t), framework.WithName("%s-consumer-%s", name, suffix)) + framework.StartKonnector(t, consumer2Config, "--kubeconfig="+consumer2Kubeconfig, "--server-address=:0") serviceGVR := schema.GroupVersionResource{Group: "wildwest.dev", Version: "v1alpha1", Resource: "cowboys"} templateRef := "cowboys" @@ -112,25 +327,13 @@ func testHappyCase( templateRef = "sheriffs" } - consumerClient := framework.DynamicClient(t, consumerConfig).Resource(serviceGVR) + consumer1Client := framework.DynamicClient(t, consumer1Config).Resource(serviceGVR) + consumer2Client := framework.DynamicClient(t, consumer2Config).Resource(serviceGVR) providerClient := framework.DynamicClient(t, providerConfig).Resource(serviceGVR) providerCoreClient := framework.KubeClient(t, providerConfig).CoreV1() providerBindClient := framework.BindClient(t, providerConfig) - // Instance variables removed - now seeded directly in test - // These two namespaces are where the "main" object resides on each cluster. - consumerNs, providerNs := "wild-west", "unknown" - - // When namespaced isolation is used (i.e. cluster-scoped objects on the consumer - // turn into namespaced objects on the provider cluster), permission claimed objects - // are still synced into their respective APIServiceNamespace-managed namespaces. - permClaimNs := "unknown" - - // cluster namespace is the main "contract" namespace, i.e. where the BoundSchema and other - // bind-related objects reside. - clusterNs, clusterScopedUpInsName := "unknown", "unknown" - kubeBindConfig := path.Join(framework.WorkDir, "kube-bind-config.yaml") // Secrets from the actual examples: @@ -148,10 +351,7 @@ func testHappyCase( filename = "cr-sheriff.yaml" } - // Note: sheriff secrets are in sheriff-operations namespace, but they will be synced to the provider namespace - - // binding step outputs this. - var bindResponse *kubebindv1alpha2.BindingResourceResponse + // Initial setup steps for _, tc := range []struct { name string step func(t *testing.T) @@ -185,447 +385,452 @@ func testHappyCase( require.Len(t, result.Items, 1) }, }, - { - name: "Get bind APIServiceExportRequest from server", - step: func(t *testing.T) { - c := framework.GetKubeBindRestClient(t, kubeBindConfig) - var err error + } { + t.Run(tc.name, func(t *testing.T) { + tc.step(t) + }) + } - bindResponse, err = c.Bind(ctx, &kubebindv1alpha2.BindableResourcesRequest{ - ObjectMeta: metav1.ObjectMeta{ - Name: "test-binding", - }, - TemplateRef: kubebindv1alpha2.APIServiceExportTemplateRef{ - Name: templateRef, - }, - ClusterIdentity: kubebindv1alpha2.ClusterIdentity{ - Identity: clusterIdentity.String(), - }, - }) - require.NoError(t, err) - require.NotNil(t, bindResponse) - }, - }, + // Consumer-specific test loops + for _, consumer := range []struct { + // name is unique name usined in naming instances + name string + // clusterIdentity is unique UUID representing the consumer cluster identity. + clusterIdentity uuid.UUID + // consumerConfig is the REST config for the consumer cluster. + consumerConfig *rest.Config + // consumerKubeconfig is the kubeconfig path for the consumer cluster. + consumerKubeconfig string + // consumerClient is the dynamic client for the main resource on the consumer side. + consumerClient dynamic.NamespaceableResourceInterface + + // Bellow are runtime values populated during the test run and stored in the same struct + // for easier access. + + // providerContractNamespace is the namespace representing the binding contract on the backend side. + // YOu can get it from every synced object annotation. + providerContractNamespace string + // providerObjectNamespace is the namespace on the provider side where the synced object resides. Might be empty for cluster-scoped. + providerObjectNamespace string + // consumerObjectNamespace is the namespace on the consumer side where the main object resides. + consumerObjectNamespace string + // bindResponse is the response from the bind API call for this consumer. This contains dedicated provider + // resources for this consumer. + bindResponse *kubebindv1alpha2.BindingResourceResponse + }{ { - name: "Bind the payload", - step: func(t *testing.T) { - iostreams, _, _, _ := genericclioptions.NewTestIOStreams() - binderOpts := &bindapiservice.BinderOptions{ - IOStreams: iostreams, - SkipKonnector: true, - } - - binder := bindapiservice.NewBinder(consumerConfig, binderOpts) - result, err := binder.BindFromResponse(ctx, bindResponse) - require.NoError(t, err) - require.Len(t, result, 1) - - t.Logf("Waiting for %s CRD to be created on consumer side", serviceGVR.Resource) - crdClient := framework.ApiextensionsClient(t, consumerConfig).ApiextensionsV1().CustomResourceDefinitions() - require.Eventually(t, func() bool { - if serviceGVR.Group == "" { - serviceGVR.Group = "core" - } - _, err := crdClient.Get(ctx, serviceGVR.Resource+"."+serviceGVR.Group, metav1.GetOptions{}) - return err == nil - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for %s CRD to be created on consumer side", serviceGVR.Resource) - }, + name: "consumer1", + clusterIdentity: uuid.Must(uuid.NewUUID()), + consumerConfig: consumer1Config, + consumerKubeconfig: consumer1Kubeconfig, + consumerClient: consumer1Client, + + providerContractNamespace: "unknown", + providerObjectNamespace: "unknown", + consumerObjectNamespace: "wild-west", // This is part of binding contract and should be honored + bindResponse: nil, }, { - name: "instances are synced", - step: func(t *testing.T) { - t.Logf("Seeding example objects on consumer side for %s", serviceGVR.Resource) - - err := seedSpecificCRExample(t, framework.DynamicClient(t, consumerConfig), filename, "test") - require.NoError(t, err) - - t.Logf("Trying to create %s on consumer side", serviceGVR.Resource) - - t.Logf("Waiting for the %s instance to be created on provider side", serviceGVR.Resource) - var instances *unstructured.UnstructuredList - require.Eventually(t, func() bool { - var err error - instances, err = providerClient.List(ctx, metav1.ListOptions{}) - return err == nil && len(instances.Items) == 1 - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be created on provider side", serviceGVR.Resource) + name: "consumer2", + clusterIdentity: uuid.Must(uuid.NewUUID()), + consumerConfig: consumer2Config, + consumerKubeconfig: consumer2Kubeconfig, + consumerClient: consumer2Client, + + providerContractNamespace: "unknown", + providerObjectNamespace: "unknown", + consumerObjectNamespace: "wild-west", + bindResponse: nil, + }, + } { + t.Run(consumer.name, func(t *testing.T) { + for _, tc := range []struct { + name string + step func(t *testing.T) + }{ + { + name: "Get bind APIServiceExportRequest from server", + step: func(t *testing.T) { + c := framework.GetKubeBindRestClient(t, kubeBindConfig) + var err error - // these are used everywhere further down - firstObj := instances.Items[0] + consumer.bindResponse, err = c.Bind(ctx, &kubebindv1alpha2.BindableResourcesRequest{ + ObjectMeta: metav1.ObjectMeta{ + Name: "test-binding", + }, + TemplateRef: kubebindv1alpha2.APIServiceExportTemplateRef{ + Name: templateRef, + }, + ClusterIdentity: kubebindv1alpha2.ClusterIdentity{ + Identity: consumer.clusterIdentity.String(), + }, + }) + require.NoError(t, err) + require.NotNil(t, *consumer.bindResponse) + }, + }, + { + name: "Bind the payload on consumer side", + step: func(t *testing.T) { + iostreams, _, _, _ := genericclioptions.NewTestIOStreams() + binderOpts := &bindapiservice.BinderOptions{ + IOStreams: iostreams, + SkipKonnector: true, + } - // providerNs is the namespaced where the synced object lives; this might be empty - // for cluster-scoped objects on the provider side. - providerNs = firstObj.GetNamespace() + binder := bindapiservice.NewBinder(consumer.consumerConfig, binderOpts) + result, err := binder.BindFromResponse(ctx, consumer.bindResponse) + require.NoError(t, err) + require.Len(t, result, 1) - // Cluster namespace represent binding contract namespace, and is stored on every object. - clusterNs = firstObj.GetAnnotations()[types.ClusterNamespaceAnnotationKey] - require.NotEmpty(t, clusterNs, "cluster namespace annotation must always exist") + t.Logf("Waiting for %s CRD to be created on consumer side", serviceGVR.Resource) + crdClient := framework.ApiextensionsClient(t, consumer.consumerConfig).ApiextensionsV1().CustomResourceDefinitions() + require.Eventually(t, func() bool { + if serviceGVR.Group == "" { + serviceGVR.Group = "core" + } + _, err := crdClient.Get(ctx, serviceGVR.Resource+"."+serviceGVR.Group, metav1.GetOptions{}) + return err == nil + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for %s CRD to be created on consumer side", serviceGVR.Resource) + }, + }, + { + name: "instances are synced", + step: func(t *testing.T) { + instanceName := fmt.Sprintf("test-%s", consumer.name) + t.Logf("Seeding example objects on consumer side for %s with instance name %s", serviceGVR.Resource, instanceName) + + err := seedSpecificCRExample(t, framework.DynamicClient(t, consumer.consumerConfig), filename, instanceName) + require.NoError(t, err) - // the object name on the provider side; this is only used for cluster-scoped objects - clusterScopedUpInsName = firstObj.GetName() - }, - }, - // Request included namespace, so we check it first - { - name: "verify provider side namespace pre-seeding and RBAC management", - step: func(t *testing.T) { - t.Logf("Verifying APIServiceNamespace was created from pre-seeded namespace spec") - var foundPreSeededNamespace bool - var actualProviderNamespace string - require.Eventually(t, func() bool { - // If we are operating namespaced resources - namespace will be set, if cluster - we need to use - // extracted one from the cluster-scoped object. - namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(clusterNs).List(ctx, metav1.ListOptions{}) - if err != nil { - return false - } - - for _, ns := range namespaces.Items { - if ns.Name == "wild-west" && ns.Status.Namespace != "" { - actualProviderNamespace = ns.Status.Namespace - foundPreSeededNamespace = true - return true + t.Logf("Trying to create %s on consumer side", serviceGVR.Resource) + + t.Logf("Waiting for the %s instance to be created on provider side", serviceGVR.Resource) + var instances *unstructured.UnstructuredList + require.Eventually(t, func() bool { + var err error + instances, err = providerClient.List(ctx, metav1.ListOptions{}) + return err == nil && len(instances.Items) >= 1 + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be created on provider side", serviceGVR.Resource) + + // Find our specific instance + var ourInstance *unstructured.Unstructured + for _, item := range instances.Items { + if strings.Contains(item.GetName(), instanceName) { + ourInstance = &item + break + } } - } - return false - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for pre-seeded APIServiceNamespace to be created on provider side") - require.True(t, foundPreSeededNamespace, "Pre-seeded namespace 'wild-west' should be created via APIServiceExportRequest.Spec.Namespaces") - - providerCoreClient := framework.KubeClient(t, providerConfig).CoreV1() - _, err := providerCoreClient.Namespaces().Get(ctx, actualProviderNamespace, metav1.GetOptions{}) - require.NoError(t, err, "Physical provider side namespace should exist") - - switch informerScope { - case kubebindv1alpha2.ClusterScope: - t.Logf("Verifying RBAC resources were created for secret management in cluster scope") - rbacClient := framework.KubeClient(t, providerConfig).RbacV1() - - clusterRoles, err := rbacClient.ClusterRoles().List(ctx, metav1.ListOptions{}) - require.NoError(t, err) - - var foundSecretClusterRole bool - for _, cr := range clusterRoles.Items { - if strings.Contains(cr.Name, "kube-binder-export") { - for _, rule := range cr.Rules { - for _, resource := range rule.Resources { - if resource == "secrets" { - foundSecretClusterRole = true - require.Contains(t, rule.Verbs, "*", "ClusterRole should have * permissions for secrets") - require.Contains(t, rule.APIGroups, "", "ClusterRole should target core API group") - break + require.NotNil(t, ourInstance, "should find instance for consumer %s", consumer.name) + + // providerNs is the namespaced where the synced object lives; this might be empty + // for cluster-scoped objects on the provider side. + consumer.providerObjectNamespace = ourInstance.GetNamespace() + // Cluster namespace represent binding contract namespace, and is stored on every object. + consumer.providerContractNamespace = ourInstance.GetAnnotations()[types.ClusterNamespaceAnnotationKey] + require.NotEmpty(t, consumer.providerContractNamespace, "cluster namespace annotation must always exist") + require.NotEqual(t, consumer.providerContractNamespace, "unknown") + }, + }, + // Request included namespace, so we check it first + { + name: "verify provider side namespace pre-seeding and RBAC management", + step: func(t *testing.T) { + t.Logf("Verifying APIServiceNamespace was created from pre-seeded namespace spec") + var foundPreSeededNamespace bool + var actualProviderNamespace string + require.Eventually(t, func() bool { + // If we are operating namespaced resources - namespace will be set, if cluster - we need to use + // extracted one from the cluster-scoped object. + namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(consumer.providerContractNamespace).List(ctx, metav1.ListOptions{}) + if err != nil { + return false + } + + for _, ns := range namespaces.Items { + if ns.Name == "wild-west" && ns.Status.Namespace != "" { + actualProviderNamespace = ns.Status.Namespace + foundPreSeededNamespace = true + return true + } + } + return false + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for pre-seeded APIServiceNamespace to be created on provider side") + require.True(t, foundPreSeededNamespace, "Pre-seeded namespace 'wild-west' should be created via APIServiceExportRequest.Spec.Namespaces") + + providerCoreClient := framework.KubeClient(t, providerConfig).CoreV1() + _, err := providerCoreClient.Namespaces().Get(ctx, actualProviderNamespace, metav1.GetOptions{}) + require.NoError(t, err, "Actual provider side namespace object should exist") + + switch informerScope { + case kubebindv1alpha2.ClusterScope: + t.Logf("Verifying RBAC resources were created for secret management in cluster scope") + rbacClient := framework.KubeClient(t, providerConfig).RbacV1() + + clusterRoles, err := rbacClient.ClusterRoles().List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + + var foundSecretClusterRole bool + for _, cr := range clusterRoles.Items { + if strings.Contains(cr.Name, "kube-binder-export") { + for _, rule := range cr.Rules { + for _, resource := range rule.Resources { + if resource == "secrets" { + foundSecretClusterRole = true + require.Contains(t, rule.Verbs, "*", "ClusterRole should have * permissions for secrets") + require.Contains(t, rule.APIGroups, "", "ClusterRole should target core API group") + break + } + } } } } - } - } - require.True(t, foundSecretClusterRole, "ClusterRole for secrets should be created") - - t.Logf("Verifying ClusterRoleBinding was created for pre-seeded namespace secret access") - clusterRoleBindings, err := rbacClient.ClusterRoleBindings().List(ctx, metav1.ListOptions{}) - require.NoError(t, err) - - var foundSecretClusterRoleBinding bool - for _, crb := range clusterRoleBindings.Items { - if strings.Contains(crb.Name, "kube-binder-export") { - for _, subject := range crb.Subjects { - if subject.Kind == "ServiceAccount" && subject.Name == kuberesources.ServiceAccountName { - foundSecretClusterRoleBinding = true - require.Equal(t, "ClusterRole", crb.RoleRef.Kind, "Should reference ClusterRole") - break + require.True(t, foundSecretClusterRole, "ClusterRole for secrets should be created") + + t.Logf("Verifying ClusterRoleBinding was created for pre-seeded namespace secret access") + clusterRoleBindings, err := rbacClient.ClusterRoleBindings().List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + + var foundSecretClusterRoleBinding bool + for _, crb := range clusterRoleBindings.Items { + if strings.Contains(crb.Name, "kube-binder-export") { + for _, subject := range crb.Subjects { + if subject.Kind == "ServiceAccount" && subject.Name == kuberesources.ServiceAccountName { + foundSecretClusterRoleBinding = true + require.Equal(t, "ClusterRole", crb.RoleRef.Kind, "Should reference ClusterRole") + break + } + } } } - } - } - require.True(t, foundSecretClusterRoleBinding, "ClusterRoleBinding for ServiceAccount should be created") - case kubebindv1alpha2.NamespacedScope: - t.Logf("Verifying RBAC resources were created for secret management in namespace scope") - rbacClient := framework.KubeClient(t, providerConfig).RbacV1() - - roles, err := rbacClient.Roles(providerNs).List(ctx, metav1.ListOptions{}) - require.NoError(t, err) - - var foundSecretRole bool - for _, cr := range roles.Items { - if strings.Contains(cr.Name, "kube-binder-export") { - for _, rule := range cr.Rules { - for _, resource := range rule.Resources { - if resource == "secrets" { - foundSecretRole = true - require.Contains(t, rule.Verbs, "*", "Role should have * permissions for secrets") - require.Contains(t, rule.APIGroups, "", "Role should target core API group") - break + require.True(t, foundSecretClusterRoleBinding, "ClusterRoleBinding for ServiceAccount should be created") + case kubebindv1alpha2.NamespacedScope: + t.Logf("Verifying RBAC resources were created for secret management in namespace scope") + rbacClient := framework.KubeClient(t, providerConfig).RbacV1() + + roles, err := rbacClient.Roles(consumer.providerObjectNamespace).List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + + var foundSecretRole bool + for _, cr := range roles.Items { + if strings.Contains(cr.Name, "kube-binder-export") { + for _, rule := range cr.Rules { + for _, resource := range rule.Resources { + if resource == "secrets" { + foundSecretRole = true + require.Contains(t, rule.Verbs, "*", "Role should have * permissions for secrets") + require.Contains(t, rule.APIGroups, "", "Role should target core API group") + break + } + } } } } - } - } - require.True(t, foundSecretRole, "Role for secrets should be created") - - t.Logf("Verifying RoleBinding was created for pre-seeded namespace secret access") - roleBindings, err := rbacClient.RoleBindings(providerNs).List(ctx, metav1.ListOptions{}) - require.NoError(t, err) - - var foundSecretRoleBinding bool - for _, crb := range roleBindings.Items { - if strings.Contains(crb.Name, "kube-binder-") && strings.Contains(crb.Name, "-export-") { - for _, subject := range crb.Subjects { - if subject.Kind == "ServiceAccount" && subject.Name == kuberesources.ServiceAccountName { - foundSecretRoleBinding = true - require.Equal(t, "Role", crb.RoleRef.Kind, "Should reference Role") - break + require.True(t, foundSecretRole, "Role for secrets should be created") + + t.Logf("Verifying RoleBinding was created for pre-seeded namespace secret access") + roleBindings, err := rbacClient.RoleBindings(consumer.providerObjectNamespace).List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + + var foundSecretRoleBinding bool + for _, crb := range roleBindings.Items { + if strings.Contains(crb.Name, "kube-binder-") && strings.Contains(crb.Name, "-export-") { + for _, subject := range crb.Subjects { + if subject.Kind == "ServiceAccount" && subject.Name == kuberesources.ServiceAccountName { + foundSecretRoleBinding = true + require.Equal(t, "Role", crb.RoleRef.Kind, "Should reference Role") + break + } + } } } + require.True(t, foundSecretRoleBinding, "RoleBinding for ServiceAccount should be created") } - } - require.True(t, foundSecretRoleBinding, "RoleBinding for ServiceAccount should be created") - } - t.Logf("Provider side namespace pre-seeding and secret management RBAC verified successfully") - }, - }, - { - name: "verify secrets from examples are synced", - step: func(t *testing.T) { - t.Logf("Verifying that secrets from the embedded examples are already synced to provider") + t.Logf("Provider side namespace pre-seeding and secret management RBAC verified successfully") + }, + }, + { + name: "instance spec updated downstream is updated upstream", + step: func(t *testing.T) { + instanceName := fmt.Sprintf("test-%s", consumer.name) + err := retry.RetryOnConflict(retry.DefaultRetry, func() error { + var obj *unstructured.Unstructured + var err error + if consumerResourceScope == apiextensionsv1.NamespaceScoped { + obj, err = consumer.consumerClient.Namespace(consumer.consumerObjectNamespace).Get(ctx, instanceName, metav1.GetOptions{}) + } else { + obj, err = consumer.consumerClient.Get(ctx, instanceName, metav1.GetOptions{}) + } + require.NoError(t, err) + if consumerResourceScope == apiextensionsv1.NamespaceScoped { + unstructured.SetNestedField(obj.Object, fmt.Sprintf("Updated cowboy intent from %s", consumer.name), "spec", "intent") //nolint:errcheck + _, err = consumer.consumerClient.Namespace(consumer.consumerObjectNamespace).Update(ctx, obj, metav1.UpdateOptions{}) + } else { + unstructured.SetNestedField(obj.Object, fmt.Sprintf("Updated sheriff intent from %s", consumer.name), "spec", "intent") //nolint:errcheck + _, err = consumer.consumerClient.Update(ctx, obj, metav1.UpdateOptions{}) + } + return err + }) + require.NoError(t, err) - err := seedSpecificCRExample(t, framework.DynamicClient(t, consumerConfig), filename, "test") - require.NoError(t, err) - }, - }, - { - name: "establish permission claims namespace", - step: func(t *testing.T) { - // We need to establish namespace only in cluster scope for cluster scoped resources. - // Else we can trust sync object namespace as it will be the same. - if informerScope == kubebindv1alpha2.ClusterScope && - consumerResourceScope == apiextensionsv1.ClusterScoped { - if providerNs == "unknown" { - t.Fatal("providerNS is not set. Programming error in the test.") - } - - t.Logf("Waiting for APIServiceNamespace to be created on provider side: %s", clusterNs) - require.Eventually(t, func() bool { - var err error - namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(clusterNs).List(ctx, metav1.ListOptions{}) - if err != nil { + // Find our instance on provider side + require.Eventually(t, func() bool { + instances, err := providerClient.List(ctx, metav1.ListOptions{}) + if err != nil { + return false + } + for _, item := range instances.Items { + if !strings.Contains(item.GetName(), instanceName) { + continue + } + var obj *unstructured.Unstructured + if providerResourceScope == apiextensionsv1.NamespaceScoped { + obj, err = providerClient.Namespace(item.GetNamespace()).Get(ctx, instanceName, metav1.GetOptions{}) + } else { + obj, err = providerClient.Get(ctx, item.GetName(), metav1.GetOptions{}) + } + if err != nil { + return false + } + value, _, err := unstructured.NestedString(obj.Object, "spec", "intent") + require.NoError(t, err) + if consumerResourceScope == apiextensionsv1.NamespaceScoped { + return value == fmt.Sprintf("Updated cowboy intent from %s", consumer.name) + } else { + return value == fmt.Sprintf("Updated sheriff intent from %s", consumer.name) + } + } return false + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be updated upstream for %s", serviceGVR.Resource, consumer.name) + }, + }, + { + name: "instance status updated upstream is updated downstream", + step: func(t *testing.T) { + instanceName := fmt.Sprintf("test-%s", consumer.name) + // Find our instance on provider side first + var providerInstanceName string + var providerInstanceNs string + instances, err := providerClient.List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + for _, item := range instances.Items { + if strings.Contains(item.GetName(), instanceName) { + providerInstanceName = item.GetName() + providerInstanceNs = item.GetNamespace() + break + } } + require.NotEmpty(t, providerInstanceName, "should find provider instance for %s", consumer.name) + + err = retry.RetryOnConflict(retry.DefaultRetry, func() error { + var obj *unstructured.Unstructured + var err error + if providerResourceScope == apiextensionsv1.NamespaceScoped { + obj, err = providerClient.Namespace(providerInstanceNs).Get(ctx, instanceName, metav1.GetOptions{}) + } else { + obj, err = providerClient.Get(ctx, providerInstanceName, metav1.GetOptions{}) + } + require.NoError(t, err) + unstructured.SetNestedField(obj.Object, fmt.Sprintf("Ready to ride from %s", consumer.name), "status", "result") //nolint:errcheck + if providerResourceScope == apiextensionsv1.NamespaceScoped { + _, err = providerClient.Namespace(providerInstanceNs).UpdateStatus(ctx, obj, metav1.UpdateOptions{}) + } else { + _, err = providerClient.UpdateStatus(ctx, obj, metav1.UpdateOptions{}) + } + return err + }) + require.NoError(t, err) - for _, namespace := range namespaces.Items { - if strings.Contains(namespace.Name, consumerNs) && namespace.Status.Namespace != "" { - permClaimNs = namespace.Status.Namespace - return true + require.Eventually(t, func() bool { + var obj *unstructured.Unstructured + var err error + if consumerResourceScope == apiextensionsv1.NamespaceScoped { + obj, err = consumer.consumerClient.Namespace(consumer.consumerObjectNamespace).Get(ctx, instanceName, metav1.GetOptions{}) + } else { + obj, err = consumer.consumerClient.Get(ctx, instanceName, metav1.GetOptions{}) } + require.NoError(t, err) + value, _, err := unstructured.NestedString(obj.Object, "status", "result") + require.NoError(t, err) + return value == fmt.Sprintf("Ready to ride from %s", consumer.name) + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be updated downstream for %s", serviceGVR.Resource, consumer.name) + }, + }, + + { + name: "verify secrets from examples are synced to provider", + step: func(t *testing.T) { + // Determine which permission namespace to use for this consumer + var consumerPermClaimNs string + if informerScope == kubebindv1alpha2.ClusterScope && + consumerResourceScope == apiextensionsv1.ClusterScoped { + // Find the specific permission claim namespace for this consumer + namespaces, err := providerBindClient.KubeBindV1alpha2().APIServiceNamespaces(consumer.providerContractNamespace).List(ctx, metav1.ListOptions{}) + require.NoError(t, err) + for _, namespace := range namespaces.Items { + if strings.Contains(namespace.Name, consumer.consumerObjectNamespace) && namespace.Status.Namespace != "" { + consumerPermClaimNs = namespace.Status.Namespace + break + } + } + require.NotEmpty(t, consumerPermClaimNs, "Should find permission claim namespace for %s", consumer.name) + } else { + consumerPermClaimNs = consumer.providerObjectNamespace } - return false - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for APIServiceNamespace to be created on provider side") - require.NotEmpty(t, permClaimNs, "No permission claim namespaces found") - - t.Logf("permclaim namespace detected as: %q", permClaimNs) - } else { - permClaimNs = providerNs - } - }, - }, - { - name: "verify secrets from examples are synced to provider", - step: func(t *testing.T) { - t.Logf("Waiting for referenced secret to be synced to provider side") - require.Eventually(t, func() bool { - _, err := providerCoreClient.Secrets(permClaimNs).Get(ctx, referencedSecretName, metav1.GetOptions{}) - return err == nil - }, time.Minute*2, time.Millisecond*100, "waiting for referenced secret to be synced to provider side") - - t.Logf("Waiting for label-selected secret to be synced to provider side") - require.Eventually(t, func() bool { - _, err := providerCoreClient.Secrets(permClaimNs).Get(ctx, labelSelectedSecretName, metav1.GetOptions{}) - return err == nil - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for label-selected secret to be synced to provider side") - - t.Logf("Secrets from examples are properly synced to provider") - }, - }, - { - name: "verify secrets are deleted when resource is removed", - step: func(t *testing.T) { - t.Logf("Note: Secrets are created from the embedded examples and will be cleaned up when the instance is deleted") - // For now, we skip manual secret deletion testing since the secrets come from the examples - // and are tied to the resource lifecycle - }, - }, - { - name: "instance deleted upstream is recreated", - step: func(t *testing.T) { - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - err = providerClient.Namespace(providerNs).Delete(ctx, "test", metav1.DeleteOptions{}) - } else { - err = providerClient.Delete(ctx, clusterScopedUpInsName, metav1.DeleteOptions{}) - } - require.NoError(t, err) - - require.Eventually(t, func() bool { - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - _, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - _, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - return err == nil - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be recreated upstream", serviceGVR.Resource) - }, - }, - { - name: "instance spec updated downstream is updated upstream", - step: func(t *testing.T) { - err := retry.RetryOnConflict(retry.DefaultRetry, func() error { - var obj *unstructured.Unstructured - var err error - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = consumerClient.Namespace(consumerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = consumerClient.Get(ctx, "test", metav1.GetOptions{}) - } - require.NoError(t, err) - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - unstructured.SetNestedField(obj.Object, "Updated cowboy intent", "spec", "intent") //nolint:errcheck - _, err = consumerClient.Namespace(consumerNs).Update(ctx, obj, metav1.UpdateOptions{}) - } else { - unstructured.SetNestedField(obj.Object, "Updated sheriff intent", "spec", "intent") //nolint:errcheck - _, err = consumerClient.Update(ctx, obj, metav1.UpdateOptions{}) - } - return err - }) - require.NoError(t, err) - - require.Eventually(t, func() bool { - var obj *unstructured.Unstructured - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - require.NoError(t, err) - var value string - value, _, err = unstructured.NestedString(obj.Object, "spec", "intent") - - require.NoError(t, err) - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - return value == "Updated cowboy intent" - } else { - return value == "Updated sheriff intent" - } - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be updated upstream", serviceGVR.Resource) - }, - }, - { - name: "instance status updated upstream is updated downstream", - step: func(t *testing.T) { - err := retry.RetryOnConflict(retry.DefaultRetry, func() error { - var obj *unstructured.Unstructured - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - require.NoError(t, err) - unstructured.SetNestedField(obj.Object, "Ready to ride", "status", "result") //nolint:errcheck - if providerResourceScope == apiextensionsv1.NamespaceScoped { - _, err = providerClient.Namespace(providerNs).UpdateStatus(ctx, obj, metav1.UpdateOptions{}) - } else { - _, err = providerClient.UpdateStatus(ctx, obj, metav1.UpdateOptions{}) - } - return err - }) - require.NoError(t, err) + t.Logf("Waiting for referenced secret to be synced to provider side for %s in namespace %s", consumer.name, consumerPermClaimNs) + require.Eventually(t, func() bool { + _, err := providerCoreClient.Secrets(consumerPermClaimNs).Get(ctx, referencedSecretName, metav1.GetOptions{}) + return err == nil + }, time.Minute*2, time.Millisecond*100, "waiting for referenced secret to be synced to provider side for %s", consumer.name) - require.Eventually(t, func() bool { - var obj *unstructured.Unstructured - var err error - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = consumerClient.Namespace(consumerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = consumerClient.Get(ctx, "test", metav1.GetOptions{}) - } - require.NoError(t, err) - value, _, err := unstructured.NestedString(obj.Object, "status", "result") - require.NoError(t, err) - return value == "Ready to ride" - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be updated downstream", serviceGVR.Resource) - }, - }, - { - name: "instance spec updated upstream is reconciled upstream", - step: func(t *testing.T) { - err := retry.RetryOnConflict(retry.DefaultRetry, func() error { - var obj *unstructured.Unstructured - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - require.NoError(t, err) - if providerResourceScope == apiextensionsv1.NamespaceScoped { - unstructured.SetNestedField(obj.Object, "Drifted cowboy intent", "spec", "intent") //nolint:errcheck - _, err = providerClient.Namespace(providerNs).Update(ctx, obj, metav1.UpdateOptions{}) - } else { - unstructured.SetNestedField(obj.Object, "Drifted sheriff intent", "spec", "intent") //nolint:errcheck - _, err = providerClient.Update(ctx, obj, metav1.UpdateOptions{}) - } - return err - }) - require.NoError(t, err) + t.Logf("Waiting for label-selected secret to be synced to provider side for %s", consumer.name) + require.Eventually(t, func() bool { + _, err := providerCoreClient.Secrets(consumerPermClaimNs).Get(ctx, labelSelectedSecretName, metav1.GetOptions{}) + return err == nil + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for label-selected secret to be synced to provider side for %s", consumer.name) - require.Eventually(t, func() bool { - var obj *unstructured.Unstructured - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - obj, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - obj, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - require.NoError(t, err) - var value string - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - value, _, err = unstructured.NestedString(obj.Object, "spec", "intent") + t.Logf("Secrets from examples are properly synced to provider for %s", consumer.name) + }, + }, + { + name: "instances deleted downstream are deleted upstream", + step: func(t *testing.T) { + instanceName := fmt.Sprintf("test-%s", consumer.name) + // Find our instance on provider side first + var providerInstanceName string + instances, err := providerClient.List(ctx, metav1.ListOptions{}) require.NoError(t, err) - return value == "Updated cowboy intent" - } else { - value, _, err = unstructured.NestedString(obj.Object, "spec", "intent") + for _, item := range instances.Items { + if strings.Contains(item.GetName(), instanceName) { + providerInstanceName = item.GetName() + break + } + } + require.NotEmpty(t, providerInstanceName, "should find provider instance for %s", consumer.name) + + if consumerResourceScope == apiextensionsv1.NamespaceScoped { + err = consumer.consumerClient.Namespace(consumer.consumerObjectNamespace).Delete(ctx, instanceName, metav1.DeleteOptions{}) + } else { + err = consumer.consumerClient.Delete(ctx, instanceName, metav1.DeleteOptions{}) + } require.NoError(t, err) - return value == "Updated sheriff intent" - } - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be reconciled upstream", serviceGVR.Resource) - }, - }, - { - name: "instances deleted downstream are deleted upstream", - step: func(t *testing.T) { - var err error - if consumerResourceScope == apiextensionsv1.NamespaceScoped { - err = consumerClient.Namespace(consumerNs).Delete(ctx, "test", metav1.DeleteOptions{}) - } else { - err = consumerClient.Delete(ctx, "test", metav1.DeleteOptions{}) - } - require.NoError(t, err) - require.Eventually(t, func() bool { - var err error - if providerResourceScope == apiextensionsv1.NamespaceScoped { - _, err = providerClient.Namespace(providerNs).Get(ctx, "test", metav1.GetOptions{}) - } else { - _, err = providerClient.Get(ctx, clusterScopedUpInsName, metav1.GetOptions{}) - } - return errors.IsNotFound(err) - }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be deleted on provider side", serviceGVR.Resource) - }, - }, - } { - t.Run(tc.name, func(t *testing.T) { - tc.step(t) + require.Eventually(t, func() bool { + var err error + if providerResourceScope == apiextensionsv1.NamespaceScoped { + _, err = providerClient.Namespace(consumer.providerObjectNamespace).Get(ctx, instanceName, metav1.GetOptions{}) + } else { + _, err = providerClient.Get(ctx, providerInstanceName, metav1.GetOptions{}) + } + return errors.IsNotFound(err) + }, wait.ForeverTestTimeout, time.Millisecond*100, "waiting for the %s instance to be deleted on provider side for %s", serviceGVR.Resource, consumer.name) + }, + }, + } { + t.Run(tc.name, tc.step) + } }) } } diff --git a/web/dist/assets/index.41dda553.js b/web/dist/assets/index.64982fe8.js similarity index 95% rename from web/dist/assets/index.41dda553.js rename to web/dist/assets/index.64982fe8.js index 018ecc8e6..d68e8be4a 100644 --- a/web/dist/assets/index.41dda553.js +++ b/web/dist/assets/index.64982fe8.js @@ -98,7 +98,7 @@ var __yieldStar = (value) => { }; var __forAwait = (obj, it, method) => (it = obj[__knownSymbol("asyncIterator")]) ? it.call(obj) : (obj = obj[__knownSymbol("iterator")](), it = {}, method = (key, fn) => (fn = obj[key]) && (it[key] = (arg) => new Promise((yes, no, done) => (arg = fn.call(obj, arg), done = arg.done, Promise.resolve(arg.value).then((value) => yes({ value, done }), no)))), method("next"), method("return"), it); var require_index_001 = __commonJS({ - "assets/index.41dda553.js"(exports) { + "assets/index.64982fe8.js"(exports) { (function polyfill() { const relList = document.createElement("link").relList; if (relList && relList.supports && relList.supports("modulepreload")) { @@ -8415,265 +8415,6 @@ var require_index_001 = __commonJS({ function useRoute(_name) { return inject(routeLocationKey); } - var __async$5 = (__this, __arguments, generator) => { - return new Promise((resolve2, reject) => { - var fulfilled = (value) => { - try { - step(generator.next(value)); - } catch (e) { - reject(e); - } - }; - var rejected = (value) => { - try { - step(generator.throw(value)); - } catch (e) { - reject(e); - } - }; - var step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected); - step((generator = generator.apply(__this, __arguments)).next()); - }); - }; - class AuthService { - isAuthenticated() { - return __async$5(this, null, function* () { - try { - const urlParams = new URLSearchParams(window.location.search); - const clusterId = urlParams.get("cluster_id") || ""; - const authCheckUrl = clusterId ? `/ping?cluster_id=${clusterId}` : "/ping"; - const response = yield fetch(`/api${authCheckUrl}`, { - method: "GET", - credentials: "include" - // Include cookies - }); - const isAuth = response.status === 200; - console.log("Auth check:", { clusterId, status: response.status, isAuth }); - return isAuth; - } catch (error) { - console.error("Auth check error:", error); - return false; - } - }); - } - initiateAuth(sessionId, clusterId, clientSideRedirectUrl) { - return __async$5(this, null, function* () { - const authUrl = `/api/authorize`; - const redirect_url = window.location.origin + window.location.pathname; - const params = new URLSearchParams({ - session_id: sessionId, - redirect_url, - cluster_id: clusterId, - client_type: "ui" - // Use UI type to get cookies - }); - if (clientSideRedirectUrl) { - params.set("client_side_redirect_url", clientSideRedirectUrl); - } - window.location.href = `${authUrl}?${params}`; - }); - } - logout() { - return __async$5(this, null, function* () { - try { - const urlParams = new URLSearchParams(window.location.search); - const clusterId = urlParams.get("cluster_id") || ""; - const logoutUrl = clusterId ? `/api/logout?cluster_id=${encodeURIComponent(clusterId)}` : "/api/logout"; - const response = yield fetch(logoutUrl, { - method: "POST", - credentials: "include" - // Include cookies in the request - }); - console.log("Logout response:", { status: response.status, clusterId }); - window.location.href = window.location.origin + window.location.pathname; - } catch (error) { - console.error("Logout error:", error); - window.location.reload(); - } - }); - } - getSessionCookieName() { - const urlParams = new URLSearchParams(window.location.search); - const clusterId = urlParams.get("cluster_id") || ""; - return clusterId ? `kube-bind-${clusterId}` : "kube-bind"; - } - isCliFlow() { - const urlParams = new URLSearchParams(window.location.search); - return urlParams.has("redirect_url"); - } - redirectToCliCallback(bindingResponseData) { - const urlParams = new URLSearchParams(window.location.search); - const redirectUrl = urlParams.get("redirect_url"); - const sessionId = urlParams.get("session_id"); - if (redirectUrl) { - const callbackUrl = new URL(redirectUrl); - if (sessionId) { - callbackUrl.searchParams.append("session_id", sessionId); - } - const base64Response = btoa(JSON.stringify(bindingResponseData)); - callbackUrl.searchParams.append("binding_response", base64Response); - window.location.href = callbackUrl.toString(); - } - } - } - const authService = new AuthService(); - var __async$4 = (__this, __arguments, generator) => { - return new Promise((resolve2, reject) => { - var fulfilled = (value) => { - try { - step(generator.next(value)); - } catch (e) { - reject(e); - } - }; - var rejected = (value) => { - try { - step(generator.throw(value)); - } catch (e) { - reject(e); - } - }; - var step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected); - step((generator = generator.apply(__this, __arguments)).next()); - }); - }; - const _hoisted_1$3 = { id: "app" }; - const _hoisted_2$3 = { class: "header" }; - const _hoisted_3$3 = { class: "header-content" }; - const _hoisted_4$3 = { - key: 0, - class: "user-section" - }; - const _hoisted_5$3 = { class: "main" }; - const _hoisted_6$3 = { - key: 0, - class: "auth-placeholder" - }; - const _sfc_main$3 = /* @__PURE__ */ defineComponent({ - __name: "App", - setup(__props) { - const route = useRoute(); - const authStatus = ref({ - isAuthenticated: false, - loading: true, - error: null - }); - const checkAuthStatus = () => __async$4(this, null, function* () { - try { - const authenticated = yield authService.isAuthenticated(); - authStatus.value.isAuthenticated = authenticated; - } catch (error) { - console.error("Auth check failed:", error); - authStatus.value.error = "Authentication check failed"; - } finally { - authStatus.value.loading = false; - } - }); - const authenticate = () => __async$4(this, null, function* () { - try { - const cluster = route.query.cluster_id || ""; - const sessionId = route.query.session_id || generateSessionId(); - const clientSideRedirectUrl = route.query.redirect_url || ""; - yield authService.initiateAuth(sessionId, cluster, clientSideRedirectUrl); - } catch (error) { - console.error("Authentication failed:", error); - authStatus.value.error = "Authentication failed"; - } - }); - const logout = () => __async$4(this, null, function* () { - try { - yield authService.logout(); - authStatus.value.isAuthenticated = false; - } catch (error) { - console.error("Logout failed:", error); - } - }); - const generateSessionId = () => { - return Math.random().toString(36).substring(2) + Date.now().toString(36); - }; - onMounted(() => { - checkAuthStatus(); - window.addEventListener("auth-expired", () => { - console.log("Received auth-expired event, updating authentication status"); - authStatus.value.isAuthenticated = false; - authStatus.value.error = "Session expired. Please re-authenticate."; - }); - }); - return (_ctx, _cache) => { - const _component_router_view = resolveComponent("router-view"); - return openBlock(), createElementBlock("div", _hoisted_1$3, [ - createBaseVNode("header", _hoisted_2$3, [ - createBaseVNode("div", _hoisted_3$3, [ - _cache[2] || (_cache[2] = createStaticVNode('

Kube Bind

', 1)), - authStatus.value.isAuthenticated ? (openBlock(), createElementBlock("div", _hoisted_4$3, [ - _cache[1] || (_cache[1] = createBaseVNode("div", { class: "user-info" }, [ - createBaseVNode("div", { class: "status-indicator" }), - createBaseVNode("span", { class: "welcome-text" }, "Connected") - ], -1)), - createBaseVNode("button", { - onClick: logout, - class: "logout-btn" - }, [..._cache[0] || (_cache[0] = [ - createBaseVNode("svg", { - width: "16", - height: "16", - viewBox: "0 0 24 24", - fill: "none", - xmlns: "http://www.w3.org/2000/svg" - }, [ - createBaseVNode("path", { - d: "M9 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V5C3 4.46957 3.21071 3.96086 3.58579 3.58579C3.96086 3.21071 4.46957 3 5 3H9", - stroke: "currentColor", - "stroke-width": "2", - "stroke-linecap": "round", - "stroke-linejoin": "round" - }), - createBaseVNode("path", { - d: "M16 17L21 12L16 7", - stroke: "currentColor", - "stroke-width": "2", - "stroke-linecap": "round", - "stroke-linejoin": "round" - }), - createBaseVNode("path", { - d: "M21 12H9", - stroke: "currentColor", - "stroke-width": "2", - "stroke-linecap": "round", - "stroke-linejoin": "round" - }) - ], -1), - createTextVNode(" Sign out ", -1) - ])]) - ])) : createCommentVNode("", true) - ]) - ]), - createBaseVNode("main", _hoisted_5$3, [ - !authStatus.value.isAuthenticated ? (openBlock(), createElementBlock("div", _hoisted_6$3, [ - _cache[3] || (_cache[3] = createBaseVNode("h2", null, "Authentication Required", -1)), - _cache[4] || (_cache[4] = createBaseVNode("p", null, "Please authenticate to access resources.", -1)), - createBaseVNode("button", { - onClick: authenticate, - class: "auth-btn" - }, "Authenticate") - ])) : (openBlock(), createBlock(_component_router_view, { - key: 1, - "auth-status": authStatus.value - }, null, 8, ["auth-status"])) - ]) - ]); - }; - } - }); - const App_vue_vue_type_style_index_0_scoped_393414b1_lang = ""; - const _export_sfc = (sfc, props) => { - const target = sfc.__vccOpts || sfc; - for (const [key, val] of props) { - target[key] = val; - } - return target; - }; - const App = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-393414b1"]]); function bind(fn, thisArg) { return function wrap() { return fn.apply(thisArg, arguments); @@ -11157,13 +10898,24 @@ var require_index_001 = __commonJS({ axios.HttpStatusCode = HttpStatusCode$1; axios.default = axios; const axios$1 = axios; + const ErrorCodes = { + AUTHENTICATION_FAILED: "AUTHENTICATION_FAILED", + AUTHORIZATION_FAILED: "AUTHORIZATION_FAILED", + RESOURCE_NOT_FOUND: "RESOURCE_NOT_FOUND", + INTERNAL_ERROR: "INTERNAL_ERROR", + BAD_REQUEST: "BAD_REQUEST", + CLUSTER_CONNECTION_FAILED: "CLUSTER_CONNECTION_FAILED" + }; + function isKubeBindError(error) { + return error && typeof error === "object" && error.kind === "Error" && error.apiVersion && error.message && error.code; + } var __defProp2 = Object.defineProperty; var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value; var __publicField = (obj, key, value) => { __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value); return value; }; - var __async$3 = (__this, __arguments, generator) => { + var __async$5 = (__this, __arguments, generator) => { return new Promise((resolve2, reject) => { var fulfilled = (value) => { try { @@ -11183,6 +10935,16 @@ var require_index_001 = __commonJS({ step((generator = generator.apply(__this, __arguments)).next()); }); }; + class StructuredError extends Error { + constructor(kubeBindError, httpStatus) { + super(kubeBindError.message); + __publicField(this, "kubeBindError"); + __publicField(this, "httpStatus"); + this.kubeBindError = kubeBindError; + this.httpStatus = httpStatus; + this.name = "StructuredError"; + } + } class HttpClient { constructor() { __publicField(this, "client"); @@ -11209,10 +10971,15 @@ var require_index_001 = __commonJS({ this.client.interceptors.response.use( (response) => response, (error) => { - var _a; - if (((_a = error.response) == null ? void 0 : _a.status) === 401) { - console.warn("Authentication expired, need to re-authenticate"); - window.dispatchEvent(new CustomEvent("auth-expired")); + var _a, _b; + const status = (_a = error.response) == null ? void 0 : _a.status; + const responseData = (_b = error.response) == null ? void 0 : _b.data; + if (responseData && isKubeBindError(responseData)) { + if (responseData.code === ErrorCodes.AUTHENTICATION_FAILED) { + console.warn("Authentication expired, need to re-authenticate"); + window.dispatchEvent(new CustomEvent("auth-expired")); + } + return Promise.reject(new StructuredError(responseData, status)); } return Promise.reject(error); } @@ -11220,34 +10987,34 @@ var require_index_001 = __commonJS({ } // Generic HTTP methods get(url, config) { - return __async$3(this, null, function* () { + return __async$5(this, null, function* () { return this.client.get(url, config); }); } post(url, data, config) { - return __async$3(this, null, function* () { + return __async$5(this, null, function* () { return this.client.post(url, data, config); }); } put(url, data, config) { - return __async$3(this, null, function* () { + return __async$5(this, null, function* () { return this.client.put(url, data, config); }); } delete(url, config) { - return __async$3(this, null, function* () { + return __async$5(this, null, function* () { return this.client.delete(url, config); }); } // Method to make requests without auth headers (for public endpoints) getPublic(url, config) { - return __async$3(this, null, function* () { + return __async$5(this, null, function* () { return axios$1.get(`/api${url}`, config); }); } } const httpClient = new HttpClient(); - var __async$2 = (__this, __arguments, generator) => { + var __async$4 = (__this, __arguments, generator) => { return new Promise((resolve2, reject) => { var fulfilled = (value) => { try { @@ -11267,30 +11034,389 @@ var require_index_001 = __commonJS({ step((generator = generator.apply(__this, __arguments)).next()); }); }; - const _hoisted_1$2 = { class: "binding-content" }; - const _hoisted_2$2 = { class: "binding-info" }; - const _hoisted_3$2 = { class: "instructions-section" }; - const _hoisted_4$2 = { class: "command-group" }; - const _hoisted_5$2 = { class: "command-block" }; - const _hoisted_6$2 = { class: "command-group" }; - const _hoisted_7$2 = { class: "command-block" }; - const _hoisted_8$2 = { class: "command-group" }; - const _hoisted_9$2 = { class: "command-block" }; - const _hoisted_10$2 = { class: "alternative-section" }; - const _hoisted_11$2 = { class: "manual-setup" }; - const _hoisted_12$2 = { class: "command-group" }; - const _hoisted_13$2 = { class: "command-block" }; - const _sfc_main$2 = /* @__PURE__ */ defineComponent({ - __name: "BindingResult", - props: { - show: { type: Boolean }, - templateName: {}, - bindingResponse: {} - }, - emits: ["close"], - setup(__props, { emit: __emit }) { - const props = __props; - const emit2 = __emit; + class AuthService { + isAuthenticated() { + return __async$4(this, null, function* () { + const result = yield this.checkAuthentication(); + return result.isAuthenticated; + }); + } + checkAuthentication() { + return __async$4(this, null, function* () { + var _a, _b; + try { + const urlParams = new URLSearchParams(window.location.search); + const clusterId = urlParams.get("cluster_id") || ""; + const consumerId = urlParams.get("consumer_id") || ""; + const authCheckUrl = clusterId ? `/ping?cluster_id=${clusterId}` : "/ping"; + const response = yield httpClient.get(authCheckUrl); + const isAuth = response.status === 200; + console.log("Auth check:", { clusterId, status: response.status, isAuth }); + return { isAuthenticated: isAuth }; + } catch (error) { + if (error instanceof StructuredError) { + const kubeError = error.kubeBindError; + if (kubeError.code === ErrorCodes.AUTHENTICATION_FAILED || kubeError.code === ErrorCodes.AUTHORIZATION_FAILED) { + return { + isAuthenticated: false, + error: kubeError.message + }; + } + } + if (((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.status) === 401 || ((_b = error == null ? void 0 : error.response) == null ? void 0 : _b.status) === 403) { + console.log("Auth check failed with authentication error but no structured response"); + return { + isAuthenticated: false, + error: "Authentication required" + }; + } + console.error("Auth check error:", error); + return { + isAuthenticated: false, + error: "Authentication check failed" + }; + } + }); + } + initiateAuth(sessionId, clusterId, clientSideRedirectUrl, consumerId) { + return __async$4(this, null, function* () { + const authUrl = `/api/authorize`; + const redirect_url = window.location.origin + window.location.pathname; + const currentParams = new URLSearchParams(window.location.search); + const paramsToPreserve = {}; + if (currentParams.has("consumer_id")) { + paramsToPreserve.consumer_id = currentParams.get("consumer_id"); + } + if (currentParams.has("session_id")) { + paramsToPreserve.session_id = currentParams.get("session_id"); + } + if (currentParams.has("redirect_url")) { + paramsToPreserve.redirect_url = currentParams.get("redirect_url"); + } + if (currentParams.has("cluster_id")) { + paramsToPreserve.cluster_id = currentParams.get("cluster_id"); + } + sessionStorage.setItem("kube-bind-preserved-params", JSON.stringify(paramsToPreserve)); + const params = new URLSearchParams({ + session_id: sessionId, + redirect_url, + cluster_id: clusterId, + client_type: "ui" + // Use UI type to get cookies + }); + if (clientSideRedirectUrl) { + params.set("client_side_redirect_url", clientSideRedirectUrl); + } + if (consumerId) { + params.set("consumer_id", consumerId); + } + window.location.href = `${authUrl}?${params}`; + }); + } + logout() { + return __async$4(this, null, function* () { + try { + const urlParams = new URLSearchParams(window.location.search); + const clusterId = urlParams.get("cluster_id") || ""; + const logoutUrl = clusterId ? `/api/logout?cluster_id=${encodeURIComponent(clusterId)}` : "/api/logout"; + const response = yield httpClient.post(logoutUrl); + console.log("Logout response:", { status: response.status, clusterId }); + window.location.href = window.location.origin + window.location.pathname; + } catch (error) { + console.error("Logout error:", error); + window.location.reload(); + } + }); + } + getSessionCookieName() { + const urlParams = new URLSearchParams(window.location.search); + const clusterId = urlParams.get("cluster_id") || ""; + return clusterId ? `kube-bind-${clusterId}` : "kube-bind"; + } + isCliFlow() { + const urlParams = new URLSearchParams(window.location.search); + return urlParams.has("redirect_url"); + } + redirectToCliCallback(bindingResponseData) { + const urlParams = new URLSearchParams(window.location.search); + const redirectUrl = urlParams.get("redirect_url"); + const sessionId = urlParams.get("session_id"); + const consumerId = urlParams.get("consumer_id"); + if (redirectUrl) { + const callbackUrl = new URL(redirectUrl); + if (sessionId) { + callbackUrl.searchParams.append("session_id", sessionId); + } + if (consumerId) { + callbackUrl.searchParams.append("consumer_id", consumerId); + } + const base64Response = btoa(JSON.stringify(bindingResponseData)); + callbackUrl.searchParams.append("binding_response", base64Response); + window.location.href = callbackUrl.toString(); + } + } + restorePreservedParams() { + const preservedParamsJson = sessionStorage.getItem("kube-bind-preserved-params"); + if (!preservedParamsJson) { + return; + } + try { + const preservedParams = JSON.parse(preservedParamsJson); + const currentParams = new URLSearchParams(window.location.search); + let needsUpdate = false; + for (const [key, value] of Object.entries(preservedParams)) { + if (!currentParams.has(key)) { + currentParams.set(key, value); + needsUpdate = true; + } + } + if (needsUpdate) { + sessionStorage.removeItem("kube-bind-preserved-params"); + const newUrl = `${window.location.pathname}?${currentParams.toString()}`; + window.location.replace(newUrl); + } else { + sessionStorage.removeItem("kube-bind-preserved-params"); + } + } catch (error) { + console.error("Failed to restore preserved params:", error); + sessionStorage.removeItem("kube-bind-preserved-params"); + } + } + } + const authService = new AuthService(); + var __async$3 = (__this, __arguments, generator) => { + return new Promise((resolve2, reject) => { + var fulfilled = (value) => { + try { + step(generator.next(value)); + } catch (e) { + reject(e); + } + }; + var rejected = (value) => { + try { + step(generator.throw(value)); + } catch (e) { + reject(e); + } + }; + var step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected); + step((generator = generator.apply(__this, __arguments)).next()); + }); + }; + const _hoisted_1$4 = { id: "app" }; + const _hoisted_2$4 = { class: "header" }; + const _hoisted_3$4 = { class: "header-content" }; + const _hoisted_4$4 = { + key: 0, + class: "user-section" + }; + const _hoisted_5$4 = { class: "main" }; + const _hoisted_6$4 = { + key: 0, + class: "auth-placeholder" + }; + const _hoisted_7$4 = { + key: 0, + class: "auth-error" + }; + const _hoisted_8$3 = { class: "error-content" }; + const _hoisted_9$3 = { key: 1 }; + const _hoisted_10$3 = ["disabled"]; + const _hoisted_11$3 = { key: 0 }; + const _hoisted_12$3 = { key: 1 }; + const _sfc_main$4 = /* @__PURE__ */ defineComponent({ + __name: "App", + setup(__props) { + const route = useRoute(); + const authStatus = ref({ + isAuthenticated: false, + loading: true, + error: null + }); + const hasAttemptedAuth = ref(false); + const checkAuthStatus = () => __async$3(this, null, function* () { + try { + const result = yield authService.checkAuthentication(); + authStatus.value.isAuthenticated = result.isAuthenticated; + authStatus.value.error = result.error || null; + } catch (error) { + console.error("Auth check failed:", error); + authStatus.value.error = "Authentication check failed"; + } finally { + authStatus.value.loading = false; + } + }); + const authenticate = () => __async$3(this, null, function* () { + try { + hasAttemptedAuth.value = true; + const cluster = route.query.cluster_id || ""; + const sessionId = route.query.session_id || generateSessionId(); + const clientSideRedirectUrl = route.query.redirect_url || ""; + const consumerId = route.query.consumer_id || ""; + yield authService.initiateAuth(sessionId, cluster, clientSideRedirectUrl, consumerId); + } catch (error) { + console.error("Authentication failed:", error); + authStatus.value.error = "Authentication failed"; + } + }); + const logout = () => __async$3(this, null, function* () { + try { + yield authService.logout(); + authStatus.value.isAuthenticated = false; + } catch (error) { + console.error("Logout failed:", error); + } + }); + const generateSessionId = () => { + return Math.random().toString(36).substring(2) + Date.now().toString(36); + }; + onMounted(() => { + authService.restorePreservedParams(); + checkAuthStatus(); + window.addEventListener("auth-expired", () => { + console.log("Received auth-expired event, updating authentication status"); + authStatus.value.isAuthenticated = false; + authStatus.value.error = "Session expired. Please re-authenticate."; + const hasRequiredParams = route.query.cluster_id || route.query.session_id; + if (hasRequiredParams && !hasAttemptedAuth.value) { + console.log("Auto-redirecting to authentication due to auth-expired event"); + authenticate(); + } else if (!hasRequiredParams) { + console.log("No cluster_id or session_id parameters found, requiring manual authentication"); + } else { + console.log("Authentication already attempted, preventing hot loop"); + } + }); + }); + return (_ctx, _cache) => { + const _component_router_view = resolveComponent("router-view"); + return openBlock(), createElementBlock("div", _hoisted_1$4, [ + createBaseVNode("header", _hoisted_2$4, [ + createBaseVNode("div", _hoisted_3$4, [ + _cache[2] || (_cache[2] = createStaticVNode('

Kube Bind

', 1)), + authStatus.value.isAuthenticated ? (openBlock(), createElementBlock("div", _hoisted_4$4, [ + _cache[1] || (_cache[1] = createBaseVNode("div", { class: "user-info" }, [ + createBaseVNode("div", { class: "status-indicator" }), + createBaseVNode("span", { class: "welcome-text" }, "Connected") + ], -1)), + createBaseVNode("button", { + onClick: logout, + class: "logout-btn" + }, [..._cache[0] || (_cache[0] = [ + createBaseVNode("svg", { + width: "16", + height: "16", + viewBox: "0 0 24 24", + fill: "none", + xmlns: "http://www.w3.org/2000/svg" + }, [ + createBaseVNode("path", { + d: "M9 21H5C4.46957 21 3.96086 20.7893 3.58579 20.4142C3.21071 20.0391 3 19.5304 3 19V5C3 4.46957 3.21071 3.96086 3.58579 3.58579C3.96086 3.21071 4.46957 3 5 3H9", + stroke: "currentColor", + "stroke-width": "2", + "stroke-linecap": "round", + "stroke-linejoin": "round" + }), + createBaseVNode("path", { + d: "M16 17L21 12L16 7", + stroke: "currentColor", + "stroke-width": "2", + "stroke-linecap": "round", + "stroke-linejoin": "round" + }), + createBaseVNode("path", { + d: "M21 12H9", + stroke: "currentColor", + "stroke-width": "2", + "stroke-linecap": "round", + "stroke-linejoin": "round" + }) + ], -1), + createTextVNode(" Sign out ", -1) + ])]) + ])) : createCommentVNode("", true) + ]) + ]), + createBaseVNode("main", _hoisted_5$4, [ + !authStatus.value.isAuthenticated ? (openBlock(), createElementBlock("div", _hoisted_6$4, [ + _cache[5] || (_cache[5] = createBaseVNode("h2", null, "Authentication Required", -1)), + authStatus.value.error ? (openBlock(), createElementBlock("div", _hoisted_7$4, [ + _cache[4] || (_cache[4] = createBaseVNode("div", { class: "error-icon" }, "⚠️", -1)), + createBaseVNode("div", _hoisted_8$3, [ + _cache[3] || (_cache[3] = createBaseVNode("h3", null, "Authentication Error", -1)), + createBaseVNode("p", null, toDisplayString(authStatus.value.error), 1) + ]) + ])) : (openBlock(), createElementBlock("p", _hoisted_9$3, "Please authenticate to access resources.")), + createBaseVNode("button", { + onClick: authenticate, + class: "auth-btn", + disabled: authStatus.value.loading + }, [ + authStatus.value.loading ? (openBlock(), createElementBlock("span", _hoisted_11$3, "Authenticating...")) : (openBlock(), createElementBlock("span", _hoisted_12$3, toDisplayString(authStatus.value.error ? "Try Again" : "Authenticate"), 1)) + ], 8, _hoisted_10$3) + ])) : (openBlock(), createBlock(_component_router_view, { + key: 1, + "auth-status": authStatus.value + }, null, 8, ["auth-status"])) + ]) + ]); + }; + } + }); + const App_vue_vue_type_style_index_0_scoped_504b04cf_lang = ""; + const _export_sfc = (sfc, props) => { + const target = sfc.__vccOpts || sfc; + for (const [key, val] of props) { + target[key] = val; + } + return target; + }; + const App = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-504b04cf"]]); + var __async$2 = (__this, __arguments, generator) => { + return new Promise((resolve2, reject) => { + var fulfilled = (value) => { + try { + step(generator.next(value)); + } catch (e) { + reject(e); + } + }; + var rejected = (value) => { + try { + step(generator.throw(value)); + } catch (e) { + reject(e); + } + }; + var step = (x) => x.done ? resolve2(x.value) : Promise.resolve(x.value).then(fulfilled, rejected); + step((generator = generator.apply(__this, __arguments)).next()); + }); + }; + const _hoisted_1$3 = { class: "binding-content" }; + const _hoisted_2$3 = { class: "binding-info" }; + const _hoisted_3$3 = { class: "instructions-section" }; + const _hoisted_4$3 = { class: "command-group" }; + const _hoisted_5$3 = { class: "command-block" }; + const _hoisted_6$3 = { class: "command-group" }; + const _hoisted_7$3 = { class: "command-block" }; + const _hoisted_8$2 = { class: "command-group" }; + const _hoisted_9$2 = { class: "command-block" }; + const _hoisted_10$2 = { class: "alternative-section" }; + const _hoisted_11$2 = { class: "manual-setup" }; + const _hoisted_12$2 = { class: "command-group" }; + const _hoisted_13$2 = { class: "command-block" }; + const _sfc_main$3 = /* @__PURE__ */ defineComponent({ + __name: "BindingResult", + props: { + show: { type: Boolean }, + templateName: {}, + bindingResponse: {} + }, + emits: ["close"], + setup(__props, { emit: __emit }) { + const props = __props; + const emit2 = __emit; const kubeconfigSecretName = computed(() => { return `kubeconfig-${props.templateName.toLowerCase().replace(/[^a-z0-9]/g, "")}-${Date.now().toString(36)}`; }); @@ -11453,8 +11579,8 @@ ${formattedObject}`; class: "close-btn" }, "×") ]), - createBaseVNode("div", _hoisted_1$2, [ - createBaseVNode("div", _hoisted_2$2, [ + createBaseVNode("div", _hoisted_1$3, [ + createBaseVNode("div", _hoisted_2$3, [ _cache[9] || (_cache[9] = createBaseVNode("h4", null, "Binding Information", -1)), createBaseVNode("p", null, [ _cache[6] || (_cache[6] = createBaseVNode("strong", null, "Template:", -1)), @@ -11469,7 +11595,7 @@ ${formattedObject}`; createTextVNode(" " + toDisplayString(kubeconfigSecretName.value), 1) ]) ]), - createBaseVNode("div", _hoisted_3$2, [ + createBaseVNode("div", _hoisted_3$3, [ _cache[16] || (_cache[16] = createBaseVNode("h4", null, "Setup Instructions", -1)), _cache[17] || (_cache[17] = createBaseVNode("p", { class: "instructions-text" }, " To complete the binding setup, first download the required files below, then execute the following commands in your local kubectl environment: ", -1)), createBaseVNode("div", { class: "download-files-section" }, [ @@ -11488,9 +11614,9 @@ ${formattedObject}`; ]) ]) ]), - createBaseVNode("div", _hoisted_4$2, [ + createBaseVNode("div", _hoisted_4$3, [ _cache[13] || (_cache[13] = createBaseVNode("h5", null, "2. Create kube-bind namespace (if it doesn't exist)", -1)), - createBaseVNode("div", _hoisted_5$2, [ + createBaseVNode("div", _hoisted_5$3, [ _cache[12] || (_cache[12] = createBaseVNode("code", null, "kubectl create namespace kube-bind --dry-run=client -o yaml | kubectl apply -f -", -1)), createBaseVNode("button", { onClick: _cache[0] || (_cache[0] = ($event) => copyCommand("kubectl create namespace kube-bind --dry-run=client -o yaml | kubectl apply -f -")), @@ -11498,9 +11624,9 @@ ${formattedObject}`; }, "Copy") ]) ]), - createBaseVNode("div", _hoisted_6$2, [ + createBaseVNode("div", _hoisted_6$3, [ _cache[14] || (_cache[14] = createBaseVNode("h5", null, "3. Create kubeconfig secret", -1)), - createBaseVNode("div", _hoisted_7$2, [ + createBaseVNode("div", _hoisted_7$3, [ createBaseVNode("code", null, toDisplayString(createSecretCommand.value), 1), createBaseVNode("button", { onClick: _cache[1] || (_cache[1] = ($event) => copyCommand(createSecretCommand.value)), @@ -11549,7 +11675,7 @@ ${formattedObject}`; } }); const BindingResult_vue_vue_type_style_index_0_scoped_e150bd4a_lang = ""; - const BindingResult = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-e150bd4a"]]); + const BindingResult = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-e150bd4a"]]); var __async$1 = (__this, __arguments, generator) => { return new Promise((resolve2, reject) => { var fulfilled = (value) => { @@ -11570,19 +11696,19 @@ ${formattedObject}`; step((generator = generator.apply(__this, __arguments)).next()); }); }; - const _hoisted_1$1 = { class: "modal-header" }; - const _hoisted_2$1 = { class: "modal-content" }; - const _hoisted_3$1 = { class: "binding-name-section" }; - const _hoisted_4$1 = { + const _hoisted_1$2 = { class: "modal-header" }; + const _hoisted_2$2 = { class: "modal-content" }; + const _hoisted_3$2 = { class: "binding-name-section" }; + const _hoisted_4$2 = { key: 0, class: "form-help" }; - const _hoisted_5$1 = { + const _hoisted_5$2 = { key: 1, class: "form-error" }; - const _hoisted_6$1 = { class: "template-details" }; - const _hoisted_7$1 = { + const _hoisted_6$2 = { class: "template-details" }; + const _hoisted_7$2 = { key: 0, class: "detail-section" }; @@ -11662,7 +11788,7 @@ ${formattedObject}`; const _hoisted_42 = ["disabled"]; const _hoisted_43 = { key: 0 }; const _hoisted_44 = { key: 1 }; - const _sfc_main$1 = /* @__PURE__ */ defineComponent({ + const _sfc_main$2 = /* @__PURE__ */ defineComponent({ __name: "TemplateBindingModal", props: { show: { type: Boolean }, @@ -11749,15 +11875,15 @@ ${formattedObject}`; onClick: _cache[1] || (_cache[1] = withModifiers(() => { }, ["stop"])) }, [ - createBaseVNode("div", _hoisted_1$1, [ + createBaseVNode("div", _hoisted_1$2, [ createBaseVNode("h3", null, "Bind Template: " + toDisplayString(_ctx.template.metadata.name), 1), createBaseVNode("button", { onClick: closeModal, class: "close-btn" }, "×") ]), - createBaseVNode("div", _hoisted_2$1, [ - createBaseVNode("div", _hoisted_3$1, [ + createBaseVNode("div", _hoisted_2$2, [ + createBaseVNode("div", _hoisted_3$2, [ _cache[2] || (_cache[2] = createBaseVNode("label", { for: "bindingName", class: "form-label" @@ -11772,11 +11898,11 @@ ${formattedObject}`; }, null, 34), [ [vModelText, bindingName.value] ]), - isValidBindingName.value ? (openBlock(), createElementBlock("p", _hoisted_4$1, "This name will be used to identify your binding in the CLI.")) : (openBlock(), createElementBlock("p", _hoisted_5$1, "Name must be lowercase letters, numbers, and hyphens only. Must start and end with alphanumeric characters.")) + isValidBindingName.value ? (openBlock(), createElementBlock("p", _hoisted_4$2, "This name will be used to identify your binding in the CLI.")) : (openBlock(), createElementBlock("p", _hoisted_5$2, "Name must be lowercase letters, numbers, and hyphens only. Must start and end with alphanumeric characters.")) ]), - createBaseVNode("div", _hoisted_6$1, [ + createBaseVNode("div", _hoisted_6$2, [ _cache[10] || (_cache[10] = createBaseVNode("h4", null, "Template Details", -1)), - _ctx.template.spec.description ? (openBlock(), createElementBlock("div", _hoisted_7$1, [ + _ctx.template.spec.description ? (openBlock(), createElementBlock("div", _hoisted_7$2, [ _cache[3] || (_cache[3] = createBaseVNode("h5", null, "Description", -1)), createBaseVNode("p", _hoisted_8$1, toDisplayString(_ctx.template.spec.description), 1) ])) : createCommentVNode("", true), @@ -11901,7 +12027,132 @@ ${formattedObject}`; } }); const TemplateBindingModal_vue_vue_type_style_index_0_scoped_4218c1a0_lang = ""; - const TemplateBindingModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-4218c1a0"]]); + const TemplateBindingModal = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-4218c1a0"]]); + const _hoisted_1$1 = { class: "modal-content" }; + const _hoisted_2$1 = { class: "message-content" }; + const _hoisted_3$1 = { class: "icon" }; + const _hoisted_4$1 = { class: "message-text" }; + const _hoisted_5$1 = { key: 0 }; + const _hoisted_6$1 = { key: 1 }; + const _hoisted_7$1 = { class: "modal-footer" }; + const _sfc_main$1 = /* @__PURE__ */ defineComponent({ + __name: "AlertModal", + props: { + show: { type: Boolean }, + title: { default: "Alert" }, + message: {}, + type: { default: "error" }, + preserveWhitespace: { type: Boolean, default: false } + }, + emits: ["close"], + setup(__props, { emit: __emit }) { + const props = __props; + const emit2 = __emit; + const headerClass = computed(() => { + switch (props.type) { + case "error": + return "header-error"; + case "warning": + return "header-warning"; + case "info": + return "header-info"; + case "success": + return "header-success"; + default: + return "header-error"; + } + }); + const iconClass = computed(() => { + switch (props.type) { + case "error": + return "icon-error"; + case "warning": + return "icon-warning"; + case "info": + return "icon-info"; + case "success": + return "icon-success"; + default: + return "icon-error"; + } + }); + const buttonClass = computed(() => { + switch (props.type) { + case "error": + return "btn-error"; + case "warning": + return "btn-warning"; + case "info": + return "btn-info"; + case "success": + return "btn-success"; + default: + return "btn-error"; + } + }); + const icon = computed(() => { + switch (props.type) { + case "error": + return "⚠️"; + case "warning": + return "⚠️"; + case "info": + return "ℹ️"; + case "success": + return "✅"; + default: + return "⚠️"; + } + }); + const closeModal = () => { + emit2("close"); + }; + return (_ctx, _cache) => { + return _ctx.show ? (openBlock(), createElementBlock("div", { + key: 0, + class: "modal-overlay", + onClick: closeModal + }, [ + createBaseVNode("div", { + class: "modal", + onClick: _cache[0] || (_cache[0] = withModifiers(() => { + }, ["stop"])) + }, [ + createBaseVNode("div", { + class: normalizeClass(["modal-header", headerClass.value]) + }, [ + createBaseVNode("h3", null, toDisplayString(_ctx.title), 1), + createBaseVNode("button", { + onClick: closeModal, + class: "close-btn" + }, "×") + ], 2), + createBaseVNode("div", _hoisted_1$1, [ + createBaseVNode("div", _hoisted_2$1, [ + icon.value ? (openBlock(), createElementBlock("div", { + key: 0, + class: normalizeClass(["icon-container", iconClass.value]) + }, [ + createBaseVNode("span", _hoisted_3$1, toDisplayString(icon.value), 1) + ], 2)) : createCommentVNode("", true), + createBaseVNode("div", _hoisted_4$1, [ + _ctx.preserveWhitespace ? (openBlock(), createElementBlock("pre", _hoisted_5$1, toDisplayString(_ctx.message), 1)) : (openBlock(), createElementBlock("p", _hoisted_6$1, toDisplayString(_ctx.message), 1)) + ]) + ]) + ]), + createBaseVNode("div", _hoisted_7$1, [ + createBaseVNode("button", { + onClick: closeModal, + class: normalizeClass(["ok-btn", buttonClass.value]) + }, " OK ", 2) + ]) + ]) + ])) : createCommentVNode("", true); + }; + } + }); + const AlertModal_vue_vue_type_style_index_0_scoped_5efb8bd4_lang = ""; + const AlertModal = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-5efb8bd4"]]); var __async2 = (__this, __arguments, generator) => { return new Promise((resolve2, reject) => { var fulfilled = (value) => { @@ -12017,17 +12268,31 @@ ${formattedObject}`; const showBindingResult = ref(false); const selectedTemplateName = ref(""); const bindingResponse = ref(null); + const showAlert = ref(false); + const alertTitle = ref("Alert"); + const alertMessage = ref(""); + const alertType = ref("error"); + const alertPreserveWhitespace = ref(false); const isCliFlow = computed(() => authService.isCliFlow()); const showBindingModal = ref(false); const selectedTemplate = ref(null); const cluster = computed(() => route.query.cluster_id || ""); + const consumerId = computed(() => route.query.consumer_id || ""); + const buildApiUrl = (endpoint) => { + const params = new URLSearchParams(); + if (cluster.value) + params.set("cluster_id", cluster.value); + if (consumerId.value) + params.set("consumer_id", consumerId.value); + return params.toString() ? `${endpoint}?${params.toString()}` : endpoint; + }; const loadResources = () => __async2(this, null, function* () { var _a; loading.value = true; error.value = null; try { - const templatesUrl = cluster.value ? `/templates?cluster_id=${cluster.value}` : "/templates"; - const collectionsUrl = cluster.value ? `/collections?cluster_id=${cluster.value}` : "/collections"; + const templatesUrl = buildApiUrl("/templates"); + const collectionsUrl = buildApiUrl("/collections"); const [templatesResponse, collectionsResponse] = yield Promise.all([ httpClient.get(templatesUrl), httpClient.get(collectionsUrl) @@ -12036,10 +12301,30 @@ ${formattedObject}`; collections.value = collectionsResponse.data.items || []; } catch (err) { console.error("Failed to load resources:", err); - if (((_a = err.response) == null ? void 0 : _a.status) === 401) { - return; + if (err instanceof StructuredError) { + const kubeError = err.kubeBindError; + if (kubeError.code === "AUTHENTICATION_FAILED") { + return; + } + switch (kubeError.code) { + case "AUTHORIZATION_FAILED": + error.value = `Authorization failed: ${kubeError.details || kubeError.message}`; + break; + case "CLUSTER_CONNECTION_FAILED": + error.value = `Could not connect to cluster: ${kubeError.details || kubeError.message}`; + break; + case "RESOURCE_NOT_FOUND": + error.value = `Resources not found: ${kubeError.details || kubeError.message}`; + break; + default: + error.value = `Error: ${kubeError.message}`; + } + } else { + if (((_a = err.response) == null ? void 0 : _a.status) === 401) { + return; + } + error.value = "Failed to load resources. Please try again."; } - error.value = "Failed to load resources. Please try again."; } finally { loading.value = false; } @@ -12058,13 +12343,16 @@ ${formattedObject}`; const handleBind = (templateName, bindingName) => __async2(this, null, function* () { var _a; try { - const bindUrl = cluster.value ? `/bind?cluster_id=${cluster.value}` : `/bind`; + const bindUrl = buildApiUrl("/bind"); const bindingRequest = { metadata: { name: bindingName }, templateRef: { name: templateName + }, + clusterIdentity: { + identity: consumerId.value || "" } }; const response = yield httpClient.post(bindUrl, bindingRequest); @@ -12079,14 +12367,44 @@ ${formattedObject}`; showBindingResult.value = true; } } else { - alert(`Failed to bind template: ${templateName}`); + showAlertModal(`Failed to bind template: ${templateName}`, "Binding Failed", "error"); } } catch (err) { console.error("Failed to bind template:", err); - if (((_a = err.response) == null ? void 0 : _a.status) === 401) { - return; + if (err instanceof StructuredError) { + const kubeError = err.kubeBindError; + if (kubeError.code === "AUTHENTICATION_FAILED") { + return; + } + let errorMessage; + switch (kubeError.code) { + case "AUTHORIZATION_FAILED": + errorMessage = `Authorization failed: You don't have permission to bind resources in this cluster. + +Details: ${kubeError.details || kubeError.message}`; + break; + case "CLUSTER_CONNECTION_FAILED": + errorMessage = `Cluster connection failed: Unable to connect to the target cluster. + +Details: ${kubeError.details || kubeError.message}`; + break; + case "RESOURCE_NOT_FOUND": + errorMessage = `Template not found: The requested template could not be found. + +Details: ${kubeError.details || kubeError.message}`; + break; + default: + errorMessage = `Failed to bind template: ${kubeError.message} + +Details: ${kubeError.details || "No additional details available"}`; + } + showAlertModal(errorMessage, "Binding Failed", "error", true); + } else { + if (((_a = err.response) == null ? void 0 : _a.status) === 401) { + return; + } + showAlertModal(`Failed to bind template: ${templateName}. Check console for details.`, "Binding Failed", "error"); } - alert(`Failed to bind template: ${templateName}. Check console for details.`); } }); const closeBindingResult = () => { @@ -12094,6 +12412,16 @@ ${formattedObject}`; bindingResponse.value = null; selectedTemplateName.value = ""; }; + const showAlertModal = (message, title = "Error", type = "error", preserveWhitespace = false) => { + alertMessage.value = message; + alertTitle.value = title; + alertType.value = type; + alertPreserveWhitespace.value = preserveWhitespace; + showAlert.value = true; + }; + const closeAlert = () => { + showAlert.value = false; + }; onMounted(() => { loadResources(); }); @@ -12228,13 +12556,21 @@ ${formattedObject}`; "template-name": selectedTemplateName.value, "binding-response": bindingResponse.value, onClose: closeBindingResult - }, null, 8, ["show", "template-name", "binding-response"])) : createCommentVNode("", true) + }, null, 8, ["show", "template-name", "binding-response"])) : createCommentVNode("", true), + createVNode(AlertModal, { + show: showAlert.value, + title: alertTitle.value, + message: alertMessage.value, + type: alertType.value, + "preserve-whitespace": alertPreserveWhitespace.value, + onClose: closeAlert + }, null, 8, ["show", "title", "message", "type", "preserve-whitespace"]) ]); }; } }); - const Resources_vue_vue_type_style_index_0_scoped_c5a84217_lang = ""; - const Resources = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c5a84217"]]); + const Resources_vue_vue_type_style_index_0_scoped_1c21cc87_lang = ""; + const Resources = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1c21cc87"]]); const routes = [ { path: "/", component: Resources }, { path: "/resources", component: Resources } diff --git a/web/dist/assets/index.952308d6.css b/web/dist/assets/index.68bcd12d.css similarity index 73% rename from web/dist/assets/index.952308d6.css rename to web/dist/assets/index.68bcd12d.css index 02d5bcdc9..b98d69c3e 100644 --- a/web/dist/assets/index.952308d6.css +++ b/web/dist/assets/index.68bcd12d.css @@ -1,8 +1,8 @@ -#app[data-v-393414b1] { +#app[data-v-504b04cf] { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', sans-serif; } -.header[data-v-393414b1] { +.header[data-v-504b04cf] { background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); border-bottom: 1px solid rgba(255, 255, 255, 0.1); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); @@ -10,7 +10,7 @@ top: 0; z-index: 100; } -.header-content[data-v-393414b1] { +.header-content[data-v-504b04cf] { max-width: 1200px; margin: 0 auto; display: flex; @@ -18,30 +18,30 @@ align-items: center; padding: 1rem 2rem; } -.brand[data-v-393414b1] { +.brand[data-v-504b04cf] { display: flex; align-items: center; gap: 0.75rem; } -.logo[data-v-393414b1] { +.logo[data-v-504b04cf] { color: rgba(255, 255, 255, 0.9); display: flex; align-items: center; justify-content: center; } -.header h1[data-v-393414b1] { +.header h1[data-v-504b04cf] { margin: 0; color: white; font-size: 1.5rem; font-weight: 600; letter-spacing: -0.025em; } -.user-section[data-v-393414b1] { +.user-section[data-v-504b04cf] { display: flex; align-items: center; gap: 1.5rem; } -.user-info[data-v-393414b1] { +.user-info[data-v-504b04cf] { display: flex; align-items: center; gap: 0.5rem; @@ -49,15 +49,15 @@ font-size: 0.875rem; font-weight: 500; } -.status-indicator[data-v-393414b1] { +.status-indicator[data-v-504b04cf] { width: 8px; height: 8px; background: #10b981; border-radius: 50%; box-shadow: 0 0 0 2px rgba(16, 185, 129, 0.3); - animation: pulse-393414b1 2s infinite; + animation: pulse-504b04cf 2s infinite; } -@keyframes pulse-393414b1 { +@keyframes pulse-504b04cf { 0%, 100% { opacity: 1; } @@ -65,10 +65,10 @@ opacity: 0.5; } } -.welcome-text[data-v-393414b1] { +.welcome-text[data-v-504b04cf] { color: rgba(255, 255, 255, 0.8); } -.logout-btn[data-v-393414b1] { +.logout-btn[data-v-504b04cf] { display: flex; align-items: center; gap: 0.5rem; @@ -83,18 +83,18 @@ transition: all 0.2s ease; backdrop-filter: blur(10px); } -.logout-btn[data-v-393414b1]:hover { +.logout-btn[data-v-504b04cf]:hover { background: rgba(255, 255, 255, 0.2); color: white; border-color: rgba(255, 255, 255, 0.3); transform: translateY(-1px); } -.main[data-v-393414b1] { +.main[data-v-504b04cf] { min-height: calc(100vh - 80px); background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%); padding: 0; } -.auth-placeholder[data-v-393414b1] { +.auth-placeholder[data-v-504b04cf] { display: flex; flex-direction: column; align-items: center; @@ -103,7 +103,7 @@ padding: 4rem 2rem; min-height: calc(100vh - 200px); } -.auth-placeholder h2[data-v-393414b1] { +.auth-placeholder h2[data-v-504b04cf] { color: #1f2937; margin-bottom: 1rem; font-size: 2rem; @@ -113,14 +113,14 @@ -webkit-text-fill-color: transparent; background-clip: text; } -.auth-placeholder p[data-v-393414b1] { +.auth-placeholder p[data-v-504b04cf] { color: #6b7280; margin-bottom: 2rem; font-size: 1.125rem; max-width: 500px; line-height: 1.6; } -.auth-btn[data-v-393414b1] { +.auth-btn[data-v-504b04cf] { display: inline-flex; align-items: center; gap: 0.5rem; @@ -135,11 +135,41 @@ transition: all 0.2s ease; box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3); } -.auth-btn[data-v-393414b1]:hover { +.auth-btn[data-v-504b04cf]:hover { background: linear-gradient(135deg, #5a6fd8 0%, #6a4190 100%); transform: translateY(-2px); box-shadow: 0 6px 16px rgba(102, 126, 234, 0.4); } +.auth-error[data-v-504b04cf] { + display: flex; + align-items: flex-start; + gap: 1rem; + padding: 1rem 1.5rem; + margin: 1.5rem 0; + background: #fef2f2; + border: 1px solid #fecaca; + border-radius: 12px; + max-width: 500px; + text-align: left; + box-shadow: 0 2px 8px rgba(239, 68, 68, 0.1); +} +.error-icon[data-v-504b04cf] { + font-size: 1.5rem; + line-height: 1; + margin-top: 0.125rem; +} +.error-content h3[data-v-504b04cf] { + margin: 0 0 0.5rem 0; + color: #dc2626; + font-size: 1rem; + font-weight: 600; +} +.error-content p[data-v-504b04cf] { + margin: 0; + color: #991b1b; + font-size: 0.875rem; + line-height: 1.5; +} .binding-modal-overlay[data-v-e150bd4a] { position: fixed; @@ -706,30 +736,206 @@ to { transform: translateY(0) scale(1); opacity: 1; transform: none; } -.resources[data-v-c5a84217] { +.modal-overlay[data-v-5efb8bd4] { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-color: rgba(0, 0, 0, 0.6); + display: flex; + align-items: center; + justify-content: center; + z-index: 1000; + animation: fadeIn-5efb8bd4 0.2s ease; +} +.modal[data-v-5efb8bd4] { + background: white; + border-radius: 12px; + width: 90%; + max-width: 500px; + max-height: 85vh; + overflow: hidden; + box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2); + animation: slideIn-5efb8bd4 0.3s ease; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', sans-serif; +} +@keyframes fadeIn-5efb8bd4 { +from { opacity: 0; +} +to { opacity: 1; +} +} +@keyframes slideIn-5efb8bd4 { +from { transform: translateY(-20px) scale(0.95); opacity: 0; +} +to { transform: translateY(0) scale(1); opacity: 1; +} +} +.modal-header[data-v-5efb8bd4] { + display: flex; + justify-content: space-between; + align-items: center; + padding: 1.5rem 2rem; + border-bottom: 1px solid #e5e7eb; + color: white; +} +.header-error[data-v-5efb8bd4] { + background: linear-gradient(135deg, #dc2626 0%, #b91c1c 100%); +} +.header-warning[data-v-5efb8bd4] { + background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%); +} +.header-info[data-v-5efb8bd4] { + background: linear-gradient(135deg, #3b82f6 0%, #2563eb 100%); +} +.header-success[data-v-5efb8bd4] { + background: linear-gradient(135deg, #10b981 0%, #059669 100%); +} +.modal-header h3[data-v-5efb8bd4] { + margin: 0; + font-size: 1.25rem; + font-weight: 600; +} +.close-btn[data-v-5efb8bd4] { + background: none; + border: none; + font-size: 1.5rem; + cursor: pointer; + color: rgba(255, 255, 255, 0.8); + width: 32px; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + transition: all 0.2s; +} +.close-btn[data-v-5efb8bd4]:hover { + background: rgba(255, 255, 255, 0.1); + color: white; +} +.modal-content[data-v-5efb8bd4] { + padding: 2rem; +} +.message-content[data-v-5efb8bd4] { + display: flex; + align-items: flex-start; + gap: 1rem; +} +.icon-container[data-v-5efb8bd4] { + flex-shrink: 0; + width: 3rem; + height: 3rem; + display: flex; + align-items: center; + justify-content: center; + border-radius: 50%; + font-size: 1.5rem; +} +.icon-error[data-v-5efb8bd4] { + background: #fee2e2; + color: #dc2626; +} +.icon-warning[data-v-5efb8bd4] { + background: #fef3c7; + color: #f59e0b; +} +.icon-info[data-v-5efb8bd4] { + background: #dbeafe; + color: #3b82f6; +} +.icon-success[data-v-5efb8bd4] { + background: #d1fae5; + color: #10b981; +} +.message-text[data-v-5efb8bd4] { + flex: 1; + min-width: 0; +} +.message-text p[data-v-5efb8bd4] { + margin: 0; + color: #374151; + line-height: 1.6; + word-wrap: break-word; +} +.message-text pre[data-v-5efb8bd4] { + margin: 0; + color: #374151; + line-height: 1.6; + white-space: pre-wrap; + word-wrap: break-word; + font-family: inherit; +} +.modal-footer[data-v-5efb8bd4] { + padding: 1.5rem 2rem; + border-top: 1px solid #e5e7eb; + background: #f9fafb; + display: flex; + justify-content: flex-end; +} +.ok-btn[data-v-5efb8bd4] { + padding: 0.75rem 2rem; + border: none; + border-radius: 8px; + cursor: pointer; + font-weight: 600; + transition: all 0.2s; + color: white; +} +.btn-error[data-v-5efb8bd4] { + background: linear-gradient(135deg, #dc2626 0%, #b91c1c 100%); +} +.btn-error[data-v-5efb8bd4]:hover { + background: linear-gradient(135deg, #b91c1c 0%, #991b1b 100%); + transform: translateY(-1px); +} +.btn-warning[data-v-5efb8bd4] { + background: linear-gradient(135deg, #f59e0b 0%, #d97706 100%); +} +.btn-warning[data-v-5efb8bd4]:hover { + background: linear-gradient(135deg, #d97706 0%, #b45309 100%); + transform: translateY(-1px); +} +.btn-info[data-v-5efb8bd4] { + background: linear-gradient(135deg, #3b82f6 0%, #2563eb 100%); +} +.btn-info[data-v-5efb8bd4]:hover { + background: linear-gradient(135deg, #2563eb 0%, #1d4ed8 100%); + transform: translateY(-1px); +} +.btn-success[data-v-5efb8bd4] { + background: linear-gradient(135deg, #10b981 0%, #059669 100%); +} +.btn-success[data-v-5efb8bd4]:hover { + background: linear-gradient(135deg, #059669 0%, #047857 100%); + transform: translateY(-1px); +} + +.resources[data-v-1c21cc87] { max-width: 1200px; margin: 0 auto; padding: 2rem; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', sans-serif; } -.header-section[data-v-c5a84217] { +.header-section[data-v-1c21cc87] { margin-bottom: 2rem; } -.resources h2[data-v-c5a84217] { +.resources h2[data-v-1c21cc87] { color: #1e293b; margin-bottom: 1rem; font-size: 1.875rem; font-weight: 600; font-family: inherit; } -.resources h3[data-v-c5a84217] { +.resources h3[data-v-1c21cc87] { color: #334155; font-size: 1.25rem; font-weight: 600; font-family: inherit; margin: 0; } -.cli-indicator[data-v-c5a84217] { +.cli-indicator[data-v-1c21cc87] { background-color: #dbeafe; border: 1px solid #3b82f6; border-radius: 8px; @@ -741,17 +947,17 @@ to { transform: translateY(0) scale(1); opacity: 1; align-items: center; gap: 0.5rem; } -.loading[data-v-c5a84217] { +.loading[data-v-1c21cc87] { text-align: center; padding: 2rem; color: #666; } -.error[data-v-c5a84217] { +.error[data-v-1c21cc87] { text-align: center; padding: 2rem; color: #dc3545; } -.retry-btn[data-v-c5a84217] { +.retry-btn[data-v-1c21cc87] { padding: 0.5rem 1rem; background-color: #007bff; color: white; @@ -760,32 +966,32 @@ to { transform: translateY(0) scale(1); opacity: 1; cursor: pointer; margin-top: 1rem; } -.retry-btn[data-v-c5a84217]:hover { +.retry-btn[data-v-1c21cc87]:hover { background-color: #0056b3; } -.resources-container[data-v-c5a84217] { +.resources-container[data-v-1c21cc87] { display: grid; gap: 3rem; } -.templates-section[data-v-c5a84217], -.collections-section[data-v-c5a84217] { +.templates-section[data-v-1c21cc87], +.collections-section[data-v-1c21cc87] { background: #f8fafc; padding: 1.5rem; border-radius: 12px; border: 1px solid #e2e8f0; } -.no-resources[data-v-c5a84217] { +.no-resources[data-v-1c21cc87] { text-align: center; color: #666; padding: 1rem; } -.section-header[data-v-c5a84217] { +.section-header[data-v-1c21cc87] { display: flex; justify-content: space-between; align-items: center; margin-bottom: 1.5rem; } -.item-count[data-v-c5a84217] { +.item-count[data-v-1c21cc87] { font-size: 0.9rem; color: #666; background: #e9ecef; @@ -793,7 +999,7 @@ to { transform: translateY(0) scale(1); opacity: 1; border-radius: 12px; font-weight: 500; } -.no-resources[data-v-c5a84217] { +.no-resources[data-v-1c21cc87] { text-align: center; padding: 3rem 2rem; color: #6b7280; @@ -801,26 +1007,26 @@ to { transform: translateY(0) scale(1); opacity: 1; border-radius: 12px; border: 2px dashed #d1d5db; } -.no-resources-icon[data-v-c5a84217] { +.no-resources-icon[data-v-1c21cc87] { margin-bottom: 1rem; opacity: 0.4; color: #9ca3af; } -.no-resources h4[data-v-c5a84217] { +.no-resources h4[data-v-1c21cc87] { margin: 0 0 0.5rem 0; color: #374151; font-weight: 600; } -.no-resources p[data-v-c5a84217] { +.no-resources p[data-v-1c21cc87] { margin: 0; font-size: 0.9rem; } -.resource-grid[data-v-c5a84217] { +.resource-grid[data-v-1c21cc87] { display: grid; grid-template-columns: repeat(auto-fill, minmax(350px, 1fr)); gap: 1.5rem; } -.template-card[data-v-c5a84217], .collection-card[data-v-c5a84217] { +.template-card[data-v-1c21cc87], .collection-card[data-v-1c21cc87] { background: white; border: 1px solid #e2e8f0; border-radius: 12px; @@ -829,27 +1035,27 @@ to { transform: translateY(0) scale(1); opacity: 1; overflow: hidden; box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); } -.template-card[data-v-c5a84217]:hover, .collection-card[data-v-c5a84217]:hover { +.template-card[data-v-1c21cc87]:hover, .collection-card[data-v-1c21cc87]:hover { box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1); transform: translateY(-2px); border-color: #cbd5e1; } -.card-header[data-v-c5a84217] { +.card-header[data-v-1c21cc87] { padding: 1.5rem 1.5rem 1rem 1.5rem; border-bottom: 1px solid #f1f5f9; } -.card-title[data-v-c5a84217] { +.card-title[data-v-1c21cc87] { margin: 0 0 0.75rem 0; color: #1e293b; font-size: 1.125rem; font-weight: 600; } -.card-badges[data-v-c5a84217] { +.card-badges[data-v-1c21cc87] { display: flex; flex-wrap: wrap; gap: 0.5rem; } -.badge[data-v-c5a84217] { +.badge[data-v-1c21cc87] { font-size: 0.75rem; padding: 0.25rem 0.75rem; border-radius: 12px; @@ -857,42 +1063,42 @@ to { transform: translateY(0) scale(1); opacity: 1; display: inline-flex; align-items: center; } -.resources-badge[data-v-c5a84217] { +.resources-badge[data-v-1c21cc87] { background: #dbeafe; color: #1d4ed8; } -.permissions-badge[data-v-c5a84217] { +.permissions-badge[data-v-1c21cc87] { background: #fef3c7; color: #d97706; } -.namespaces-badge[data-v-c5a84217] { +.namespaces-badge[data-v-1c21cc87] { background: #d1fae5; color: #047857; } -.card-content[data-v-c5a84217] { +.card-content[data-v-1c21cc87] { padding: 1rem 1.5rem; } -.card-description[data-v-c5a84217] { +.card-description[data-v-1c21cc87] { color: #64748b; margin: 0 0 1rem 0; line-height: 1.5; font-size: 0.9rem; } -.card-preview[data-v-c5a84217], .collection-templates[data-v-c5a84217] { +.card-preview[data-v-1c21cc87], .collection-templates[data-v-1c21cc87] { margin-top: 1rem; } -.card-preview strong[data-v-c5a84217], .collection-templates strong[data-v-c5a84217] { +.card-preview strong[data-v-1c21cc87], .collection-templates strong[data-v-1c21cc87] { color: #374151; font-size: 0.875rem; display: block; margin-bottom: 0.5rem; } -.resource-preview[data-v-c5a84217], .template-list[data-v-c5a84217] { +.resource-preview[data-v-1c21cc87], .template-list[data-v-1c21cc87] { display: flex; flex-wrap: wrap; gap: 0.5rem; } -.resource-tag[data-v-c5a84217], .template-tag[data-v-c5a84217] { +.resource-tag[data-v-1c21cc87], .template-tag[data-v-1c21cc87] { font-size: 0.75rem; background: #f1f5f9; color: #475569; @@ -900,12 +1106,12 @@ to { transform: translateY(0) scale(1); opacity: 1; border-radius: 6px; border: 1px solid #e2e8f0; } -.more-indicator[data-v-c5a84217] { +.more-indicator[data-v-1c21cc87] { font-size: 0.75rem; color: #6b7280; font-style: italic; } -.card-actions[data-v-c5a84217] { +.card-actions[data-v-1c21cc87] { padding: 1rem 1.5rem; background: #fafbfc; border-top: 1px solid #f1f5f9; @@ -913,7 +1119,7 @@ to { transform: translateY(0) scale(1); opacity: 1; gap: 0.75rem; justify-content: flex-end; } -.details-btn[data-v-c5a84217], .bind-btn[data-v-c5a84217] { +.details-btn[data-v-1c21cc87], .bind-btn[data-v-1c21cc87] { padding: 0.5rem 1rem; border: none; border-radius: 6px; @@ -922,21 +1128,21 @@ to { transform: translateY(0) scale(1); opacity: 1; font-size: 0.875rem; transition: all 0.2s ease; } -.details-btn[data-v-c5a84217] { +.details-btn[data-v-1c21cc87] { background: #f8fafc; color: #475569; border: 1px solid #e2e8f0; } -.details-btn[data-v-c5a84217]:hover { +.details-btn[data-v-1c21cc87]:hover { background: #f1f5f9; border-color: #cbd5e1; } -.bind-btn[data-v-c5a84217] { +.bind-btn[data-v-1c21cc87] { background: linear-gradient(135deg, #10b981 0%, #059669 100%); color: white; border: 1px solid transparent; } -.bind-btn[data-v-c5a84217]:hover { +.bind-btn[data-v-1c21cc87]:hover { background: linear-gradient(135deg, #059669 0%, #047857 100%); transform: translateY(-1px); box-shadow: 0 2px 4px rgba(16, 185, 129, 0.2); diff --git a/web/dist/index.html b/web/dist/index.html index e8ddd2582..54f799d9f 100644 --- a/web/dist/index.html +++ b/web/dist/index.html @@ -5,8 +5,8 @@ Kube Bind - - + +
diff --git a/web/src/App.vue b/web/src/App.vue index 7947eedff..52849843c 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -109,14 +109,18 @@ const generateSessionId = (): string => { } onMounted(() => { + // Restore preserved params first (before checking auth status) + // This ensures that params lost during OAuth redirect are restored + authService.restorePreservedParams() + checkAuthStatus() - + // Listen for authentication expiration events from HTTP interceptor window.addEventListener('auth-expired', () => { console.log('Received auth-expired event, updating authentication status') authStatus.value.isAuthenticated = false authStatus.value.error = 'Session expired. Please re-authenticate.' - + // Automatically trigger authentication redirect if we have the necessary parameters // and haven't already attempted authentication (to prevent hot loops) const hasRequiredParams = route.query.cluster_id || route.query.session_id diff --git a/web/src/services/auth.ts b/web/src/services/auth.ts index ef5f119d9..1d04e8581 100644 --- a/web/src/services/auth.ts +++ b/web/src/services/auth.ts @@ -67,14 +67,35 @@ class AuthService { } async initiateAuth( - sessionId: string, + sessionId: string, clusterId: string, clientSideRedirectUrl?: string, + consumerId?: string, ): Promise { const authUrl = `/api/authorize` - + const redirect_url = window.location.origin + window.location.pathname - + + // Store query parameters in sessionStorage to preserve them through OAuth flow + const currentParams = new URLSearchParams(window.location.search) + const paramsToPreserve: Record = {} + + // Store all query params that we need to preserve + if (currentParams.has('consumer_id')) { + paramsToPreserve.consumer_id = currentParams.get('consumer_id')! + } + if (currentParams.has('session_id')) { + paramsToPreserve.session_id = currentParams.get('session_id')! + } + if (currentParams.has('redirect_url')) { + paramsToPreserve.redirect_url = currentParams.get('redirect_url')! + } + if (currentParams.has('cluster_id')) { + paramsToPreserve.cluster_id = currentParams.get('cluster_id')! + } + + sessionStorage.setItem('kube-bind-preserved-params', JSON.stringify(paramsToPreserve)) + const params = new URLSearchParams({ session_id: sessionId, redirect_url: redirect_url, @@ -86,6 +107,10 @@ class AuthService { params.set('client_side_redirect_url', clientSideRedirectUrl) } + if (consumerId) { + params.set('consumer_id', consumerId) + } + window.location.href = `${authUrl}?${params}` } @@ -144,14 +169,53 @@ class AuthService { if (consumerId) { callbackUrl.searchParams.append('consumer_id', consumerId) } - + // Add binding response data as base64 encoded query parameter const base64Response = btoa(JSON.stringify(bindingResponseData)) callbackUrl.searchParams.append('binding_response', base64Response) - + window.location.href = callbackUrl.toString() } } + + restorePreservedParams(): void { + // Check if we have preserved params from before OAuth redirect + const preservedParamsJson = sessionStorage.getItem('kube-bind-preserved-params') + + if (!preservedParamsJson) { + return + } + + try { + const preservedParams = JSON.parse(preservedParamsJson) + const currentParams = new URLSearchParams(window.location.search) + + // Only restore if the params are missing in current URL + let needsUpdate = false + + for (const [key, value] of Object.entries(preservedParams)) { + if (!currentParams.has(key)) { + currentParams.set(key, value as string) + needsUpdate = true + } + } + + if (needsUpdate) { + // Clear the stored params + sessionStorage.removeItem('kube-bind-preserved-params') + + // Update URL with preserved params and reload to ensure Vue Router picks up the changes + const newUrl = `${window.location.pathname}?${currentParams.toString()}` + window.location.replace(newUrl) + } else { + // Params are already in URL, just clean up storage + sessionStorage.removeItem('kube-bind-preserved-params') + } + } catch (error) { + console.error('Failed to restore preserved params:', error) + sessionStorage.removeItem('kube-bind-preserved-params') + } + } } export const authService = new AuthService() \ No newline at end of file