@kalisio/kdk 2.6.2 → 2.6.3

package/core/api/authentication.js

@@ -30,6 +30,16 @@ export class Authentication extends AuthenticationService {
       return {}
     }
   }
+
+  // Similarly the subject will not be set by Feathers for stateless tokens that do not target existing users.
+  async getTokenOptions (authResult, params) {
+    const jwtOptions = await super.getTokenOptions(authResult, params)
+    if (!jwtOptions.subject) {
+      const subject = _.get(authResult, 'authentication.payload.sub')
+      if (subject) jwtOptions.subject = subject
+    }
+    return jwtOptions
+  }
 }
 
 export class AuthenticationProviderStrategy extends OAuthStrategy {
@@ -105,6 +115,7 @@ export class JWTAuthenticationStrategy extends JWTStrategy {
     const { identityFields } = authConfig
     const { entity } = this.configuration
     const renewJwt = _.get(this.configuration, 'renewJwt', true)
+    const { provider, ...paramsWithoutProvider } = params
 
     if (!accessToken) {
       throw new NotAuthenticated('No access token')
@@ -142,7 +153,8 @@ export class JWTAuthenticationStrategy extends JWTStrategy {
           $or: _.reduce(identityFields, (or, field) => or.concat([{ [field]: payload.sub }]), []),
           $limit: 1
         }
-        const response = await this.entityService.find({ ...params, query })
+        // Avoid sending provider to internal call as it might raises some issues with hooks relying on it otherwise
+        const response = await this.entityService.find({ ...paramsWithoutProvider, query })
         const [value = null] = response.data ? response.data : response
         // Otherwise assume a stateless token
         if (value) {

package/core/api/hooks/hooks.query.js

@@ -1,10 +1,12 @@
 import _ from 'lodash'
 import { marshallComparisonFields, marshallTime, marshallBooleanFields, marshallNumberFields, marshallDateFields } from '../marshall.js'
 import mongodb from 'mongodb'
+import errors from '@feathersjs/errors'
 import makeDebug from 'debug'
 import { makeDiacriticPattern } from '../../common/utils.js'
 
 const { ObjectID } = mongodb
+const { Forbidden } = errors
 const debug = makeDebug('kdk:core:query:hooks')
 
 export function marshallTimeQuery (hook) {
@@ -59,10 +61,17 @@ export function marshallHttpQuery (hook) {
 }
 
 export async function aggregationQuery (hook) {
+  if (hook.type !== 'before') {
+    throw new Error('The \'aggregationQuery\' hook should only be used as a \'before\' hook.')
+  }
   const query = hook.params.query
   if (!query) return
   const service = hook.service
   if (query.$aggregation) {
+    // Generic aggregation request could allow to disclose or update information in DB so that it should only be used through controlled internal calls
+    if (hook.params.provider) {
+      throw new Forbidden('You are not allowed to perform aggregation')
+    }
     const collection = service.Model
     // Set result to avoid service DB call
     hook.result = await collection.aggregate(query.$aggregation.pipeline, query.$aggregation.options).toArray()

package/core/client/capabilities.js

@@ -17,7 +17,12 @@ export const Capabilities = {
       const capabilities = await window.fetch(api.getConfig('domain') + _.get(config, 'apiPath') + '/capabilities')
       this.content = await capabilities.json()
       // Store latest capabilities data for offline mode
-      await LocalCache.setItem('capabilities', this.content)
+      // Avoid blocking on eg QuotaExceededError
+      try {
+        await LocalCache.setItem('capabilities', this.content)
+      } catch (error) {
+        logger.error(error)
+      }
     }
     logger.debug('[KDK] Capabilities initialized with content:', this.content)
     if (!this.content) return

package/core/client/components/KChip.vue

@@ -2,7 +2,7 @@
   <q-chip
     v-model="computedState"
     :selected="selected"
-    :icon="icon"
+    :icon="computedIcon"
     :iconRight="iconRight"
     :iconRemove="iconRemove"
     :iconSelected="iconSelected"
@@ -17,7 +17,7 @@
     @click="event => emit('click', event)"
     class="k-chip"
   >
-    <div v-if="computedLabel"
+    <div v-if="!hideLabel && computedLabel"
       :id="id"
       class="ellipsis"
       :class="{ 'q-pl-sm': !dense && (icon || isTruncated ) , 'q-pl-xs': dense && (icon || isTruncated) }"
@@ -46,10 +46,21 @@ const props = defineProps({
     type: [String, Number],
     default: ''
   },
+  hideLabel: {
+    type: Boolean,
+    default: false
+  },
   tooltip: {
     type: String,
     default: undefined
   },
+  tooltipBehavior: {
+    type: String,
+    default: 'truncated',
+    validator: (value) => {
+      return ['always', 'truncated', 'never'].includes(value)
+    }
+  },
   icon: {
     type: String,
     default: undefined
@@ -66,6 +77,10 @@ const props = defineProps({
     type: String,
     default: 'check'
   },
+  hideIcon: {
+    type: Boolean,
+    default: false
+  },
   modelValue: {
     type: Boolean,
     default: true
@@ -129,11 +144,17 @@ const computedState = computed({
   }
 })
 const computedLabel = computed(() => {
-  return i18n.tie(props.label)
+  if (!props.hideLabel && props.label) return i18n.tie(props.label)
+})
+const computedIcon = computed(() => {
+  if (!props.hideIcon) return props.icon
 })
 const computedTooltip = computed(() => {
-  if (props.tooltip) return i18n.tie(props.tooltip)
-  if (props.label && isTruncated.value) return computedLabel.value
+  if (props.tooltipBehavior === 'never') return
+  if (props.tooltipBehavior === 'truncated') {
+    if (!isTruncated.value) return
+  }
+  return props.label ? i18n.tie(props.label) : props.tooltip
 })
 const computedColor = computed(() => {
   return props.outline ? 'transparent' : getHtmlColor(props.color)
@@ -153,7 +174,7 @@ const computedBorderColor = computed(() => {
 function onResize () {
   // check whether the label is truncated
   const chipElement = document.getElementById(id)
-  if (chipElement) isTruncated.value = (chipElement && chipElement.offsetWidth < chipElement.scrollWidth)
+  if (chipElement) isTruncated.value = (chipElement && (chipElement.offsetWidth < chipElement.scrollWidth))
 }
 </script>
 

package/core/client/components/collection/KCard.vue

@@ -163,10 +163,10 @@ export default {
     computedSections () {
       return _.map(this.sections, (value, key) => {
         return {
-          ...value,
           item: this.item,
           actions: _.filter(this.itemActions, { scope: key }),
-          dense: this.dense
+          dense: this.dense,
+          ...value
         }
       })
     },

package/core/client/utils/utils.session.js

@@ -11,7 +11,11 @@ async function authenticate(authentication) {
   let user = Store.get('user')
   if (user) return
   // Store latest authentication data for offline mode
-  await LocalCache.setItem('authentication', authentication)
+  try {    
+    await LocalCache.setItem('authentication', authentication)
+  } catch (error) {
+    logger.error(error)
+  }
   // Anonymous user or user account ?
   user = authentication.user ? authentication.user : { name: i18n.t('composables.ANONYMOUS'), anonymous: true }
   Store.set('user', user)