solid-logic 1.3.13 → 1.3.14-2dd035d2

package/.github/workflows/ci.yml

@@ -5,9 +5,12 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - "**"
   pull_request:
-    branches: [ main ]
+    branches:
+      - "**"  
+  workflow_dispatch:
 
 jobs:
   build:
@@ -16,8 +19,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 10.x, 12.x, 14.x, 15.x ]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
+        node-version: 
+          - 12.x
+          - 14.x
+          - 16.x
 
     steps:
       - uses: actions/checkout@v2
@@ -26,6 +31,35 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci
-      - run: npm run lint
+      - run: npm run lint --if-present
       - run: npm test
       - run: npm run build --if-present
+      - name: Save build
+        if: matrix.node-version == '14.x'
+        uses: actions/upload-artifact@v2
+        with:
+          name: build
+          path: |
+            .
+            !node_modules
+          retention-days: 1
+    
+  npm-publish-build:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: build
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - uses: rlespinasse/github-slug-action@v3.x
+      - name: Append commit hash to package version
+        run: 'sed -i -E "s/(\"version\": *\"[^\"]+)/\1-${GITHUB_SHA_SHORT}/" package.json'
+      - name: Disable pre- and post-publish actions
+        run: 'sed -i -E "s/\"((pre|post)publish)/\"ignore:\1/" package.json'
+      - uses: JS-DevTools/npm-publish@v1
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          tag: ${{ env.GITHUB_REF_SLUG }}

package/jest.config.js

@@ -1,4 +1,7 @@
 module.exports = {
   verbose: true,
-  setupFilesAfterEnv: ["./jest.setup.ts"],
+  testEnvironment: 'node',
+  setupFilesAfterEnv: [
+    './test/helpers/setup.ts'
+  ]
 }

package/lib/acl/aclLogic.d.ts

@@ -0,0 +1,32 @@
+/**
+ * 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
+ */
+import { NamedNode } from "rdflib";
+export declare const ns: any;
+export declare function setACLUserPublic(docURI: string, me: NamedNode, options: {
+    defaultForNew?: boolean;
+    public?: [];
+}): Promise<NamedNode>;
+/**
+ * @param docURI
+ * @param me
+ * @param aclURI
+ * @param options
+ *
+ * @returns Serialized ACL
+ */
+export declare function genACLText(docURI: string, me: NamedNode, aclURI: string, options?: {
+    defaultForNew?: boolean;
+    public?: [];
+}): string | undefined;
+//# sourceMappingURL=aclLogic.d.ts.map

package/lib/acl/aclLogic.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"aclLogic.d.ts","sourceRoot":"","sources":["../../src/acl/aclLogic.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAS,SAAS,EAAwB,MAAM,QAAQ,CAAA;AAM/D,eAAO,MAAM,EAAE,KAAuB,CAAA;AAEtC,wBAAgB,gBAAgB,CAChC,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,SAAS,EACb,OAAO,EAAE;IACL,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,EAAE,CAAA;CACd,GACE,OAAO,CAAC,SAAS,CAAC,CAkCpB;AA8BD;;;;;;;GAOG;AACH,wBAAgB,UAAU,CAC1B,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,SAAS,EACb,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACL,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,MAAM,CAAC,EAAE,EAAE,CAAA;CACT,GACH,MAAM,GAAG,SAAS,CA2BpB"}

package/lib/acl/aclLogic.js

@@ -0,0 +1,136 @@
+"use strict";
+/**
+ * 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
+ */
+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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genACLText = exports.setACLUserPublic = exports.ns = void 0;
+var rdflib_1 = require("rdflib");
+var solid_namespace_1 = __importDefault(require("solid-namespace"));
+var $rdf = __importStar(require("rdflib"));
+var solidLogicSingleton_1 = require("../logic/solidLogicSingleton");
+var UtilityLogic_1 = require("../util/UtilityLogic");
+exports.ns = (0, solid_namespace_1.default)($rdf);
+function setACLUserPublic(docURI, me, options) {
+    var aclDoc = solidLogicSingleton_1.solidLogicSingleton.store.any(solidLogicSingleton_1.solidLogicSingleton.store.sym(docURI), UtilityLogic_1.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 (!solidLogicSingleton_1.solidLogicSingleton.store.fetcher) {
+            throw new Error('Cannot PUT this, store has no fetcher');
+        }
+        return solidLogicSingleton_1.solidLogicSingleton.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;
+        });
+    });
+}
+exports.setACLUserPublic = setACLUserPublic;
+/**
+ * @param docURI
+ * @returns
+ */
+function fetchACLRel(docURI) {
+    var fetcher = solidLogicSingleton_1.solidLogicSingleton.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) {
+            throw new Error('fetchACLRel: While loading:' + result.error);
+        }
+        var aclDoc = solidLogicSingleton_1.solidLogicSingleton.store.any(solidLogicSingleton_1.solidLogicSingleton.store.sym(docURI), UtilityLogic_1.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, exports.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, exports.ns.rdf('type'), auth('Authorization'), acl);
+        g.add(a, auth('accessTo'), doc, acl);
+        g.add(a, auth('agentClass'), exports.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);
+}
+exports.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/lib/authSession/authSession.d.ts

@@ -0,0 +1,3 @@
+import { Session } from '@inrupt/solid-client-authn-browser';
+export declare const authSession: Session;
+//# sourceMappingURL=authSession.d.ts.map

package/lib/authSession/authSession.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authSession.d.ts","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAER,MAAM,oCAAoC,CAAA;AAE3C,eAAO,MAAM,WAAW,SAKrB,CAAA"}

package/lib/authSession/authSession.js

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

package/lib/authSession/authSession.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authSession.js","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":";;;AAAA,iFAG2C;AAE9B,QAAA,WAAW,GAAG,IAAI,oCAAO,CAClC;IACE,oBAAoB,EAAE,IAAA,oEAAuC,EAAC,EAAE,CAAC;CAClE,EACD,WAAW,CACZ,CAAA"}

package/lib/authn/SolidAuthnLogic.d.ts

@@ -1,12 +1,33 @@
 import { NamedNode } from "rdflib";
-import { AuthnLogic } from "./index";
 import { Session } from "@inrupt/solid-client-authn-browser";
-/**
- * Implements AuthnLogic relying on solid-auth-client
- */
+import { AuthenticationContext, AuthnLogic } from "../types";
 export declare class SolidAuthnLogic implements AuthnLogic {
-    private session?;
+    private session;
     constructor(solidAuthSession: Session);
+    get authSession(): Session;
     currentUser(): NamedNode | null;
+    /**
+     * 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
+     */
+    checkUser<T>(setUserCallback?: (me: NamedNode | null) => T): Promise<NamedNode | T | null>;
+    /**
+     * Saves `webId` in `context.me`
+     * @param webId
+     * @param context
+     *
+     * @returns Returns the WebID, after setting it
+     */
+    saveUser(webId: NamedNode | string | null, context?: AuthenticationContext): NamedNode | null;
+    /**
+     * @returns {Promise<string|null>} Resolves with WebID URI or null
+     */
+    webIdFromSession(session?: {
+        webId?: string;
+        isLoggedIn: boolean;
+    }): string | null;
 }
 //# sourceMappingURL=SolidAuthnLogic.d.ts.map

package/lib/authn/SolidAuthnLogic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SolidAuthnLogic.d.ts","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAO,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAE7D;;GAEG;AACH,qBAAa,eAAgB,YAAW,UAAU;IAChD,OAAO,CAAC,OAAO,CAAC,CAAU;gBAEd,gBAAgB,EAAE,OAAO;IAIrC,WAAW,IAAI,SAAS,GAAG,IAAI;CAGhC"}
+{"version":3,"file":"SolidAuthnLogic.d.ts","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAO,MAAM,QAAQ,CAAC;AAGnD,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC7D,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;IAwDhC;;;;;;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

@@ -1,17 +1,183 @@
 "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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __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;
+    return g = { next: verb(0), "throw": verb(1), "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 (_) 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");
-/**
- * Implements AuthnLogic relying on solid-auth-client
- */
+var authUtil_1 = require("./authUtil");
+var debug = __importStar(require("../util/debug"));
 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 _a;
-        return ((_a = this.session) === null || _a === void 0 ? void 0 : _a.info.webId) ? (0, rdflib_1.sym)(this.session.info.webId) : null;
+        var app = (0, authUtil_1.appContext)();
+        if (app.viewingNoAuthPage) {
+            return (0, rdflib_1.sym)(app.webId);
+        }
+        if (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, 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.onSessionRestore(function (url) {
+                            if (document.location.toString() !== url)
+                                history.replaceState(null, '', url);
+                        });
+                        /**
+                         * Handle a successful authentication redirect
+                         */
+                        return [4 /*yield*/, this.session
+                                .handleIncomingRedirect({
+                                restorePreviousSession: true,
+                                url: window.location.href
+                            })
+                            // Check to see if a hash was stored in local storage
+                        ];
+                    case 1:
+                        /**
+                         * Handle a successful authentication redirect
+                         */
+                        _a.sent();
+                        postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
+                        if (postLoginRedirectHash) {
+                            curUrl = new URL(window.location.href);
+                            if (curUrl.hash !== postLoginRedirectHash) {
+                                if (history.pushState) {
+                                    // console.log('Setting window.location.has using pushState')
+                                    history.pushState(null, document.title, postLoginRedirectHash);
+                                }
+                                else {
+                                    // console.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;
 }());

package/lib/authn/SolidAuthnLogic.js.map

@@ -1 +1 @@
-{"version":3,"file":"SolidAuthnLogic.js","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":";;;AAAA,iCAAwC;AAIxC;;GAEG;AACH;IAGE,yBAAY,gBAAyB;QACnC,IAAI,CAAC,OAAO,GAAG,gBAAgB,CAAC;IAClC,CAAC;IAED,qCAAW,GAAX;;QACE,OAAO,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAC,IAAA,YAAG,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACxE,CAAC;IACH,sBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,0CAAe"}
+{"version":3,"file":"SolidAuthnLogic.js","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"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"}

package/lib/authn/authUtil.d.ts

@@ -0,0 +1,17 @@
+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
+ * see: https://github.com/facebook/jest/issues/936#issuecomment-545080082 for more
+ * @return {any} - an appContext object
+ */
+export declare const appContext: () => any;
+/**
+ * Returns `sym($SolidTestEnvironment.username)` if
+ * `$SolidTestEnvironment.username` is defined as a global
+ * or
+ * returns testID defined in the HTML page
+ * @returns {NamedNode|null}
+ */
+export declare function offlineTestID(): NamedNode | null;
+//# sourceMappingURL=authUtil.d.ts.map

package/lib/authn/authUtil.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"authUtil.d.ts","sourceRoot":"","sources":["../../src/authn/authUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAO,MAAM,QAAQ,CAAA;AAGvC;;;;;GAKG;AACH,eAAO,MAAM,UAAU,QAAM,GAuB5B,CAAA;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,IAAK,SAAS,GAAG,IAAI,CAyBjD"}

package/lib/authn/authUtil.js

@@ -0,0 +1,92 @@
+"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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.offlineTestID = exports.appContext = void 0;
+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
+ * see: https://github.com/facebook/jest/issues/936#issuecomment-545080082 for more
+ * @return {any} - an appContext object
+ */
+var appContext = function () {
+    var SolidAppContext = window.SolidAppContext;
+    SolidAppContext || (SolidAppContext = {});
+    SolidAppContext.viewingNoAuthPage = false;
+    if (SolidAppContext.noAuth && window.document) {
+        var currentPage = window.document.location.href;
+        if (currentPage.startsWith(SolidAppContext.noAuth)) {
+            SolidAppContext.viewingNoAuthPage = true;
+            var params = new URLSearchParams(window.document.location.search);
+            if (params) {
+                var viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
+                if (viewedPage) {
+                    viewedPage = decodeURI(viewedPage);
+                    if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
+                        var ary = viewedPage.split(/\//);
+                        SolidAppContext.idp = ary[0] + '//' + ary[2];
+                        SolidAppContext.viewingNoAuthPage = false;
+                    }
+                }
+            }
+        }
+    }
+    return SolidAppContext;
+};
+exports.appContext = appContext;
+/**
+ * Returns `sym($SolidTestEnvironment.username)` if
+ * `$SolidTestEnvironment.username` is defined as a global
+ * or
+ * returns testID defined in the HTML page
+ * @returns {NamedNode|null}
+ */
+function offlineTestID() {
+    var $SolidTestEnvironment = window.$SolidTestEnvironment;
+    if (typeof $SolidTestEnvironment !== 'undefined' &&
+        $SolidTestEnvironment.username) {
+        // Test setup
+        debug.log('Assuming the user is ' + $SolidTestEnvironment.username);
+        return (0, rdflib_1.sym)($SolidTestEnvironment.username);
+    }
+    // hack that makes SolidOS work in offline mode by adding the webId directly in html
+    // example usage: https://github.com/solid/mashlib/blob/29b8b53c46bf02e0e219f0bacd51b0e9951001dd/test/contact/local.html#L37
+    if (typeof document !== 'undefined' &&
+        document.location &&
+        ('' + document.location).slice(0, 16) === 'http://localhost') {
+        var div = document.getElementById('appTarget');
+        if (!div)
+            return null;
+        var id = div.getAttribute('testID');
+        if (!id)
+            return null;
+        debug.log('Assuming user is ' + id);
+        return (0, rdflib_1.sym)(id);
+    }
+    return null;
+}
+exports.offlineTestID = offlineTestID;
+//# sourceMappingURL=authUtil.js.map

package/lib/authn/authUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"authUtil.js","sourceRoot":"","sources":["../../src/authn/authUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAuC;AACvC,mDAAsC;AAEtC;;;;;GAKG;AACI,IAAM,UAAU,GAAG;IAChB,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;QAC3C,IAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAA;QACjD,IAAI,WAAW,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE;YACpD,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;gBACR,IAAI,UAAU,GAAG,eAAe,CAAC,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAA;gBACvE,IAAI,UAAU,EAAE;oBAChB,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC,CAAA;oBAClC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE;wBAChD,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;qBAC5C;iBACA;aACJ;SACA;KACJ;IACD,OAAO,eAAe,CAAA;AAC1B,CAAC,CAAA;AAvBY,QAAA,UAAU,cAuBtB;AAED;;;;;;GAMG;AACH,SAAgB,aAAa;IACjB,IAAA,qBAAqB,GAAU,MAAM,sBAAhB,CAAgB;IAC7C,IACE,OAAO,qBAAqB,KAAK,WAAW;QAC5C,qBAAqB,CAAC,QAAQ,EAC9B;QACA,aAAa;QACb,KAAK,CAAC,GAAG,CAAC,uBAAuB,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAA;QACnE,OAAO,IAAA,YAAG,EAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAA;KAC3C;IACD,oFAAoF;IACpF,4HAA4H;IAC5H,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;QACA,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;KACf;IACD,OAAO,IAAI,CAAA;AACf,CAAC;AAzBD,sCAyBC"}