@kalisio/kdk 2.6.4 → 2.7.0

package/coverage/lcov-report/core/api/hooks/hooks.push.js.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">19.64% </span>
+                <span class="strong">86.15% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>11/56</span>
+                <span class='fraction'>56/65</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">100% </span>
+                <span class="strong">70% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>1/1</span>
+                <span class='fraction'>14/20</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">0% </span>
+                <span class="strong">100% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>0/2</span>
+                <span class='fraction'>2/2</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">19.64% </span>
+                <span class="strong">86.15% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>11/56</span>
+                <span class='fraction'>56/65</span>
             </div>
         
             
@@ -61,7 +61,7 @@
             </div>
         </template>
     </div>
-    <div class='status-line low'></div>
+    <div class='status-line high'></div>
     <pre><table class="coverage">
 <tr><td class="line-count quiet"><a name='L1'></a><a href='#L1'>1</a>
 <a name='L2'></a><a href='#L2'>2</a>
@@ -119,7 +119,16 @@
 <a name='L54'></a><a href='#L54'>54</a>
 <a name='L55'></a><a href='#L55'>55</a>
 <a name='L56'></a><a href='#L56'>56</a>
-<a name='L57'></a><a href='#L57'>57</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
+<a name='L57'></a><a href='#L57'>57</a>
+<a name='L58'></a><a href='#L58'>58</a>
+<a name='L59'></a><a href='#L59'>59</a>
+<a name='L60'></a><a href='#L60'>60</a>
+<a name='L61'></a><a href='#L61'>61</a>
+<a name='L62'></a><a href='#L62'>62</a>
+<a name='L63'></a><a href='#L63'>63</a>
+<a name='L64'></a><a href='#L64'>64</a>
+<a name='L65'></a><a href='#L65'>65</a>
+<a name='L66'></a><a href='#L66'>66</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -128,53 +137,62 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">6x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import emails from 'email-templates'
 import path from 'path'
 import makeDebug from 'debug'
@@ -183,54 +201,63 @@ import _ from 'lodash'
 const debug = makeDebug('kdk:core:push:hooks')
 &nbsp;
 // Helper functions to be used in iff hooks
-export <span class="fstat-no" title="function not covered" >function disallowExternalPush (hook) {</span>
-<span class="cstat-no" title="statement not covered" >  return _.get(hook.app.get('push'), 'disallowExternalPush', true)</span>
-<span class="cstat-no" title="statement not covered" >}</span>
+export function disallowExternalPush (hook) {
+  return _.get(hook.app.get('push'), 'disallowExternalPush', true)
+}
 &nbsp;
-export <span class="fstat-no" title="function not covered" >async function sendNewSubscriptionEmail (hook) {</span>
-<span class="cstat-no" title="statement not covered" >  if (hook.type !== 'after') {</span>
+export async function sendNewSubscriptionEmail (hook) {
+  if (hook.type !== 'after') <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
 <span class="cstat-no" title="statement not covered" >    throw new Error('The \'sendNewSubscriptionEmail\' hook should only be used as a \'after\' hook.')</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
-<span class="cstat-no" title="statement not covered" ></span>
-<span class="cstat-no" title="statement not covered" >  // Check for a new subscription if any</span>
-<span class="cstat-no" title="statement not covered" >  const updatedUser = hook.result</span>
-<span class="cstat-no" title="statement not covered" >  const previousUser = hook.params.user</span>
-<span class="cstat-no" title="statement not covered" >  // If we can't compare abort, eg f-a-m might patch user to update tokens</span>
-<span class="cstat-no" title="statement not covered" >  if (!updatedUser || !previousUser) return hook</span>
-<span class="cstat-no" title="statement not covered" >  const newSubscription = _.differenceBy(_.get(updatedUser, 'subscriptions', []), _.get(previousUser, 'subscriptions', []), 'endpoint')</span>
-<span class="cstat-no" title="statement not covered" >  if (_.size(newSubscription) !== 1) return</span>
-<span class="cstat-no" title="statement not covered" ></span>
-<span class="cstat-no" title="statement not covered" >  // Data</span>
-<span class="cstat-no" title="statement not covered" >  const app = hook.app</span>
-<span class="cstat-no" title="statement not covered" >  const mailerService = app.getService('mailer')</span>
-<span class="cstat-no" title="statement not covered" >  const domainPath = app.get('domain') + '/#/'</span>
-<span class="cstat-no" title="statement not covered" >  const email = {</span>
-<span class="cstat-no" title="statement not covered" >    subject: 'Security alert - new browser detected',</span>
-<span class="cstat-no" title="statement not covered" >    from: mailerService.options.auth.user,</span>
-<span class="cstat-no" title="statement not covered" >    // When changing email send to the new one so that it can be verified</span>
-<span class="cstat-no" title="statement not covered" >    to: updatedUser.email,</span>
-<span class="cstat-no" title="statement not covered" >    link: domainPath,</span>
-<span class="cstat-no" title="statement not covered" >    domainPath</span>
+  const app = hook.app
+  const mailerService = app.getService('mailer')
+  if (!mailerService) <span class="branch-0 cbranch-no" title="branch not covered" >return</span>
+  // Check for a new subscription if any
+  const currentUser = hook.result
+  const previousUser = hook.params.user
+  // If we can't compare abort, eg f-a-m might patch user to update tokens
+  if (!currentUser || !previousUser) return
+  // Or an app might allow a user to patch another for eg permissions management
+  const currentUserId = (currentUser._id ? currentUser._id.toString() <span class="branch-0 cbranch-no" title="branch not covered" >: null)</span>
+  const previousUserId = (previousUser._id ? previousUser._id.toString() <span class="branch-0 cbranch-no" title="branch not covered" >: null)</span>
+  if (!currentUserId || !previousUserId || (currentUserId !== previousUserId)) return 
+  // Retrieve the last subscription
+  const lastSubscription = _.last(_.get(currentUser, 'subscriptions', []))
+  if (!lastSubscription) return
+  // Check whether the subscription has an existing fingerprint
+  const existingSubscription = _.find(_.get(previousUser, 'subscriptions', []), subscription =&gt; {
+<span class="cstat-no" title="statement not covered" >    return _.isEqual(subscription.fingerprint, lastSubscription.fingerprint)</span>
+  })
+  if (existingSubscription) <span class="branch-0 cbranch-no" title="branch not covered" >{</span>
+<span class="cstat-no" title="statement not covered" >    debug('Last subscription uses an existing fingerprint')</span>
+<span class="cstat-no" title="statement not covered" >    return</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
-<span class="cstat-no" title="statement not covered" ></span>
-<span class="cstat-no" title="statement not covered" >  // Build the subject &amp; link to the app to perform the different actions</span>
-<span class="cstat-no" title="statement not covered" >  const templateDir = path.join(mailerService.options.templateDir, 'newSubscription')</span>
-<span class="cstat-no" title="statement not covered" >  const template = new emails.EmailTemplate(templateDir)</span>
-<span class="cstat-no" title="statement not covered" >  // Errors does not seem to be correctly catched by the caller</span>
-<span class="cstat-no" title="statement not covered" >  // so we catch them here to avoid any problem</span>
-<span class="cstat-no" title="statement not covered" >  try {</span>
-<span class="cstat-no" title="statement not covered" >    const emailContent = await template.render({ email, user: updatedUser, subscription: _.first(newSubscription) }, updatedUser.locale || 'en-us')</span>
-<span class="cstat-no" title="statement not covered" >    // Update compiled content</span>
-<span class="cstat-no" title="statement not covered" >    email.html = emailContent.html</span>
-<span class="cstat-no" title="statement not covered" >    debug('Sending email ', email)</span>
-<span class="cstat-no" title="statement not covered" >    await mailerService.create(email)</span>
-<span class="cstat-no" title="statement not covered" >  } catch (error) {</span>
+  debug('Last subscription uses a new fingerprint')
+  // Send an email to notify the user
+  const domainPath = app.get('domain') + '/#/'
+  const email = {
+    subject: 'Security alert - new browser detected',
+    from: mailerService.options.from || mailerService.options.auth.user,
+    to: currentUser.email,
+    link: domainPath,
+    domainPath
+  }
+  // Build the subject &amp; link to the app to perform the different actions
+  const templateDir = path.join(mailerService.options.templateDir, 'newSubscription')
+  const template = new emails.EmailTemplate(templateDir)
+  // Errors does not seem to be correctly catched by the caller
+  // so we catch them here to avoid any problem
+  try {
+    const emailContent = await template.render({ email, user: currentUser, subscription: lastSubscription }, currentUser.locale || 'en-us')
+    // Update compiled content
+    email.html = emailContent.html
+    debug('Sending email ', email)
+    await mailerService.create(email)
+  } <span class="branch-0 cbranch-no" title="branch not covered" >catch (error) {</span>
 <span class="cstat-no" title="statement not covered" >    debug('Sending email failed', error)</span>
 <span class="cstat-no" title="statement not covered" >    app.logger.error(error)</span>
 <span class="cstat-no" title="statement not covered" >  }</span>
-<span class="cstat-no" title="statement not covered" ></span>
-<span class="cstat-no" title="statement not covered" >  return hook</span>
-<span class="cstat-no" title="statement not covered" >}</span>
+}
 &nbsp;</pre></td></tr></table></pre>
 
                 <div class='push'></div><!-- for sticky footer -->
@@ -238,7 +265,7 @@ export <span class="fstat-no" title="function not covered" >async function sendN
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at 2024-08-13T10:02:04.872Z
+                at 2026-03-10T09:15:24.774Z
             </div>
         <script src="../../../prettify.js"></script>
         <script>