feat: add expired value in permissions (#58)

* fix: users test

* feat: add expired value in permissions

* fix: revert isExpired method changes

* fix: minor fixes

Author: bietkul

model/permission/permission.go

@@ -48,6 +48,7 @@ type Permission struct {
 	Description string              `json:"description"`
 	Includes    []string            `json:"include_fields"`
 	Excludes    []string            `json:"exclude_fields"`
+	Expired     bool                `json:"expired"`
 }
 
 // Limits defines the rate limits for each category.

plugins/permissions/dao.go

@@ -50,6 +50,23 @@ func initPlugin(indexName, mapping string) (*elasticsearch, error) {
 	return es, nil
 }
 
+func applyExpiredField(data []byte) ([]byte, error) {
+	var rawPermission *permission.Permission
+	err := json.Unmarshal(data, &rawPermission)
+	if err != nil {
+		return nil, fmt.Errorf("unable to un-marshal slice of raw permissions: %v", err)
+	}
+	rawPermission.Expired, err = rawPermission.IsExpired()
+	if err != nil {
+		return nil, err
+	}
+	marshalled, err := json.Marshal(rawPermission)
+	if err != nil {
+		return nil, fmt.Errorf("unable to marshal slice of raw permissions: %v", err)
+	}
+	return marshalled, nil
+}
+
 func (es *elasticsearch) getPermission(ctx context.Context, username string) (*permission.Permission, error) {
 	raw, err := es.getRawPermission(ctx, username)
 	if err != nil {

plugins/permissions/dao_es6.go

@@ -51,7 +51,11 @@ func (es *elasticsearch) getRawOwnerPermissionsEs6(ctx context.Context, owner st
 
 	rawPermissions := []json.RawMessage{}
 	for _, hit := range resp.Hits.Hits {
-		rawPermissions = append(rawPermissions, *hit.Source)
+		rawPermission, err := applyExpiredField(*hit.Source)
+		if err != nil {
+			return nil, err
+		}
+		rawPermissions = append(rawPermissions, rawPermission)
 	}
 
 	raw, err := json.Marshal(rawPermissions)
@@ -72,12 +76,10 @@ func (es *elasticsearch) getRawPermissionEs6(ctx context.Context, username strin
 	if err != nil {
 		return nil, err
 	}
-
-	src, err := response.Source.MarshalJSON()
+	src, err := applyExpiredField(*response.Source)
 	if err != nil {
 		return nil, err
 	}
-
 	return src, nil
 }
 

plugins/permissions/dao_es7.go

@@ -51,7 +51,11 @@ func (es *elasticsearch) getRawOwnerPermissionsEs7(ctx context.Context, owner st
 
 	rawPermissions := []json.RawMessage{}
 	for _, hit := range resp.Hits.Hits {
-		rawPermissions = append(rawPermissions, hit.Source)
+		rawPermission, err := applyExpiredField(hit.Source)
+		if err != nil {
+			return nil, err
+		}
+		rawPermissions = append(rawPermissions, rawPermission)
 	}
 
 	raw, err := json.Marshal(rawPermissions)
@@ -72,11 +76,10 @@ func (es *elasticsearch) getRawPermissionEs7(ctx context.Context, username strin
 		return nil, err
 	}
 
-	src, err := response.Source.MarshalJSON()
+	src, err := applyExpiredField(response.Source)
 	if err != nil {
 		return nil, err
 	}
-
 	return src, nil
 }
 

plugins/permissions/e2e_test.go

@@ -68,6 +68,7 @@ var createPermissionResponse = map[string]interface{}{
 	"description":    "TEST PERMISSION",
 	"include_fields": nil,
 	"exclude_fields": nil,
+	"expired":        false,
 }
 
 var updatePermissionsRequest = map[string]interface{}{