Merge pull request #1399 from bamsalem/permissions-array-validation

Add check/validation if permission response is an array, to prevent web ui from crashing
oVirt · Apr 8, 2021 · 6f4406d · 6f4406d
2 parents d72057b + 35b1314
commit 6f4406d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/ovirtapi/transform.js b/src/ovirtapi/transform.js
@@ -899,7 +899,7 @@ const VmSessions = {
 //
 //
 const Permissions = {
-  toInternal ({ permissions }: { permissions: Array<ApiPermissionType> }): Array<PermissionType> {
+  toInternal ({ permissions = [] }: { permissions: Array<ApiPermissionType> }): Array<PermissionType> {
     return permissions.map(permission => ({
       name: permission.role.name,
       userId: permission.user && permission.user.id,

diff --git a/src/sagas/utils.js b/src/sagas/utils.js
@@ -162,7 +162,10 @@ export function* delayInMsSteps (count = 20, msMultiplier = 2000) {
 
 export function* fetchPermits ({ entityType, id }) {
   const permissions = yield callExternalAction(`get${entityType}Permissions`, Api[`get${entityType}Permissions`], { payload: { id } })
-  return getUserPermits(Api.permissionsToInternal({ permissions: permissions.permission }))
+  if (permissions && Array.isArray(permissions.permission)) {
+    return getUserPermits(Api.permissionsToInternal({ permissions: permissions.permission }))
+  }
+  return []
 }
 
 export const PermissionsType = {