@muze-nl/jsfs-solid 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@muze-nl/jsfs-solid",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "author": "auke@muze.nl",
   "source": "src/SolidAdapter.js",
   "main": "src/SolidClient.js",

package/package.json~

@@ -1,6 +1,6 @@
 {
   "name": "@muze-nl/jsfs-solid",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "author": "auke@muze.nl",
   "source": "src/SolidAdapter.js",
   "main": "src/SolidClient.js",

package/src/SolidClient.js

@@ -30,7 +30,8 @@ export default async function solidClient(webid, solidOptions) {
     		options.prefixes[prefix] = defaults.prefixes[prefix]
     	}
     }
-	const profile = await metro.client().with(oldmmw(options), metro.mw.getdata()).get(webid)?.primary
+	const response = await metro.client(oldmmw(options), metro.mw.getdata()).get(webid)
+	const profile = response?.primary
 	if (!profile || !profile.solid$oidcIssuer) { //FIXME: don't assume $ as the separator
 		throw new Error('solidClient: '+webid+' did not return valid solid profile')
 	}
@@ -38,19 +39,20 @@ export default async function solidClient(webid, solidOptions) {
 	const storage = oldm.many(profile.space$storage)
 		.map(s => new jsfs.fs(new SolidAdapter(s, '/', options)))
 
-	return metro.api(
-		metro.client(metro.oidc.oidcmw(options), oldmmw(options)),
-		{
-			profile,
-			issuer: profile.solid$oidcIssuer,
-			inbox: profile.ldp$inbox,
-			id: function() {
-				return metro.oidc.idToken(this.issuer)
-			},
-			logout: async function() {
-				throw new Error('not yet implemented')
-			},
-			...storage
-		}
-	)
+	const client = metro.client(metro.oidc.oidcmw(options), oldmmw(options))
+	Object.assign(client, {
+		profile,
+		issuer: profile.solid$oidcIssuer,
+		inbox: profile.ldp$inbox,
+		id: function() {
+			return metro.oidc.idToken(this.issuer)
+		},
+		logout: async function() {
+			throw new Error('not yet implemented')
+		},
+		...storage
+	})
+	client.id.bind(client)
+	client.logout.bind(client)
+	return client
 }