@semapps/auth 0.9.0 → 0.9.2

package/mixins/auth.js

@@ -162,8 +162,10 @@ const AuthMixin = {
         const baseUrlTrailing = urlJoin(this.settings.baseUrl, '/');
         webId = webId || baseUrlTrailing + username;
 
+        const podUrl = await ctx.call('pod.getUrl', { webId });
+
         // Check if capabilityUri is within the resource owner's pod
-        if (!webId?.startsWith(baseUrlTrailing) || !capabilityUri?.startsWith(urlJoin(webId, 'data'))) {
+        if (!webId?.startsWith(baseUrlTrailing) || !capabilityUri?.startsWith(podUrl)) {
           return undefined;
         }
 

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@semapps/auth",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Authentification module for SemApps",
   "license": "Apache-2.0",
   "author": "Virtual Assembly",
   "dependencies": {
-    "@semapps/ldp": "0.9.0",
-    "@semapps/middlewares": "0.9.0",
-    "@semapps/mime-types": "0.9.0",
-    "@semapps/triplestore": "0.9.0",
+    "@semapps/ldp": "0.9.2",
+    "@semapps/middlewares": "0.9.2",
+    "@semapps/mime-types": "0.9.2",
+    "@semapps/triplestore": "0.9.2",
     "bcrypt": "^5.0.1",
     "express-session": "^1.17.0",
     "jsonwebtoken": "^8.5.1",
@@ -29,5 +29,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "c37090ef1e0394e3e7be95df90f07605d55afc7b"
+  "gitHead": "99b2776a49037c7a46de93f33d98ea7230c495ac"
 }

package/services/account.js

@@ -149,8 +149,7 @@ module.exports = {
     async findDatasetByWebId(ctx) {
       const webId = ctx.params.webId || ctx.meta.webId;
       const account = await ctx.call('auth.account.findByWebId', { webId });
-      // If no podUri exist, it means we are not in Pod config
-      return account?.podUri ? getSlugFromUri(webId) : undefined;
+      return account?.username;
     },
     async findSettingsByWebId(ctx) {
       const webId = ctx.params.webId || ctx.meta.webId;
@@ -214,7 +213,6 @@ module.exports = {
         // ...except for
         webId: account.webId,
         username: account.username,
-        podUri: account.podUri,
         // And add a deletedAt date.
         deletedAt: new Date().toISOString()
       });

package/services/auth.local.js

@@ -46,7 +46,7 @@ const AuthLocalService = {
   },
   actions: {
     async signup(ctx) {
-      const { username, email, password, interactionId, ...rest } = ctx.params;
+      const { username, email, password, ...rest } = ctx.params;
       // This is going to get in our way otherwise when waiting for completions.
       ctx.meta.skipObjectsWatcher = true;
 
@@ -72,7 +72,7 @@ const AuthLocalService = {
         // Link the webId with the account
         accountData = await ctx.call('auth.account.attachWebId', { accountUri: accountData['@id'], webId });
 
-        ctx.emit('auth.registered', { webId, profileData, accountData, interactionId });
+        ctx.emit('auth.registered', { webId, profileData, accountData });
 
         const token = await ctx.call('auth.jwt.generateToken', { payload: { webId } });
 
@@ -84,15 +84,11 @@ const AuthLocalService = {
       }
     },
     async login(ctx) {
-      const { username, password, interactionId } = ctx.params;
+      const { username, password } = ctx.params;
 
       const accountData = await ctx.call('auth.account.verify', { username, password });
 
-      ctx.emit(
-        'auth.connected',
-        { webId: accountData.webId, accountData, interactionId },
-        { meta: { webId: null, dataset: null } }
-      );
+      ctx.emit('auth.connected', { webId: accountData.webId, accountData }, { meta: { webId: null, dataset: null } });
 
       const token = await ctx.call('auth.jwt.generateToken', { payload: { webId: accountData.webId } });