@kalisio/kdk 2.5.1 → 2.5.3

package/core/api/hooks/hooks.authorisations.js

@@ -284,8 +284,7 @@ export function updateAbilities (options = {}) {
     if (options.fetchSubject) {
       subject = await app.getService('users').get(subject._id.toString())
     }
-    const abilities = await authorisationService.updateAbilities(subject)
-    debug('Abilities updated on subject', subject, abilities.rules)
+    await authorisationService.updateAbilities(subject)
     return hook
   }
 }

package/core/api/services/authorisations/authorisations.service.js

@@ -42,7 +42,6 @@ export default {
       }, {
         user: params.user
       })
-      await this.updateAbilities(subject)
       debug('Authorisation ' + data.permissions + ' set for subject ' + subject._id + ' on resource ' + params.resource._id + ' with scope ' + scopeName)
       return subject
     }))
@@ -75,7 +74,6 @@ export default {
           }, {
             user: params.user
           })
-          await this.updateAbilities(subject)
           debug('Authorisation unset for subject ' + subject._id + ' on resource ' + id + ' with scope ' + scopeName)
           return subject
         }
@@ -119,7 +117,7 @@ export default {
     const abilities = await defineAbilities(subject, this.app)
 
     if (cacheKey) {
-      debug('Updating user abilities of subject ' + (subject ? subject._id : ANONYMOUS_USER) + ' with cache key ' + cacheKey)
+      debug('Updating abilities of subject ' + (subject ? subject._id : ANONYMOUS_USER) + ' with cache key ' + cacheKey)
       this.cache.set(cacheKey, abilities)
     }
 

package/core/api/services/index.js

@@ -18,7 +18,11 @@ export function getServiceNameAndContext (servicePath) {
   // Then without context if any
   const lastSlash = name.lastIndexOf('/')
   const contextId = (lastSlash >= 0 ? name.substring(0, lastSlash) : '')
-  if (contextId && ObjectID.isValid(contextId)) {
+  // Check if a string is a valid MongoDB Object ID.
+  // We don't use ObjectID.isValid as it returns true for any string that contains 12 characters: https://jira.mongodb.org/browse/NODE-4912.
+  // Regular expression that checks for hex value
+  const checkForHexRegExp = /^[0-9a-fA-F]{24}$/
+  if (contextId && (contextId.length === 24) && checkForHexRegExp.test(contextId)) {
     name = name.replace(contextId + '/', '')
     return { name, contextId }
   } else {

package/core/api/services/users/users.hooks.js

@@ -56,9 +56,10 @@ export default {
     ],
     find: [],
     get: [],
-    create: [updateAbilities()],
-    update: [],
-    patch: [sendNewSubscriptionEmail],
+    create: [updateAbilities({ subjectAsItem: true })],
+    update: [updateAbilities({ subjectAsItem: true })],
+    // Fetch user in this case as we might only have partial data and miss permission properties
+    patch: [updateAbilities({ subjectAsItem: true, fetchSubject: true }), sendNewSubscriptionEmail],
     remove: []
   },
 

package/core/client/components/input/KShapePicker.vue

@@ -29,9 +29,9 @@ import KShape from '../media/KShape.vue'
 const props = defineProps({
   modelValue: {
     type: String,
-    default: 'rect',
+    default: 'circle',
     validator: (value) => {
-      return _.keys(kdkCoreUtils.Shapes).includes(value)
+      return _.concat(['none'], _.keys(kdkCoreUtils.Shapes)).includes(value)
     }
   },
   size: {
@@ -45,8 +45,8 @@ const emit = defineEmits(['update:modelValue'])
 
 // Data
 const popupProxyRef = ref(null)
-const shape = ref(props.modelValue)
-const shapeTypes = _.keys(kdkCoreUtils.Shapes)
+const shapeTypes = _.concat(['none'], _.keys(kdkCoreUtils.Shapes))
+const shape = ref(shapeTypes.includes(props.modelValue) ? props.modelValue : 'circle')
 const shapeSizes = {
   xs: 14,
   sm: 16,

package/core/client/utils/index.js

@@ -188,6 +188,7 @@ export function dotify (object) {
 const checkForHexRegExp = /^[0-9a-fA-F]{24}$/
 
 // Check if a string is a valid MongoDB Object ID
+// We don't use ObjectID.isValid as it returns true for any string that contains 12 characters: https://jira.mongodb.org/browse/NODE-4912.
 export function isObjectID (id) {
   return (id.length === 24 && checkForHexRegExp.test(id))
 }