Handle empty permissions arrays when console runs in operator mode (#1324)

Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com>

models/operator_session_response.go

@@ -40,6 +40,9 @@ type OperatorSessionResponse struct {
 	// operator
 	Operator bool `json:"operator,omitempty"`
 
+	// permissions
+	Permissions map[string][]string `json:"permissions,omitempty"`
+
 	// status
 	// Enum: [ok]
 	Status string `json:"status,omitempty"`

operatorapi/embedded_spec.go

@@ -2299,6 +2299,15 @@ func init() {
         "operator": {
           "type": "boolean"
         },
+        "permissions": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
         "status": {
           "type": "string",
           "enum": [
@@ -6094,6 +6103,15 @@ func init() {
         "operator": {
           "type": "boolean"
         },
+        "permissions": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        },
         "status": {
           "type": "string",
           "enum": [

operatorapi/operator_session.go

@@ -41,8 +41,9 @@ func getSessionResponse(session *models.Principal) (*models.OperatorSessionRespo
 		return nil, prepareError(errorGenericInvalidSession)
 	}
 	sessionResp := &models.OperatorSessionResponse{
-		Status:   models.OperatorSessionResponseStatusOk,
-		Operator: true,
+		Status:      models.OperatorSessionResponseStatusOk,
+		Operator:    true,
+		Permissions: map[string][]string{},
 	}
 	return sessionResp, nil
 }

portal-ui/src/common/SecureComponent/SecureComponent.tsx

@@ -27,7 +27,7 @@ export const hasPermission = (
     return false;
   }
   const state = store.getState();
-  const sessionGrants = state.console.session.permissions;
+  const sessionGrants = state.console.session.permissions || {};
   const resourceGrants =
     sessionGrants[resource] ||
     sessionGrants[`arn:aws:s3:::${resource}/*`] ||

swagger-operator.yml

@@ -983,6 +983,12 @@ definitions:
         enum: [ ok ]
       operator:
         type: boolean
+      permissions:
+        type: object
+        additionalProperties:
+          type: array
+          items:
+            type: string
 
   tenantStatus:
     type: object