solid-logic 3.1.1-dbb83f7 → 3.1.1-e3eba68

package/README.md

@@ -1,110 +1,7 @@
 # solid-logic
+Core business logic of SolidOS
 
-<img src="https://raw.githubusercontent.com/solid/community-server/main/templates/images/solid.svg" alt="[Solid logo]" height="150" align="right"/>
-
-[![MIT license](https://img.shields.io/github/license/solidos/solidos)](https://github.com/solidos/solidos/blob/main/LICENSE.md)
-
-
-Core business logic of SolidOS which can be used for any webapp as well.
-
-
-# Usage
-
-## Install via npm
-
-```sh
-npm install solid-logic
-```
-
-### Import in your project (ESM/TypeScript)
-
-```js
-import { someFunction } from 'solid-logic';
-```
-
-## Use directly in a browser
- Both UMD and ESM bundles take rdflib as external, this means you need to install it yourself, separately. 
-
-## Files
-- For browser UMD, without rdflib: `dist/solid-logic.js` (global `window.SolidLogic`)
-- For browser ESM, without rdflib: `dist/solid-logic.esm.external.js` (import as module)
-- UMD have also chunked files.
-- both version also containe minified versions.
-
-
-### UMD bundle (global variable)
-
-```html
-<!-- Load dependencies first -->
-<script src="https://unpkg.com/rdflib/dist/rdflib.min.js"></script>
-<!-- or -->
-<!-- script src="https://cdn.jsdelivr.net/npm/rdflib/dist/rdflib.min.js"></script -->
-<!-- Load solid-logic UMD bundle -->
-<script src="https://unpkg.com/solid-logic/dist/solid-logic.min.js"></script>
-<!-- or -->
-<!-- script src="https://cdn.jsdelivr.net/npm/solid-logic/dist/solid-logic.min.js"></script -->
-<!-- or -->
-<!-- script src="dist/solid-logic.js"></script -->
-<script>
-	// Access via global variable
-	const rdflib = window.$rdf;
-	const logic = window.SolidLogic;
-	// Example usage
-	// logic.someFunction(...)
-</script>
-```
-
-
-### ESM bundle (import as module)
-
-```html
-<script type="module">
-	import * as $rdf from 'https://esm.sh/rdflib'
-	import { someFunction } from 'https://esm.sh/solid-logic'
-
-	// Example usage
-	// someFunction(...)
-</script>
-```
-
-or 
-
-### ESM bundle with import map (bare specifiers)
-
-```html
-<script type="importmap">
-{
-	"imports": {
-		"rdflib": "https://esm.sh/rdflib",
-		"solid-logic": "https://esm.sh/solid-logic"
-	}
-}
-</script>
-<script type="module">
-    import * as $rdf from 'rdflib'
-	import { someFunction } from 'solid-logic'
-
-	// Example usage
-	// someFunction(...)
-</script>
-```
-
-# How to develop
-
-Check the scripts in the `package.json` for build, watch, lint and test.
-
-# Used stack
-
-* TypeScript + Babel
-* Jest
-* ESLint
-* Webpack
-
-# How to release
-
-Change version and push directly to main. This will trigger the npm release latest script in CI.
-
-# History
+# Adendum
 
 Solid-logic was a move to separate business logic from UI functionality so that people using different UI frameworks could use logic code. 
 

package/eslint.config.js

@@ -0,0 +1,29 @@
+const {
+    defineConfig,
+} = require("eslint/config");
+
+const tsParser = require("@typescript-eslint/parser");
+const typescriptEslint = require("@typescript-eslint/eslint-plugin");
+const js = require("@eslint/js");
+
+const {
+    FlatCompat,
+} = require("@eslint/eslintrc");
+
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+module.exports = defineConfig([{
+    languageOptions: {
+        parser: tsParser,
+    },
+
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+    },
+
+    extends: compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"),
+}]);

package/jest.config.js

@@ -0,0 +1,10 @@
+module.exports = {
+  verbose: true,
+  testEnvironment: 'jsdom',
+  testEnvironmentOptions: {
+      customExportConditions: ['node']
+  },
+  setupFilesAfterEnv: [
+    './test/helpers/setup.ts'
+  ]
+}

package/lib/acl/aclLogic.d.ts

@@ -0,0 +1,5 @@
+import { NamedNode } from "rdflib";
+import { AclLogic } from "../types";
+export declare const ACL_LINK: NamedNode;
+export declare function createAclLogic(store: any): AclLogic;
+//# sourceMappingURL=aclLogic.d.ts.map

package/{dist → lib}/acl/aclLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aclLogic.d.ts","sourceRoot":"","sources":["../../src/acl/aclLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAA6B,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAInC,eAAO,MAAM,QAAQ,WAEpB,CAAA;AAED,wBAAgB,cAAc,CAAC,KAAK,KAAA,GAAG,QAAQ,CAkJ9C"}
+{"version":3,"file":"aclLogic.d.ts","sourceRoot":"","sources":["../../src/acl/aclLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,SAAS,EAA6B,MAAM,QAAQ,CAAA;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIpC,eAAO,MAAM,QAAQ,WAEpB,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,KAAA,GAAG,QAAQ,CAkJ9C"}

package/lib/acl/aclLogic.js

@@ -0,0 +1,168 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ACL_LINK = void 0;
+exports.createAclLogic = createAclLogic;
+var rdflib_1 = require("rdflib");
+var ns_1 = require("../util/ns");
+exports.ACL_LINK = (0, rdflib_1.sym)("http://www.iana.org/assignments/link-relations/acl");
+function createAclLogic(store) {
+    var ns = ns_1.ns;
+    function findAclDocUrl(url) {
+        return __awaiter(this, void 0, void 0, function () {
+            var docNode;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, store.fetcher.load(url)];
+                    case 1:
+                        _a.sent();
+                        docNode = store.any(url, exports.ACL_LINK);
+                        if (!docNode) {
+                            throw new Error("No ACL link discovered for ".concat(url));
+                        }
+                        return [2 /*return*/, docNode.value];
+                }
+            });
+        });
+    }
+    /**
+     * Simple Access Control
+     *
+     * This function sets up a simple default ACL for a resource, with
+     * RWC for the owner, and a specified access (default none) for the public.
+     * In all cases owner has read write control.
+     * Parameter lists modes allowed to public
+     *
+     * @param options
+     * @param options.public eg ['Read', 'Write']
+     *
+     * @returns Resolves with aclDoc uri on successful write
+     */
+    function setACLUserPublic(docURI, me, options) {
+        var aclDoc = store.any(store.sym(docURI), exports.ACL_LINK);
+        return Promise.resolve()
+            .then(function () {
+            if (aclDoc) {
+                return aclDoc;
+            }
+            return fetchACLRel(docURI).catch(function (err) {
+                throw new Error("Error fetching rel=ACL header for ".concat(docURI, ": ").concat(err));
+            });
+        })
+            .then(function (aclDoc) {
+            var aclText = genACLText(docURI, me, aclDoc.uri, options);
+            if (!store.fetcher) {
+                throw new Error('Cannot PUT this, store has no fetcher');
+            }
+            return store.fetcher
+                .webOperation('PUT', aclDoc.uri, {
+                data: aclText,
+                contentType: 'text/turtle'
+            })
+                .then(function (result) {
+                if (!result.ok) {
+                    throw new Error('Error writing ACL text: ' + result.error);
+                }
+                return aclDoc;
+            });
+        });
+    }
+    /**
+     * @param docURI
+     * @returns
+     */
+    function fetchACLRel(docURI) {
+        var fetcher = store.fetcher;
+        if (!fetcher) {
+            throw new Error('Cannot fetch ACL rel, store has no fetcher');
+        }
+        return fetcher.load(docURI).then(function (result) {
+            if (!result.ok) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                throw new Error('fetchACLRel: While loading:' + result.error);
+            }
+            var aclDoc = store.any(store.sym(docURI), exports.ACL_LINK);
+            if (!aclDoc) {
+                throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI);
+            }
+            return aclDoc;
+        });
+    }
+    /**
+     * @param docURI
+     * @param me
+     * @param aclURI
+     * @param options
+     *
+     * @returns Serialized ACL
+     */
+    function genACLText(docURI, me, aclURI, options) {
+        if (options === void 0) { options = {}; }
+        var optPublic = options.public || [];
+        var g = (0, rdflib_1.graph)();
+        var auth = (0, rdflib_1.Namespace)('http://www.w3.org/ns/auth/acl#');
+        var a = g.sym("".concat(aclURI, "#a1"));
+        var acl = g.sym(aclURI);
+        var doc = g.sym(docURI);
+        g.add(a, ns.rdf('type'), auth('Authorization'), acl);
+        g.add(a, auth('accessTo'), doc, acl);
+        if (options.defaultForNew) {
+            g.add(a, auth('default'), doc, acl);
+        }
+        g.add(a, auth('agent'), me, acl);
+        g.add(a, auth('mode'), auth('Read'), acl);
+        g.add(a, auth('mode'), auth('Write'), acl);
+        g.add(a, auth('mode'), auth('Control'), acl);
+        if (optPublic.length) {
+            a = g.sym("".concat(aclURI, "#a2"));
+            g.add(a, ns.rdf('type'), auth('Authorization'), acl);
+            g.add(a, auth('accessTo'), doc, acl);
+            g.add(a, auth('agentClass'), ns.foaf('Agent'), acl);
+            for (var p = 0; p < optPublic.length; p++) {
+                g.add(a, auth('mode'), auth(optPublic[p]), acl); // Like 'Read' etc
+            }
+        }
+        return (0, rdflib_1.serialize)(acl, g, aclURI);
+    }
+    return {
+        findAclDocUrl: findAclDocUrl,
+        setACLUserPublic: setACLUserPublic,
+        genACLText: genACLText
+    };
+}
+//# sourceMappingURL=aclLogic.js.map

package/lib/acl/aclLogic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"aclLogic.js","sourceRoot":"","sources":["../../src/acl/aclLogic.ts"],"names":[],"mappings":"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"}

package/{dist → lib}/authSession/authSession.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authSession = void 0;
-const solid_client_authn_browser_1 = require("@inrupt/solid-client-authn-browser");
+var solid_client_authn_browser_1 = require("@inrupt/solid-client-authn-browser");
 exports.authSession = new solid_client_authn_browser_1.Session();
 //# sourceMappingURL=authSession.js.map

package/{dist → lib}/authSession/authSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"authSession.js","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":";;;AAAA,mFAE2C;AAE9B,QAAA,WAAW,GAAG,IAAI,oCAAO,EAAE,CAAA"}
+{"version":3,"file":"authSession.js","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":";;;AAAA,iFAE2C;AAE9B,QAAA,WAAW,GAAG,IAAI,oCAAO,EAAE,CAAA"}

package/{dist → lib}/authn/SolidAuthnLogic.d.ts

@@ -1,6 +1,6 @@
-import { NamedNode } from 'rdflib';
-import { Session } from '@inrupt/solid-client-authn-browser';
-import { AuthenticationContext, AuthnLogic } from '../types';
+import { NamedNode } from "rdflib";
+import { Session } from "@inrupt/solid-client-authn-browser";
+import { AuthenticationContext, AuthnLogic } from "../types";
 export declare class SolidAuthnLogic implements AuthnLogic {
     private session;
     constructor(solidAuthSession: Session);

package/{dist → lib}/authn/SolidAuthnLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidAuthnLogic.d.ts","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAO,MAAM,QAAQ,CAAA;AAGlD,OAAO,EAAU,OAAO,EAAE,MAAM,oCAAoC,CAAA;AACpE,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAA;AAE5D,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,OAAO,CAAS;gBAEZ,gBAAgB,EAAE,OAAO;IAKrC,IAAI,WAAW,IAAG,OAAO,CAAwB;IAEjD,WAAW,IAAI,SAAS,GAAG,IAAI;IAW/B;;;;;;OAMG;IACG,SAAS,CAAC,CAAC,EACf,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,KAAK,CAAC,GAC5C,OAAO,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC;IA2DhC;;;;;;OAMG;IACH,QAAQ,CACN,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,EAChC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,SAAS,GAAG,IAAI;IAanB;;OAEG;IACH,gBAAgB,CAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,GAAG,IAAI;CAKpF"}
+{"version":3,"file":"SolidAuthnLogic.d.ts","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAO,MAAM,QAAQ,CAAC;AAGnD,OAAO,EAAU,OAAO,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE7D,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,OAAO,CAAU;gBAEb,gBAAgB,EAAE,OAAO;IAKrC,IAAI,WAAW,IAAG,OAAO,CAAwB;IAEjD,WAAW,IAAI,SAAS,GAAG,IAAI;IAW/B;;;;;;OAMG;IACG,SAAS,CAAC,CAAC,EACf,eAAe,CAAC,EAAE,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI,KAAK,CAAC,GAC5C,OAAO,CAAC,SAAS,GAAG,CAAC,GAAG,IAAI,CAAC;IA2DhC;;;;;;OAMG;IACH,QAAQ,CACN,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,IAAI,EAChC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,SAAS,GAAG,IAAI;IAanB;;OAEG;IACH,gBAAgB,CAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,GAAG,IAAI;CAKpF"}

package/lib/authn/SolidAuthnLogic.js

@@ -0,0 +1,193 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SolidAuthnLogic = void 0;
+var rdflib_1 = require("rdflib");
+var authUtil_1 = require("./authUtil");
+var debug = __importStar(require("../util/debug"));
+var solid_client_authn_browser_1 = require("@inrupt/solid-client-authn-browser");
+var SolidAuthnLogic = /** @class */ (function () {
+    function SolidAuthnLogic(solidAuthSession) {
+        this.session = solidAuthSession;
+    }
+    Object.defineProperty(SolidAuthnLogic.prototype, "authSession", {
+        // we created authSession getter because we want to access it as authn.authSession externally
+        get: function () { return this.session; },
+        enumerable: false,
+        configurable: true
+    });
+    SolidAuthnLogic.prototype.currentUser = function () {
+        var app = (0, authUtil_1.appContext)();
+        if (app.viewingNoAuthPage) {
+            return (0, rdflib_1.sym)(app.webId);
+        }
+        if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
+            return (0, rdflib_1.sym)(this.session.info.webId);
+        }
+        return (0, authUtil_1.offlineTestID)(); // null unless testing
+    };
+    /**
+     * Retrieves currently logged in webId from either
+     * defaultTestUser or SolidAuth
+     * Also activates a session after login
+     * @param [setUserCallback] Optional callback
+     * @returns Resolves with webId uri, if no callback provided
+     */
+    SolidAuthnLogic.prototype.checkUser = function (setUserCallback) {
+        return __awaiter(this, void 0, void 0, function () {
+            var preLoginRedirectHash, redirectUrl, postLoginRedirectHash, curUrl, me, webId;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        preLoginRedirectHash = new URL(window.location.href).hash;
+                        if (preLoginRedirectHash) {
+                            window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
+                        }
+                        this.session.events.on(solid_client_authn_browser_1.EVENTS.SESSION_RESTORED, function (url) {
+                            debug.log("Session restored to ".concat(url));
+                            if (document.location.toString() !== url)
+                                history.replaceState(null, '', url);
+                        });
+                        redirectUrl = new URL(window.location.href);
+                        redirectUrl.hash = '';
+                        return [4 /*yield*/, this.session
+                                .handleIncomingRedirect({
+                                restorePreviousSession: true,
+                                url: redirectUrl.href
+                            })
+                            // Check to see if a hash was stored in local storage
+                        ];
+                    case 1:
+                        _a.sent();
+                        postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
+                        if (postLoginRedirectHash) {
+                            curUrl = new URL(window.location.href);
+                            if (curUrl.hash !== postLoginRedirectHash) {
+                                if (history.pushState) {
+                                    // debug.log('Setting window.location.has using pushState')
+                                    history.pushState(null, document.title, postLoginRedirectHash);
+                                }
+                                else {
+                                    // debug.warn('Setting window.location.has using location.hash')
+                                    location.hash = postLoginRedirectHash;
+                                }
+                                curUrl.hash = postLoginRedirectHash;
+                            }
+                            // See https://stackoverflow.com/questions/3870057/how-can-i-update-window-location-hash-without-jumping-the-document
+                            // window.location.href = curUrl.toString()// @@ See https://developer.mozilla.org/en-US/docs/Web/API/Window/location
+                            window.localStorage.setItem('preLoginRedirectHash', '');
+                        }
+                        me = (0, authUtil_1.offlineTestID)();
+                        if (me) {
+                            return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
+                        }
+                        webId = this.webIdFromSession(this.session.info);
+                        if (webId) {
+                            me = this.saveUser(webId);
+                        }
+                        if (me) {
+                            debug.log("(Logged in as ".concat(me, " by authentication)"));
+                        }
+                        return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
+                }
+            });
+        });
+    };
+    /**
+     * Saves `webId` in `context.me`
+     * @param webId
+     * @param context
+     *
+     * @returns Returns the WebID, after setting it
+     */
+    SolidAuthnLogic.prototype.saveUser = function (webId, context) {
+        var webIdUri;
+        if (webId) {
+            webIdUri = (typeof webId === 'string') ? webId : webId.uri;
+            var me = (0, rdflib_1.namedNode)(webIdUri);
+            if (context) {
+                context.me = me;
+            }
+            return me;
+        }
+        return null;
+    };
+    /**
+     * @returns {Promise<string|null>} Resolves with WebID URI or null
+     */
+    SolidAuthnLogic.prototype.webIdFromSession = function (session) {
+        var webId = (session === null || session === void 0 ? void 0 : session.webId) && session.isLoggedIn ? session.webId : null;
+        return webId;
+    };
+    return SolidAuthnLogic;
+}());
+exports.SolidAuthnLogic = SolidAuthnLogic;
+//# sourceMappingURL=SolidAuthnLogic.js.map

package/lib/authn/SolidAuthnLogic.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SolidAuthnLogic.js","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAmD;AACnD,uCAAuD;AACvD,mDAAsC;AACtC,iFAAqE;AAGrE;IAGE,yBAAY,gBAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC;IAClC,CAAC;IAGD,sBAAI,wCAAW;QADf,6FAA6F;aAC7F,cAA4B,OAAO,IAAI,CAAC,OAAO,CAAA,CAAC,CAAC;;;OAAA;IAEjD,qCAAW,GAAX;QACE,IAAM,GAAG,GAAG,IAAA,qBAAU,GAAE,CAAA;QACxB,IAAI,GAAG,CAAC,iBAAiB,EAAE,CAAC;YAC1B,OAAO,IAAA,YAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;QACD,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACzG,OAAO,IAAA,YAAG,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACrC,CAAC;QACD,OAAO,IAAA,wBAAa,GAAE,CAAA,CAAC,sBAAsB;IAC/C,CAAC;IAED;;;;;;OAMG;IACG,mCAAS,GAAf,UACE,eAA6C;;;;;;wBAGvC,oBAAoB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAA;wBAC/D,IAAI,oBAAoB,EAAE,CAAC;4BACzB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAA;wBAC3E,CAAC;wBACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,mCAAM,CAAC,gBAAgB,EAAE,UAAC,GAAG;4BAClD,KAAK,CAAC,GAAG,CAAC,8BAAuB,GAAG,CAAE,CAAC,CAAA;4BACvC,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAG;gCAAE,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAA;wBAC/E,CAAC,CAAC,CAAA;wBAKI,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;wBACjD,WAAW,CAAC,IAAI,GAAG,EAAE,CAAA;wBACrB,qBAAM,IAAI,CAAC,OAAO;iCACf,sBAAsB,CAAC;gCACtB,sBAAsB,EAAE,IAAI;gCAC5B,GAAG,EAAE,WAAW,CAAC,IAAI;6BACtB,CAAC;4BAEJ,qDAAqD;0BAFjD;;wBAJJ,SAII,CAAA;wBAGE,qBAAqB,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAA;wBACjF,IAAI,qBAAqB,EAAE,CAAC;4BACpB,MAAM,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;4BAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;gCAC1C,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oCACtB,2DAA2D;oCAC3D,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC,CAAA;gCAChE,CAAC;qCAAM,CAAC;oCACN,gEAAgE;oCAChE,QAAQ,CAAC,IAAI,GAAG,qBAAqB,CAAA;gCACvC,CAAC;gCACD,MAAM,CAAC,IAAI,GAAG,qBAAqB,CAAA;4BACrC,CAAC;4BACD,qHAAqH;4BACrH,qHAAqH;4BACrH,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;wBACzD,CAAC;wBAGG,EAAE,GAAG,IAAA,wBAAa,GAAE,CAAA;wBACxB,IAAI,EAAE,EAAE,CAAC;4BACP,sBAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAA;wBACpE,CAAC;wBAEK,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;wBACtD,IAAI,KAAK,EAAE,CAAC;4BACV,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;wBAC3B,CAAC;wBAED,IAAI,EAAE,EAAE,CAAC;4BACP,KAAK,CAAC,GAAG,CAAC,wBAAiB,EAAE,wBAAqB,CAAC,CAAA;wBACrD,CAAC;wBAED,sBAAO,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAA;;;;KACnE;IAED;;;;;;OAMG;IACH,kCAAQ,GAAR,UACE,KAAgC,EAChC,OAA+B;QAE/B,IAAI,QAAgB,CAAA;QACpB,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAA;YAC1D,IAAM,EAAE,GAAG,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAA;YAC9B,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,EAAE,GAAG,EAAE,CAAA;YACjB,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;OAEG;IACH,0CAAgB,GAAhB,UAAkB,OAAiD;QACjE,IAAM,KAAK,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,KAAI,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;QACzE,OAAO,KAAK,CAAA;IACd,CAAC;IAEH,sBAAC;AAAD,CAAC,AAxHD,IAwHC;AAxHY,0CAAe"}

package/{dist → lib}/authn/authUtil.d.ts

@@ -1,4 +1,4 @@
-import { NamedNode } from 'rdflib';
+import { NamedNode } from "rdflib";
 /**
  * find a user or app's context as set in window.SolidAppContext
  * this is a const, not a function, because we have problems to jest mock it otherwise

package/{dist → lib}/authn/authUtil.js

@@ -35,8 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appContext = void 0;
 exports.offlineTestID = offlineTestID;
-const rdflib_1 = require("rdflib");
-const debug = __importStar(require("../util/debug"));
+var rdflib_1 = require("rdflib");
+var debug = __importStar(require("../util/debug"));
 /**
  * find a user or app's context as set in window.SolidAppContext
  * this is a const, not a function, because we have problems to jest mock it otherwise
@@ -44,22 +44,22 @@ const debug = __importStar(require("../util/debug"));
  * @return {any} - an appContext object
  */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const appContext = () => {
+var appContext = function () {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let { SolidAppContext } = window;
-    SolidAppContext ||= {};
+    var SolidAppContext = window.SolidAppContext;
+    SolidAppContext || (SolidAppContext = {});
     SolidAppContext.viewingNoAuthPage = false;
     if (SolidAppContext.noAuth && window.document) {
-        const currentPage = window.document.location.href;
+        var currentPage = window.document.location.href;
         if (currentPage.startsWith(SolidAppContext.noAuth)) {
             SolidAppContext.viewingNoAuthPage = true;
-            const params = new URLSearchParams(window.document.location.search);
+            var params = new URLSearchParams(window.document.location.search);
             if (params) {
-                let viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
+                var viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
                 if (viewedPage) {
                     viewedPage = decodeURI(viewedPage);
                     if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
-                        const ary = viewedPage.split(/\//);
+                        var ary = viewedPage.split(/\//);
                         SolidAppContext.idp = ary[0] + '//' + ary[2];
                         SolidAppContext.viewingNoAuthPage = false;
                     }
@@ -79,7 +79,7 @@ exports.appContext = appContext;
  */
 function offlineTestID() {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any 
-    const { $SolidTestEnvironment } = window;
+    var $SolidTestEnvironment = window.$SolidTestEnvironment;
     if (typeof $SolidTestEnvironment !== 'undefined' &&
         $SolidTestEnvironment.username) {
         // Test setup
@@ -91,10 +91,10 @@ function offlineTestID() {
     if (typeof document !== 'undefined' &&
         document.location &&
         ('' + document.location).slice(0, 16) === 'http://localhost') {
-        const div = document.getElementById('appTarget');
+        var div = document.getElementById('appTarget');
         if (!div)
             return null;
-        const id = div.getAttribute('testID');
+        var id = div.getAttribute('testID');
         if (!id)
             return null;
         debug.log('Assuming user is ' + id);

package/lib/authn/authUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authUtil.js","sourceRoot":"","sources":["../../src/authn/authUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA2CA,sCA0BC;AArED,iCAAuC;AACvC,mDAAsC;AAEtC;;;;;GAKG;AACH,8DAA8D;AACvD,IAAM,UAAU,GAAG;IACtB,8DAA8D;IACxD,IAAA,eAAe,GAAU,MAAM,gBAAhB,CAAgB;IACrC,eAAe,KAAf,eAAe,GAAK,EAAE,EAAA;IACtB,eAAe,CAAC,iBAAiB,GAAG,KAAK,CAAA;IACzC,IAAI,eAAe,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC5C,IAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAA;QACjD,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;YACrD,eAAe,CAAC,iBAAiB,GAAG,IAAI,CAAA;YACxC,IAAM,MAAM,GAAG,IAAI,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;YACnE,IAAI,MAAM,EAAE,CAAC;gBACT,IAAI,UAAU,GAAG,eAAe,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAA;gBACvE,IAAI,UAAU,EAAE,CAAC;oBACjB,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;oBAClC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;wBACjD,IAAM,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;wBAClC,eAAe,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;wBAC5C,eAAe,CAAC,iBAAiB,GAAG,KAAK,CAAA;oBAC7C,CAAC;gBACD,CAAC;YACL,CAAC;QACD,CAAC;IACL,CAAC;IACD,OAAO,eAAe,CAAA;AAC1B,CAAC,CAAA;AAxBY,QAAA,UAAU,cAwBtB;AAED;;;;;;GAMG;AACH,SAAgB,aAAa;IACzB,+DAA+D;IACvD,IAAA,qBAAqB,GAAU,MAAM,sBAAhB,CAAgB;IAC7C,IACE,OAAO,qBAAqB,KAAK,WAAW;QAC5C,qBAAqB,CAAC,QAAQ,EAC9B,CAAC;QACD,aAAa;QACb,KAAK,CAAC,GAAG,CAAC,uBAAuB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAA,YAAG,EAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;IAC5C,CAAC;IACD,oFAAoF;IACpF,8HAA8H;IAC9H,IACE,OAAO,QAAQ,KAAK,WAAW;QAC/B,QAAQ,CAAC,QAAQ;QACjB,CAAC,EAAE,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,kBAAkB,EAC5D,CAAC;QACD,IAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAChD,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,IAAM,EAAE,GAAG,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAA;QACpB,KAAK,CAAC,GAAG,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAA;QACnC,OAAO,IAAA,YAAG,EAAC,EAAE,CAAC,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC"}