Merge branch 'omp-jb50930' into 'master'

[embedlite-components] Add expiration property to ContentPermissionManager. Contributes to JB#50930 See merge request mer-core/embedlite-components!102
sailfishos · Nov 19, 2020 · cc8c848 · cc8c848
2 parents bb1b992 + 2369b63
commit cc8c848
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/jscomps/ContentPermissionManager.js b/jscomps/ContentPermissionManager.js
@@ -66,7 +66,8 @@ ContentPermissionManager.prototype = {
                   permissionList.push({
                                   type: permission.type,
                                   uri: permission.principal.origin,
-                                  capability: permission.capability
+                                  capability: permission.capability,
+                                  expireType: permission.expireType
                               })
               }
               sendResult("embed:perms:all", permissionList);
@@ -79,7 +80,8 @@ ContentPermissionManager.prototype = {
                   result.push({
                                   type: permission.type,
                                   uri: data.uri,
-                                  capability: permission.capability
+                                  capability: permission.capability,
+                                  expireType: permission.expireType
                               });
               }
               sendResult("embed:perms:all-for-uri", result);