solid-logic 1.3.17-ec29db42 → 1.3.17-f02a2f1a

package/lib/util/utilityLogic.js

@@ -0,0 +1,272 @@
+"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.createUtilityLogic = void 0;
+var rdflib_1 = require("rdflib");
+var CustomError_1 = require("../logic/CustomError");
+var debug = __importStar(require("../util/debug"));
+var utils_1 = require("./utils");
+function createUtilityLogic(store, aclLogic, containerLogic) {
+    function recursiveDelete(url) {
+        return __awaiter(this, void 0, void 0, function () {
+            var aclDocUrl, containerMembers, e_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 6, , 7]);
+                        if (!containerLogic.isContainer(url)) return [3 /*break*/, 5];
+                        return [4 /*yield*/, aclLogic.findAclDocUrl(url)];
+                    case 1:
+                        aclDocUrl = _a.sent();
+                        return [4 /*yield*/, store.fetcher._fetch(aclDocUrl, { method: "DELETE" })];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, containerLogic.getContainerMembers(url)];
+                    case 3:
+                        containerMembers = _a.sent();
+                        return [4 /*yield*/, Promise.all(containerMembers.map(function (url) { return recursiveDelete(url); }))];
+                    case 4:
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [2 /*return*/, store.fetcher._fetch(url, { method: "DELETE" })];
+                    case 6:
+                        e_1 = _a.sent();
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    }
+    /**
+     * Create a resource if it really does not exist
+     * Be absolutely sure something does not exist before creating a new empty file
+     * as otherwise existing could  be deleted.
+     * @param doc {NamedNode} - The resource
+     */
+    function loadOrCreateIfNotExists(doc) {
+        return __awaiter(this, void 0, void 0, function () {
+            var response, err_1, err_2, msg, msg;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 10]);
+                        return [4 /*yield*/, store.fetcher.load(doc)];
+                    case 1:
+                        response = _a.sent();
+                        return [3 /*break*/, 10];
+                    case 2:
+                        err_1 = _a.sent();
+                        if (!(err_1.response.status === 404)) return [3 /*break*/, 8];
+                        _a.label = 3;
+                    case 3:
+                        _a.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, store.fetcher.webOperation('PUT', doc, { data: '', contentType: 'text/turtle' })];
+                    case 4:
+                        _a.sent();
+                        return [3 /*break*/, 6];
+                    case 5:
+                        err_2 = _a.sent();
+                        msg = 'createIfNotExists: PUT FAILED: ' + doc + ': ' + err_2;
+                        throw new CustomError_1.WebOperationError(msg);
+                    case 6: return [4 /*yield*/, store.fetcher.load(doc)];
+                    case 7:
+                        _a.sent();
+                        return [3 /*break*/, 9];
+                    case 8:
+                        if (err_1.response.status === 401) {
+                            throw new CustomError_1.UnauthorizedError();
+                        }
+                        if (err_1.response.status === 403) {
+                            if ((0, utils_1.differentOrigin)(doc)) {
+                                throw new CustomError_1.CrossOriginForbiddenError();
+                            }
+                            throw new CustomError_1.SameOriginForbiddenError();
+                        }
+                        msg = 'createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err_1;
+                        throw new CustomError_1.FetchError(err_1.status, err_1.message + msg);
+                    case 9: return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/, response];
+                }
+            });
+        });
+    }
+    /* Follow link from this doc to another thing, or else make a new link
+    **
+    ** @returns existing object, or creates it if non existent
+    */
+    function followOrCreateLink(subject, predicate, object, doc) {
+        return __awaiter(this, void 0, void 0, function () {
+            var result, msg, err_3, msg, err_4;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, store.fetcher.load(doc)];
+                    case 1:
+                        _a.sent();
+                        result = store.any(subject, predicate, null, doc);
+                        if (result)
+                            return [2 /*return*/, result];
+                        if (!store.updater.editable(doc)) {
+                            msg = "followOrCreateLink: cannot edit ".concat(doc.value);
+                            debug.warn(msg);
+                            throw new CustomError_1.NotEditableError(msg);
+                        }
+                        _a.label = 2;
+                    case 2:
+                        _a.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, store.updater.update([], [(0, rdflib_1.st)(subject, predicate, object, doc)])];
+                    case 3:
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4:
+                        err_3 = _a.sent();
+                        msg = "followOrCreateLink: Error making link in ".concat(doc, " to ").concat(object, ": ").concat(err_3);
+                        debug.warn(msg);
+                        throw new CustomError_1.WebOperationError(err_3);
+                    case 5:
+                        _a.trys.push([5, 7, , 8]);
+                        return [4 /*yield*/, loadOrCreateIfNotExists(object)
+                            // store.fetcher.webOperation('PUT', object, { data: '', contentType: 'text/turtle'})
+                        ];
+                    case 6:
+                        _a.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        err_4 = _a.sent();
+                        debug.warn("followOrCreateLink: Error loading or saving new linked document: ".concat(object, ": ").concat(err_4));
+                        throw err_4;
+                    case 8: return [2 /*return*/, object];
+                }
+            });
+        });
+    }
+    // Copied from https://github.com/solidos/web-access-control-tests/blob/v3.0.0/test/surface/delete.test.ts#L5
+    function setSinglePeerAccess(options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var str, aclDocUrl;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        str = [
+                            '@prefix acl: <http://www.w3.org/ns/auth/acl#>.',
+                            '',
+                            "<#alice> a acl:Authorization;\n  acl:agent <".concat(options.ownerWebId, ">;"),
+                            "  acl:accessTo <".concat(options.target, ">;"),
+                            "  acl:default <".concat(options.target, ">;"),
+                            '  acl:mode acl:Read, acl:Write, acl:Control.',
+                            ''
+                        ].join('\n');
+                        if (options.accessToModes) {
+                            str += [
+                                '<#bobAccessTo> a acl:Authorization;',
+                                "  acl:agent <".concat(options.peerWebId, ">;"),
+                                "  acl:accessTo <".concat(options.target, ">;"),
+                                "  acl:mode ".concat(options.accessToModes, "."),
+                                ''
+                            ].join('\n');
+                        }
+                        if (options.defaultModes) {
+                            str += [
+                                '<#bobDefault> a acl:Authorization;',
+                                "  acl:agent <".concat(options.peerWebId, ">;"),
+                                "  acl:default <".concat(options.target, ">;"),
+                                "  acl:mode ".concat(options.defaultModes, "."),
+                                ''
+                            ].join('\n');
+                        }
+                        return [4 /*yield*/, aclLogic.findAclDocUrl(options.target)];
+                    case 1:
+                        aclDocUrl = _a.sent();
+                        return [2 /*return*/, store.fetcher._fetch(aclDocUrl, {
+                                method: 'PUT',
+                                body: str,
+                                headers: [
+                                    ['Content-Type', 'text/turtle']
+                                ]
+                            })];
+                }
+            });
+        });
+    }
+    function createEmptyRdfDoc(doc, comment) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, store.fetcher.webOperation("PUT", doc.uri, {
+                            data: "# ".concat(new Date(), " ").concat(comment, "\n  "),
+                            contentType: "text/turtle",
+                        })];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    }
+    return {
+        recursiveDelete: recursiveDelete,
+        setSinglePeerAccess: setSinglePeerAccess,
+        createEmptyRdfDoc: createEmptyRdfDoc,
+        followOrCreateLink: followOrCreateLink,
+        loadOrCreateIfNotExists: loadOrCreateIfNotExists
+    };
+}
+exports.createUtilityLogic = createUtilityLogic;
+//# sourceMappingURL=utilityLogic.js.map

package/lib/util/utilityLogic.js.map

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

package/lib/util/utils.d.ts

@@ -0,0 +1,8 @@
+import { NamedNode } from "rdflib";
+export declare function newThing(doc: NamedNode): NamedNode;
+export declare function uniqueNodes(arr: NamedNode[]): NamedNode[];
+export declare function getArchiveUrl(baseUrl: string, date: Date): string;
+export declare function differentOrigin(doc: any): boolean;
+export declare function suggestPreferencesFile(me: NamedNode): NamedNode;
+export declare function determineChatContainer(invitee: NamedNode, podRoot: NamedNode): NamedNode;
+//# sourceMappingURL=utils.d.ts.map

package/lib/util/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/util/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAO,MAAM,QAAQ,CAAC;AAExC,wBAAgB,QAAQ,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,CAElD;AAED,wBAAgB,WAAW,CAAE,GAAG,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAM1D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,UAOxD;AAED,wBAAgB,eAAe,CAAC,GAAG,KAAA,GAAG,OAAO,CAO5C;AAED,wBAAgB,sBAAsB,CAAE,EAAE,EAAC,SAAS,aAMnD;AAED,wBAAgB,sBAAsB,CAClC,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,SAAS,GACnB,SAAS,CAQX"}

package/lib/util/utils.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.determineChatContainer = exports.suggestPreferencesFile = exports.differentOrigin = exports.getArchiveUrl = exports.uniqueNodes = exports.newThing = void 0;
+var rdflib_1 = require("rdflib");
+function newThing(doc) {
+    return (0, rdflib_1.sym)(doc.uri + "#" + "id" + ("" + Date.now()));
+}
+exports.newThing = newThing;
+function uniqueNodes(arr) {
+    var uris = arr.map(function (x) { return x.uri; });
+    var set = new Set(uris);
+    var uris2 = Array.from(set);
+    var arr2 = uris2.map(function (u) { return new rdflib_1.NamedNode(u); });
+    return arr2; // Array.from(new Set(arr.map(x => x.uri))).map(u => sym(u))
+}
+exports.uniqueNodes = uniqueNodes;
+function getArchiveUrl(baseUrl, date) {
+    var year = date.getUTCFullYear();
+    var month = ('0' + (date.getUTCMonth() + 1)).slice(-2);
+    var day = ('0' + (date.getUTCDate())).slice(-2);
+    var parts = baseUrl.split('/');
+    var filename = parts[parts.length - 1];
+    return new URL("./archive/".concat(year, "/").concat(month, "/").concat(day, "/").concat(filename), baseUrl).toString();
+}
+exports.getArchiveUrl = getArchiveUrl;
+function differentOrigin(doc) {
+    if (!doc) {
+        return true;
+    }
+    return ("".concat(window.location.origin, "/") !== new URL(doc.value).origin);
+}
+exports.differentOrigin = differentOrigin;
+function suggestPreferencesFile(me) {
+    var stripped = me.uri.replace('/profile/', '/').replace('/public/', '/');
+    // const stripped = me.uri.replace(\/[p|P]rofile/\g, '/').replace(\/[p|P]ublic/\g, '/')
+    var folderURI = stripped.split('/').slice(0, -1).join('/') + '/Settings/';
+    var fileURI = folderURI + 'Preferences.ttl';
+    return (0, rdflib_1.sym)(fileURI);
+}
+exports.suggestPreferencesFile = suggestPreferencesFile;
+function determineChatContainer(invitee, podRoot) {
+    // Create chat
+    // See https://gitter.im/solid/chat-app?at=5f3c800f855be416a23ae74a
+    var chatContainerStr = new URL("IndividualChats/".concat(new URL(invitee.value).host, "/"), podRoot.value).toString();
+    return new rdflib_1.NamedNode(chatContainerStr);
+}
+exports.determineChatContainer = determineChatContainer;
+//# sourceMappingURL=utils.js.map

package/lib/util/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/util/utils.ts"],"names":[],"mappings":";;;AAAA,iCAAwC;AAExC,SAAgB,QAAQ,CAAC,GAAc;IACnC,OAAO,IAAA,YAAG,EAAC,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AACzD,CAAC;AAFD,4BAEC;AAED,SAAgB,WAAW,CAAE,GAAgB;IACzC,IAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,EAAL,CAAK,CAAC,CAAA;IAChC,IAAM,GAAG,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;IACzB,IAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC7B,IAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,IAAI,kBAAS,CAAC,CAAC,CAAC,EAAhB,CAAgB,CAAC,CAAA;IAC7C,OAAO,IAAI,CAAA,CAAC,4DAA4D;AAC5E,CAAC;AAND,kCAMC;AAED,SAAgB,aAAa,CAAC,OAAe,EAAE,IAAU;IACrD,IAAM,IAAI,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;IACnC,IAAM,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,GAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,IAAM,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,IAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAE,CAAC,CAAE,CAAC;IACzC,OAAO,IAAI,GAAG,CAAC,oBAAa,IAAI,cAAI,KAAK,cAAI,GAAG,cAAI,QAAQ,CAAE,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AACxF,CAAC;AAPD,sCAOC;AAED,SAAgB,eAAe,CAAC,GAAG;IAC/B,IAAI,CAAC,GAAG,EAAE;QACN,OAAO,IAAI,CAAC;KACf;IACD,OAAO,CACH,UAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,MAAG,KAAK,IAAI,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,MAAM,CAC7D,CAAC;AACN,CAAC;AAPD,0CAOC;AAED,SAAgB,sBAAsB,CAAE,EAAY;IAChD,IAAM,QAAQ,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAA;IAC1E,uFAAuF;IACvF,IAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,YAAY,CAAA;IAC1E,IAAM,OAAO,GAAG,SAAS,GAAG,iBAAiB,CAAA;IAC7C,OAAO,IAAA,YAAG,EAAC,OAAO,CAAC,CAAA;AACvB,CAAC;AAND,wDAMC;AAED,SAAgB,sBAAsB,CAClC,OAAkB,EAClB,OAAkB;IAElB,cAAc;IACd,mEAAmE;IACnE,IAAM,gBAAgB,GAAG,IAAI,GAAG,CAC5B,0BAAmB,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,MAAG,EACjD,OAAO,CAAC,KAAK,CAChB,CAAC,QAAQ,EAAE,CAAC;IACb,OAAO,IAAI,kBAAS,CAAC,gBAAgB,CAAC,CAAC;AAC3C,CAAC;AAXD,wDAWC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-logic",
-  "version": "1.3.17-ec29db42",
+  "version": "1.3.17-f02a2f1a",
   "description": "Core business logic of Solid OS",
   "main": "lib/index.js",
   "scripts": {
@@ -8,6 +8,7 @@
     "clean": "rm -rf lib",
     "lint": "eslint ./src",
     "test": "jest",
+    "test-debug": "node --inspect-brk ./node_modules/.bin/jest -i --env jest-environment-node-debug",
     "preversion": "npm test",
     "postversion": "git push --follow-tags",
     "ignore:prepublishOnly": "npm run build",
@@ -35,6 +36,7 @@
     "@typescript-eslint/parser": "^5.19.0",
     "eslint": "^8.13.0",
     "jest": "^27.5.1",
+    "jest-environment-node-debug": "^2.0.0",
     "jest-fetch-mock": "^3.0.3",
     "typescript": "^4.6.3"
   },

package/src/acl/aclLogic.ts

@@ -1,137 +1,156 @@
-/**
- * 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 { graph, NamedNode, Namespace, serialize, sym } from "rdflib"
+import { AclLogic } from "../types";
+import { ns as namespace } from '../util/ns'
 
-import { graph, NamedNode, Namespace, serialize } from "rdflib"
-import solidNamespace from 'solid-namespace'
-import * as $rdf from 'rdflib'
-import { solidLogicSingleton } from "../logic/solidLogicSingleton"
-import { ACL_LINK } from "../util/UtilityLogic"
 
-export const ns = solidNamespace($rdf)
+export const ACL_LINK = sym(
+    "http://www.iana.org/assignments/link-relations/acl"
+);
 
-export function setACLUserPublic ( 
-docURI: string,
-me: NamedNode,
-options: {
-    defaultForNew?: boolean,
-    public?: []
-}
-): Promise<NamedNode> {
-const aclDoc = solidLogicSingleton.store.any(
-    solidLogicSingleton.store.sym(docURI),
-    ACL_LINK
-)
+export function createAclLogic(store): AclLogic {
 
-return Promise.resolve()
-    .then(() => {
-    if (aclDoc) {
-        return aclDoc as NamedNode
+    const ns = namespace
+    
+    async function findAclDocUrl(url: string) {
+        const doc = store.sym(url);
+        await store.fetcher.load(doc);
+        const docNode = store.any(doc, ACL_LINK);
+        if (!docNode) {
+            throw new Error(`No ACL link discovered for ${url}`);
+        }
+        return docNode.value;
     }
-
-    return fetchACLRel(docURI).catch(err => {
-        throw new Error(`Error fetching rel=ACL header for ${docURI}: ${err}`)
-    })
-    })
-    .then(aclDoc => {
-    const aclText = genACLText(docURI, me, aclDoc.uri, options)
-    if (!solidLogicSingleton.store.fetcher) {
-        throw new Error('Cannot PUT this, store has no fetcher')
+    /**
+     * 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: string,
+    me: NamedNode,
+    options: {
+        defaultForNew?: boolean,
+        public?: []
     }
-    return solidLogicSingleton.store.fetcher
-        .webOperation('PUT', aclDoc.uri, {
-        data: aclText,
-        contentType: 'text/turtle'
-        })
-        .then(result => {
-        if (!result.ok) {
-            throw new Error('Error writing ACL text: ' + result.error)
+    ): Promise<NamedNode> {
+    const aclDoc = store.any(
+        store.sym(docURI),
+        ACL_LINK
+    )
+
+    return Promise.resolve()
+        .then(() => {
+        if (aclDoc) {
+            return aclDoc as NamedNode
         }
 
-        return aclDoc
+        return fetchACLRel(docURI).catch(err => {
+            throw new Error(`Error fetching rel=ACL header for ${docURI}: ${err}`)
+        })
         })
-    })
-}
+        .then(aclDoc => {
+        const 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(result => {
+            if (!result.ok) {
+                throw new Error('Error writing ACL text: ' + result.error)
+            }
 
-/**
- * @param docURI
- * @returns
- */
-function fetchACLRel (docURI: string): Promise<NamedNode> {
-    const fetcher = solidLogicSingleton.store.fetcher
-    if (!fetcher) {
-        throw new Error('Cannot fetch ACL rel, store has no fetcher')
+            return aclDoc
+            })
+        })
     }
 
-    return fetcher.load(docURI).then(result => {
-        if (!result.ok) {
-        throw new Error('fetchACLRel: While loading:' + (result as any).error)
+    /**
+     * @param docURI
+     * @returns
+     */
+    function fetchACLRel (docURI: string): Promise<NamedNode> {
+        const fetcher = store.fetcher
+        if (!fetcher) {
+            throw new Error('Cannot fetch ACL rel, store has no fetcher')
         }
 
-        const aclDoc = solidLogicSingleton.store.any(
-        solidLogicSingleton.store.sym(docURI),
-        ACL_LINK
-        )
+        return fetcher.load(docURI).then(result => {
+            if (!result.ok) {
+            throw new Error('fetchACLRel: While loading:' + (result as any).error)
+            }
 
-        if (!aclDoc) {
-        throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI)
-        }
+            const aclDoc = store.any(
+            store.sym(docURI),
+            ACL_LINK
+            )
 
-        return aclDoc as NamedNode
-    })
-}
+            if (!aclDoc) {
+            throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI)
+            }
+
+            return aclDoc as NamedNode
+        })
+    }
 
-/**
- * @param docURI
- * @param me
- * @param aclURI
- * @param options
- *
- * @returns Serialized ACL
- */
-export function genACLText (
-docURI: string,
-me: NamedNode,
-aclURI: string,
-options: {
-    defaultForNew?: boolean,
-    public?: []
-} = {}
-): string | undefined {
-const optPublic = options.public || []
-const g = graph()
-const auth = Namespace('http://www.w3.org/ns/auth/acl#')
-let a = g.sym(`${aclURI}#a1`)
-const acl = g.sym(aclURI)
-const 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)
+    /**
+     * @param docURI
+     * @param me
+     * @param aclURI
+     * @param options
+     *
+     * @returns Serialized ACL
+     */
+    function genACLText (
+    docURI: string,
+    me: NamedNode,
+    aclURI: string,
+    options: {
+            defaultForNew?: boolean,
+            public?: []
+        } = {}
+    ): string | undefined {
+        const optPublic = options.public || []
+        const g = graph()
+        const auth = Namespace('http://www.w3.org/ns/auth/acl#')
+        let a = g.sym(`${aclURI}#a1`)
+        const acl = g.sym(aclURI)
+        const 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(`${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 (let p = 0; p < optPublic.length; p++) {
-    g.add(a, auth('mode'), auth(optPublic[p]), acl) // Like 'Read' etc
+        if (optPublic.length) {
+            a = g.sym(`${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 (let p = 0; p < optPublic.length; p++) {
+            g.add(a, auth('mode'), auth(optPublic[p]), acl) // Like 'Read' etc
+            }
+        }
+        return serialize(acl, g, aclURI)
+    }
+    return {
+        findAclDocUrl,
+        setACLUserPublic,
+        genACLText
     }
-}
-return serialize(acl, g, aclURI)
-}
+}