feathers-ucan 0.1.40 → 0.1.42

package/lib/env/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.40";
+export declare const VERSION = "0.1.42";

package/lib/index.cjs

@@ -436,7 +436,6 @@ class CoreCall {
     return (_this$context$app2 = this.context.app) == null ? void 0 : _this$context$app2.service(this.service).find({
       ...params,
       [this.entity]: params[this.entity],
-      skip_hooks: true,
       admin_pass: true,
       ...{
         [core_path]: this.core
@@ -503,6 +502,7 @@ class CoreCall {
     return (_this$context$app7 = this.context.app) == null ? void 0 : _this$context$app7.service(this.service)._get(id, {
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -516,6 +516,7 @@ class CoreCall {
     return (_this$context$app8 = this.context.app) == null ? void 0 : _this$context$app8.service(this.service)._find({
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -529,6 +530,7 @@ class CoreCall {
     return (_this$context$app9 = this.context.app) == null ? void 0 : _this$context$app9.service(this.service)._create(data, {
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -542,6 +544,7 @@ class CoreCall {
     return (_this$context$app10 = this.context.app) == null ? void 0 : _this$context$app10.service(this.service)._patch(id, data, {
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -555,6 +558,7 @@ class CoreCall {
     return (_this$context$app11 = this.context.app) == null ? void 0 : _this$context$app11.service(this.service)._update(id, data, {
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -568,6 +572,7 @@ class CoreCall {
     return (_this$context$app12 = this.context.app) == null ? void 0 : _this$context$app12.service(this.service)._remove(id, {
       ...params,
       [this.entity]: params[this.entity],
+      skip_hooks: true,
       ...{
         [core_path]: this.core
       }
@@ -782,7 +787,13 @@ const verifyAgainstReqs = (reqs, config, options) => {
   return async context => {
     var _v3;
     const log = options == null ? void 0 : options.log;
-    const rawUcan = symbolUcan._get(context.params, config.client_ucan);
+    let rawUcan = symbolUcan._get(context.params, config.client_ucan);
+    if (!rawUcan) {
+      const authCfg = context.app.get('authentication');
+      const entityKey = (authCfg == null ? void 0 : authCfg.entity) || 'login';
+      rawUcan = symbolUcan._get(context.params, [entityKey, 'ucan']);
+    }
+    if (log) console.log('get initial ucan', rawUcan);
     let ucan = rawUcan;
     try {
       // ucanToken will stringify a UCAN object or return the compact form for strings
@@ -968,6 +979,7 @@ const checkUcan = (requiredCapabilities, options) => {
               /** function for comparing record login id with context login*/
               const checkLogin = (recordLoginPassId, loginIdPath = '_id') => {
                 const loginCheckId = symbolUcan._get(context.params, `${configuration.entity}.${loginIdPath}`);
+                if (options != null && options.log) console.log('checkLoginPass', loginCheckId, recordLoginPassId);
                 /**Make sure both are present to avoid pass on undefined*/
                 if (loginCheckId && recordLoginPassId) {
                   /** change login path result to array no matter what */
@@ -1108,7 +1120,7 @@ const ucanAuth = (requiredCapabilities, options) => {
     const loginId = typeof existingLogin === 'string' ? existingLogin : existingLogin == null ? void 0 : existingLogin._id;
     const hasLogin = !!(existingLogin && (typeof existingLogin === 'string' || !!loginId));
     // Per requirement: UCAN is always at context.params[entity].ucan
-    const existingUcan = symbolUcan._get(context.params, configuration.client_ucan || 'client_ucan');
+    const existingUcan = symbolUcan._get(context.params, configuration.client_ucan || 'client_ucan') || symbolUcan._get(context.params, [entity, 'ucan']);
     if (options != null && options.log) console.log('ucan auth', 'hasLogin', hasLogin, 'loginId', loginId, 'existingUcan', !!existingUcan, 'core_path', core_path, 'entity', entity, 'core', context.params[core_path], 'params login', context.params.login, 'required capabilities', requiredCapabilities);
     if (options != null && options.log && !hasLogin) {
       try {