From 8afd44dc451344cf0e391703c5ed9fb6d7adf5f2 Mon Sep 17 00:00:00 2001
From: Haim Kortovich <haim.kortovich@topmanage.com>
Date: Mon, 20 May 2024 17:46:23 -0500
Subject: [PATCH] Reconcile usergrants before tokens

[ZITADOPER-1]
---
 src/internal/controller/machineuser_controller.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/internal/controller/machineuser_controller.go b/src/internal/controller/machineuser_controller.go
index 25bbf80..f7c4bf8 100644
--- a/src/internal/controller/machineuser_controller.go
+++ b/src/internal/controller/machineuser_controller.go
@@ -100,6 +100,10 @@ func (wr *wrappedMachineUserReconciler) Reconcile(ctx context.Context, ztdClient
 			Name:      "machineUser",
 			Reconcile: wr.reconcileMachineUser,
 		},
+		{
+			Name:      "usergrants",
+			Reconcile: wr.reconcileUserGrants,
+		},
 		{
 			Name:      "pat",
 			Reconcile: wr.reconcilePAT,
@@ -108,10 +112,6 @@ func (wr *wrappedMachineUserReconciler) Reconcile(ctx context.Context, ztdClient
 			Name:      "jwt",
 			Reconcile: wr.reconcileJWT,
 		},
-		{
-			Name:      "usergrants",
-			Reconcile: wr.reconcileUserGrants,
-		},
 	}
 	for _, p := range phases {
 		err := p.Reconcile(ctx, ztdClient)