From 92572395bbccc4da2b9c2ab7ce11e20bc5529f34 Mon Sep 17 00:00:00 2001
From: dharini <dharini@hashicorp.com>
Date: Wed, 8 Sep 2021 11:29:13 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20redirect=20to=20index=20o?=
 =?UTF-8?q?n=20save=20without=20read?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/admin/app/routes/scopes/scope/auth-methods.js | 12 ++++++++----
 ui/admin/app/routes/scopes/scope/roles.js        |  6 +++++-
 ui/admin/app/routes/scopes/scope/targets.js      |  6 +++++-
 ui/admin/app/routes/scopes/scope/users.js        |  6 +++++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ui/admin/app/routes/scopes/scope/auth-methods.js b/ui/admin/app/routes/scopes/scope/auth-methods.js
index 938ce6d16..7e4ca740b 100644
--- a/ui/admin/app/routes/scopes/scope/auth-methods.js
+++ b/ui/admin/app/routes/scopes/scope/auth-methods.js
@@ -60,10 +60,14 @@ export default class ScopesScopeAuthMethodsRoute extends Route {
   )
   async save(authMethod) {
     await authMethod.save();
-    await this.transitionTo(
-      'scopes.scope.auth-methods.auth-method',
-      authMethod
-    );
+    if (this.can.can('read model', authMethod)) {
+      await this.transitionTo(
+        'scopes.scope.auth-methods.auth-method',
+        authMethod
+      );
+    } else {
+      await this.transitionTo('scopes.scope.auth-method');
+    }
     this.refresh();
   }
 
diff --git a/ui/admin/app/routes/scopes/scope/roles.js b/ui/admin/app/routes/scopes/scope/roles.js
index cbc1dfcc5..f83c69135 100644
--- a/ui/admin/app/routes/scopes/scope/roles.js
+++ b/ui/admin/app/routes/scopes/scope/roles.js
@@ -58,7 +58,11 @@ export default class ScopesScopeRolesRoute extends Route {
   )
   async save(role) {
     await role.save();
-    await this.transitionTo('scopes.scope.roles.role', role);
+    if (this.can.can('read model', role)) {
+      await this.transitionTo('scopes.scope.roles.role', role);
+    } else {
+      await this.transitionTo('scopes.scope.roles');
+    }
     this.refresh();
   }
 
diff --git a/ui/admin/app/routes/scopes/scope/targets.js b/ui/admin/app/routes/scopes/scope/targets.js
index 2adb5ca84..85a27eab1 100644
--- a/ui/admin/app/routes/scopes/scope/targets.js
+++ b/ui/admin/app/routes/scopes/scope/targets.js
@@ -60,7 +60,11 @@ export default class ScopesScopeTargetsRoute extends Route {
   )
   async save(target) {
     await target.save();
-    await this.transitionTo('scopes.scope.targets.target', target);
+    if (this.can.can('read model', target)) {
+      await this.transitionTo('scopes.scope.targets.target', target);
+    } else {
+      await this.transitionTo('scopes.scope.targets');
+    }
     this.refresh();
   }
 
diff --git a/ui/admin/app/routes/scopes/scope/users.js b/ui/admin/app/routes/scopes/scope/users.js
index aa3dde96a..6512c6aeb 100644
--- a/ui/admin/app/routes/scopes/scope/users.js
+++ b/ui/admin/app/routes/scopes/scope/users.js
@@ -59,7 +59,11 @@ export default class ScopesScopeUsersRoute extends Route {
   )
   async save(user) {
     await user.save();
-    await this.transitionTo('scopes.scope.users.user', user);
+    if (this.can.can('read model', user)) {
+      await this.transitionTo('scopes.scope.users.user', user);
+    } else {
+      await this.transitionTo('scopes.scope.users');
+    }
     this.refresh();
   }