solid-logic 3.1.1-f0ed025 → 3.1.1-f3e6173
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +103 -2
- package/dist/acl/aclLogic.d.ts +5 -0
- package/{lib → dist}/acl/aclLogic.d.ts.map +1 -1
- package/dist/acl/aclLogic.js +117 -0
- package/dist/acl/aclLogic.js.map +1 -0
- package/dist/authSession/authSession.js +3 -0
- package/dist/authSession/authSession.js.map +1 -0
- package/{lib → dist}/authn/SolidAuthnLogic.d.ts +3 -3
- package/{lib → dist}/authn/SolidAuthnLogic.d.ts.map +1 -1
- package/dist/authn/SolidAuthnLogic.js +109 -0
- package/dist/authn/SolidAuthnLogic.js.map +1 -0
- package/{lib → dist}/authn/authUtil.d.ts +1 -1
- package/dist/authn/authUtil.d.ts.map +1 -0
- package/dist/authn/authUtil.js +64 -0
- package/dist/authn/authUtil.js.map +1 -0
- package/{lib → dist}/chat/chatLogic.d.ts +1 -1
- package/{lib → dist}/chat/chatLogic.d.ts.map +1 -1
- package/dist/chat/chatLogic.js +157 -0
- package/dist/chat/chatLogic.js.map +1 -0
- package/{lib → dist}/inbox/inboxLogic.d.ts +1 -1
- package/{lib → dist}/inbox/inboxLogic.d.ts.map +1 -1
- package/dist/inbox/inboxLogic.js +51 -0
- package/dist/inbox/inboxLogic.js.map +1 -0
- package/{lib → dist}/index.d.ts +1 -1
- package/{lib → dist}/index.d.ts.map +1 -1
- package/dist/index.js +14 -0
- package/dist/index.js.map +1 -0
- package/dist/issuer/issuerLogic.js +37 -0
- package/dist/issuer/issuerLogic.js.map +1 -0
- package/{lib → dist}/logic/CustomError.d.ts.map +1 -1
- package/dist/logic/CustomError.js +27 -0
- package/dist/logic/CustomError.js.map +1 -0
- package/dist/logic/solidLogic.d.ts +6 -0
- package/{lib → dist}/logic/solidLogic.d.ts.map +1 -1
- package/dist/logic/solidLogic.js +64 -0
- package/dist/logic/solidLogic.js.map +1 -0
- package/dist/logic/solidLogicSingleton.d.ts +4 -0
- package/{lib → dist}/logic/solidLogicSingleton.d.ts.map +1 -1
- package/dist/logic/solidLogicSingleton.js +31 -0
- package/dist/logic/solidLogicSingleton.js.map +1 -0
- package/{lib → dist}/profile/profileLogic.d.ts +1 -1
- package/{lib → dist}/profile/profileLogic.d.ts.map +1 -1
- package/dist/profile/profileLogic.js +128 -0
- package/dist/profile/profileLogic.js.map +1 -0
- package/dist/solid-logic.esm.js +7356 -0
- package/dist/solid-logic.esm.js.map +1 -0
- package/dist/solid-logic.esm.min.js +32 -0
- package/dist/solid-logic.esm.min.js.map +1 -0
- package/dist/solid-logic.js +7415 -0
- package/dist/solid-logic.js.map +1 -0
- package/dist/solid-logic.min.js +32 -0
- package/dist/solid-logic.min.js.map +1 -0
- package/{lib → dist}/typeIndex/typeIndexLogic.d.ts.map +1 -1
- package/dist/typeIndex/typeIndexLogic.js +182 -0
- package/dist/typeIndex/typeIndexLogic.js.map +1 -0
- package/{lib → dist}/types.d.ts +2 -2
- package/{lib → dist}/types.d.ts.map +1 -1
- package/dist/types.js +2 -0
- package/{lib → dist}/util/containerLogic.d.ts +1 -1
- package/{lib → dist}/util/containerLogic.d.ts.map +1 -1
- package/{src/util/containerLogic.ts → dist/util/containerLogic.js} +15 -23
- package/dist/util/containerLogic.js.map +1 -0
- package/dist/util/debug.d.ts.map +1 -0
- package/dist/util/debug.js +13 -0
- package/dist/util/debug.js.map +1 -0
- package/dist/util/ns.js +5 -0
- package/dist/util/ns.js.map +1 -0
- package/{lib → dist}/util/utilityLogic.d.ts +1 -1
- package/{lib → dist}/util/utilityLogic.d.ts.map +1 -1
- package/dist/util/utilityLogic.js +144 -0
- package/dist/util/utilityLogic.js.map +1 -0
- package/{lib → dist}/util/utils.d.ts +1 -1
- package/{lib → dist}/util/utils.d.ts.map +1 -1
- package/dist/util/utils.js +39 -0
- package/dist/util/utils.js.map +1 -0
- package/dist/versionInfo.js +31 -0
- package/dist/versionInfo.js.map +1 -0
- package/package.json +51 -23
- package/eslint.config.js +0 -29
- package/jest.config.js +0 -10
- package/lib/acl/aclLogic.d.ts +0 -5
- package/lib/acl/aclLogic.js +0 -168
- package/lib/acl/aclLogic.js.map +0 -1
- package/lib/authSession/authSession.js +0 -6
- package/lib/authSession/authSession.js.map +0 -1
- package/lib/authn/SolidAuthnLogic.js +0 -193
- package/lib/authn/SolidAuthnLogic.js.map +0 -1
- package/lib/authn/authUtil.d.ts.map +0 -1
- package/lib/authn/authUtil.js +0 -105
- package/lib/authn/authUtil.js.map +0 -1
- package/lib/chat/chatLogic.js +0 -272
- package/lib/chat/chatLogic.js.map +0 -1
- package/lib/inbox/inboxLogic.js +0 -139
- package/lib/inbox/inboxLogic.js.map +0 -1
- package/lib/index.js +0 -31
- package/lib/index.js.map +0 -1
- package/lib/issuer/issuerLogic.js +0 -52
- package/lib/issuer/issuerLogic.js.map +0 -1
- package/lib/logic/CustomError.js +0 -89
- package/lib/logic/CustomError.js.map +0 -1
- package/lib/logic/solidLogic.d.ts +0 -6
- package/lib/logic/solidLogic.js +0 -102
- package/lib/logic/solidLogic.js.map +0 -1
- package/lib/logic/solidLogicSingleton.d.ts +0 -3
- package/lib/logic/solidLogicSingleton.js +0 -94
- package/lib/logic/solidLogicSingleton.js.map +0 -1
- package/lib/profile/profileLogic.js +0 -259
- package/lib/profile/profileLogic.js.map +0 -1
- package/lib/typeIndex/typeIndexLogic.js +0 -399
- package/lib/typeIndex/typeIndexLogic.js.map +0 -1
- package/lib/types.js +0 -3
- package/lib/util/containerLogic.js +0 -102
- package/lib/util/containerLogic.js.map +0 -1
- package/lib/util/debug.d.ts.map +0 -1
- package/lib/util/debug.js +0 -40
- package/lib/util/debug.js.map +0 -1
- package/lib/util/ns.js +0 -44
- package/lib/util/ns.js.map +0 -1
- package/lib/util/utilityLogic.js +0 -284
- package/lib/util/utilityLogic.js.map +0 -1
- package/lib/util/utils.js +0 -47
- package/lib/util/utils.js.map +0 -1
- package/src/acl/aclLogic.ts +0 -156
- package/src/authSession/authSession.ts +0 -7
- package/src/authn/SolidAuthnLogic.ts +0 -127
- package/src/authn/authUtil.ts +0 -70
- package/src/chat/chatLogic.ts +0 -226
- package/src/inbox/inboxLogic.ts +0 -59
- package/src/index.ts +0 -22
- package/src/issuer/issuerLogic.ts +0 -40
- package/src/logic/CustomError.ts +0 -29
- package/src/logic/solidLogic.ts +0 -76
- package/src/logic/solidLogicSingleton.ts +0 -20
- package/src/profile/profileLogic.ts +0 -125
- package/src/typeIndex/typeIndexLogic.ts +0 -198
- package/src/types.ts +0 -122
- package/src/util/debug.ts +0 -20
- package/src/util/ns.ts +0 -5
- package/src/util/utilityLogic.ts +0 -156
- package/src/util/utils.ts +0 -52
- package/test/aclLogic.test.ts +0 -24
- package/test/authUtil.test.ts +0 -23
- package/test/chatLogic.test.ts +0 -316
- package/test/container.test.ts +0 -58
- package/test/helpers/dataSetup.ts +0 -134
- package/test/helpers/setup.ts +0 -17
- package/test/inboxLogic.test.ts +0 -218
- package/test/logic.test.ts +0 -29
- package/test/profileLogic.test.ts +0 -246
- package/test/solidAuthLogic.test.ts +0 -49
- package/test/typeIndexLogic.test.ts +0 -255
- package/test/utilityLogic.test.ts +0 -179
- package/test/utils.test.ts +0 -32
- package/tsconfig.json +0 -75
- /package/{lib → dist}/authSession/authSession.d.ts +0 -0
- /package/{lib → dist}/authSession/authSession.d.ts.map +0 -0
- /package/{lib → dist}/issuer/issuerLogic.d.ts +0 -0
- /package/{lib → dist}/issuer/issuerLogic.d.ts.map +0 -0
- /package/{lib → dist}/logic/CustomError.d.ts +0 -0
- /package/{lib → dist}/typeIndex/typeIndexLogic.d.ts +0 -0
- /package/{lib → dist}/types.js.map +0 -0
- /package/{lib → dist}/util/debug.d.ts +0 -0
- /package/{lib → dist}/util/ns.d.ts +0 -0
- /package/{lib → dist}/util/ns.d.ts.map +0 -0
package/README.md
CHANGED
|
@@ -1,7 +1,108 @@
|
|
|
1
1
|
# solid-logic
|
|
2
|
-
Core business logic of SolidOS
|
|
3
2
|
|
|
4
|
-
|
|
3
|
+
<img src="https://raw.githubusercontent.com/solid/community-server/main/templates/images/solid.svg" alt="[Solid logo]" height="150" align="right"/>
|
|
4
|
+
|
|
5
|
+
[](https://github.com/solidos/solidos/blob/main/LICENSE.md)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
Core business logic of SolidOS which can be used for any webapp as well.
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
# Usage
|
|
12
|
+
|
|
13
|
+
## Install via npm
|
|
14
|
+
|
|
15
|
+
```sh
|
|
16
|
+
npm install solid-logic
|
|
17
|
+
```
|
|
18
|
+
|
|
19
|
+
### Import in your project (ESM/TypeScript)
|
|
20
|
+
|
|
21
|
+
```js
|
|
22
|
+
import { someFunction } from 'solid-logic';
|
|
23
|
+
```
|
|
24
|
+
|
|
25
|
+
## Use directly in a browser
|
|
26
|
+
Both UMD and ESM bundles take rdflib as external, this means you need to install it yourself, separately.
|
|
27
|
+
|
|
28
|
+
## Files
|
|
29
|
+
- For browser UMD, without rdflib: `dist/solid-logic.js` (global `window.SolidLogic`)
|
|
30
|
+
- For browser ESM, without rdflib: `dist/solid-logic.esm.js` (import as module)
|
|
31
|
+
- UMD has also chunked files.
|
|
32
|
+
- both versions also contain minified versions.
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
### UMD bundle (global variable)
|
|
36
|
+
|
|
37
|
+
```html
|
|
38
|
+
<!-- Load dependencies first -->
|
|
39
|
+
<script src="https://cdn.jsdelivr.net/npm/rdflib/dist/rdflib.min.js"></script>
|
|
40
|
+
<!-- Load solid-logic UMD bundle -->
|
|
41
|
+
<script src="https://unpkg.com/solid-logic/dist/solid-logic.min.js"></script>
|
|
42
|
+
<!-- or -->
|
|
43
|
+
<!-- script src="https://cdn.jsdelivr.net/npm/solid-logic/dist/solid-logic.min.js"></script -->
|
|
44
|
+
<!-- or -->
|
|
45
|
+
<!-- script src="dist/solid-logic.js"></script -->
|
|
46
|
+
<script>
|
|
47
|
+
// Access via global variable
|
|
48
|
+
const rdflib = window.$rdf;
|
|
49
|
+
const logic = window.SolidLogic;
|
|
50
|
+
// Example usage
|
|
51
|
+
// logic.someFunction(...)
|
|
52
|
+
</script>
|
|
53
|
+
```
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
### ESM bundle (import as module)
|
|
57
|
+
|
|
58
|
+
```html
|
|
59
|
+
<script type="module">
|
|
60
|
+
import * as $rdf from 'https://esm.sh/rdflib'
|
|
61
|
+
import { someFunction } from 'https://esm.sh/solid-logic'
|
|
62
|
+
|
|
63
|
+
// Example usage
|
|
64
|
+
// someFunction(...)
|
|
65
|
+
</script>
|
|
66
|
+
```
|
|
67
|
+
|
|
68
|
+
or
|
|
69
|
+
|
|
70
|
+
### ESM bundle with import map (bare specifiers)
|
|
71
|
+
|
|
72
|
+
```html
|
|
73
|
+
<script type="importmap">
|
|
74
|
+
{
|
|
75
|
+
"imports": {
|
|
76
|
+
"rdflib": "https://esm.sh/rdflib",
|
|
77
|
+
"solid-logic": "https://esm.sh/solid-logic"
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
</script>
|
|
81
|
+
<script type="module">
|
|
82
|
+
import * as $rdf from 'rdflib'
|
|
83
|
+
import { someFunction } from 'solid-logic'
|
|
84
|
+
|
|
85
|
+
// Example usage
|
|
86
|
+
// someFunction(...)
|
|
87
|
+
</script>
|
|
88
|
+
```
|
|
89
|
+
|
|
90
|
+
# How to develop
|
|
91
|
+
|
|
92
|
+
Check the scripts in the `package.json` for build, watch, lint and test.
|
|
93
|
+
|
|
94
|
+
# Used stack
|
|
95
|
+
|
|
96
|
+
* TypeScript + Babel
|
|
97
|
+
* Jest
|
|
98
|
+
* ESLint
|
|
99
|
+
* Webpack
|
|
100
|
+
|
|
101
|
+
# How to release
|
|
102
|
+
|
|
103
|
+
Change version and push directly to main. This will trigger the npm release latest script in CI.
|
|
104
|
+
|
|
105
|
+
# History
|
|
5
106
|
|
|
6
107
|
Solid-logic was a move to separate business logic from UI functionality so that people using different UI frameworks could use logic code.
|
|
7
108
|
|
|
@@ -1 +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,
|
|
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,CAiJ9C"}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { graph, Namespace, serialize, sym } from 'rdflib';
|
|
2
|
+
import { ns as namespace } from '../util/ns';
|
|
3
|
+
export const ACL_LINK = sym('http://www.iana.org/assignments/link-relations/acl');
|
|
4
|
+
export function createAclLogic(store) {
|
|
5
|
+
const ns = namespace;
|
|
6
|
+
async function findAclDocUrl(url) {
|
|
7
|
+
await store.fetcher.load(url);
|
|
8
|
+
const docNode = store.any(url, ACL_LINK);
|
|
9
|
+
if (!docNode) {
|
|
10
|
+
throw new Error(`No ACL link discovered for ${url}`);
|
|
11
|
+
}
|
|
12
|
+
return docNode.value;
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Simple Access Control
|
|
16
|
+
*
|
|
17
|
+
* This function sets up a simple default ACL for a resource, with
|
|
18
|
+
* RWC for the owner, and a specified access (default none) for the public.
|
|
19
|
+
* In all cases owner has read write control.
|
|
20
|
+
* Parameter lists modes allowed to public
|
|
21
|
+
*
|
|
22
|
+
* @param options
|
|
23
|
+
* @param options.public eg ['Read', 'Write']
|
|
24
|
+
*
|
|
25
|
+
* @returns Resolves with aclDoc uri on successful write
|
|
26
|
+
*/
|
|
27
|
+
function setACLUserPublic(docURI, me, options) {
|
|
28
|
+
const aclDoc = store.any(store.sym(docURI), ACL_LINK);
|
|
29
|
+
return Promise.resolve()
|
|
30
|
+
.then(() => {
|
|
31
|
+
if (aclDoc) {
|
|
32
|
+
return aclDoc;
|
|
33
|
+
}
|
|
34
|
+
return fetchACLRel(docURI).catch(err => {
|
|
35
|
+
throw new Error(`Error fetching rel=ACL header for ${docURI}: ${err}`);
|
|
36
|
+
});
|
|
37
|
+
})
|
|
38
|
+
.then(aclDoc => {
|
|
39
|
+
const aclText = genACLText(docURI, me, aclDoc.uri, options);
|
|
40
|
+
if (!store.fetcher) {
|
|
41
|
+
throw new Error('Cannot PUT this, store has no fetcher');
|
|
42
|
+
}
|
|
43
|
+
return store.fetcher
|
|
44
|
+
.webOperation('PUT', aclDoc.uri, {
|
|
45
|
+
data: aclText,
|
|
46
|
+
contentType: 'text/turtle'
|
|
47
|
+
})
|
|
48
|
+
.then(result => {
|
|
49
|
+
if (!result.ok) {
|
|
50
|
+
throw new Error('Error writing ACL text: ' + result.error);
|
|
51
|
+
}
|
|
52
|
+
return aclDoc;
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* @param docURI
|
|
58
|
+
* @returns
|
|
59
|
+
*/
|
|
60
|
+
function fetchACLRel(docURI) {
|
|
61
|
+
const fetcher = store.fetcher;
|
|
62
|
+
if (!fetcher) {
|
|
63
|
+
throw new Error('Cannot fetch ACL rel, store has no fetcher');
|
|
64
|
+
}
|
|
65
|
+
return fetcher.load(docURI).then(result => {
|
|
66
|
+
if (!result.ok) {
|
|
67
|
+
throw new Error('fetchACLRel: While loading:' + result.error);
|
|
68
|
+
}
|
|
69
|
+
const aclDoc = store.any(store.sym(docURI), ACL_LINK);
|
|
70
|
+
if (!aclDoc) {
|
|
71
|
+
throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI);
|
|
72
|
+
}
|
|
73
|
+
return aclDoc;
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* @param docURI
|
|
78
|
+
* @param me
|
|
79
|
+
* @param aclURI
|
|
80
|
+
* @param options
|
|
81
|
+
*
|
|
82
|
+
* @returns Serialized ACL
|
|
83
|
+
*/
|
|
84
|
+
function genACLText(docURI, me, aclURI, options = {}) {
|
|
85
|
+
const optPublic = options.public || [];
|
|
86
|
+
const g = graph();
|
|
87
|
+
const auth = Namespace('http://www.w3.org/ns/auth/acl#');
|
|
88
|
+
let a = g.sym(`${aclURI}#a1`);
|
|
89
|
+
const acl = g.sym(aclURI);
|
|
90
|
+
const doc = g.sym(docURI);
|
|
91
|
+
g.add(a, ns.rdf('type'), auth('Authorization'), acl);
|
|
92
|
+
g.add(a, auth('accessTo'), doc, acl);
|
|
93
|
+
if (options.defaultForNew) {
|
|
94
|
+
g.add(a, auth('default'), doc, acl);
|
|
95
|
+
}
|
|
96
|
+
g.add(a, auth('agent'), me, acl);
|
|
97
|
+
g.add(a, auth('mode'), auth('Read'), acl);
|
|
98
|
+
g.add(a, auth('mode'), auth('Write'), acl);
|
|
99
|
+
g.add(a, auth('mode'), auth('Control'), acl);
|
|
100
|
+
if (optPublic.length) {
|
|
101
|
+
a = g.sym(`${aclURI}#a2`);
|
|
102
|
+
g.add(a, ns.rdf('type'), auth('Authorization'), acl);
|
|
103
|
+
g.add(a, auth('accessTo'), doc, acl);
|
|
104
|
+
g.add(a, auth('agentClass'), ns.foaf('Agent'), acl);
|
|
105
|
+
for (let p = 0; p < optPublic.length; p++) {
|
|
106
|
+
g.add(a, auth('mode'), auth(optPublic[p]), acl); // Like 'Read' etc
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
return serialize(acl, g, aclURI);
|
|
110
|
+
}
|
|
111
|
+
return {
|
|
112
|
+
findAclDocUrl,
|
|
113
|
+
setACLUserPublic,
|
|
114
|
+
genACLText
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
//# sourceMappingURL=aclLogic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aclLogic.js","sourceRoot":"","sources":["../../src/acl/aclLogic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authSession.js","sourceRoot":"","sources":["../../src/authSession/authSession.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,GACR,MAAM,oCAAoC,CAAA;AAE3C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,OAAO,EAAE,CAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { NamedNode } from
|
|
2
|
-
import { Session } from
|
|
3
|
-
import { AuthenticationContext, AuthnLogic } from
|
|
1
|
+
import { NamedNode } from 'rdflib';
|
|
2
|
+
import { Session } from '@inrupt/solid-client-authn-browser';
|
|
3
|
+
import { AuthenticationContext, AuthnLogic } from '../types';
|
|
4
4
|
export declare class SolidAuthnLogic implements AuthnLogic {
|
|
5
5
|
private session;
|
|
6
6
|
constructor(solidAuthSession: Session);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolidAuthnLogic.d.ts","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,SAAS,EAAO,MAAM,QAAQ,
|
|
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"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { namedNode, sym } from 'rdflib';
|
|
2
|
+
import { appContext, offlineTestID } from './authUtil';
|
|
3
|
+
import * as debug from '../util/debug';
|
|
4
|
+
import { EVENTS } from '@inrupt/solid-client-authn-browser';
|
|
5
|
+
export class SolidAuthnLogic {
|
|
6
|
+
constructor(solidAuthSession) {
|
|
7
|
+
this.session = solidAuthSession;
|
|
8
|
+
}
|
|
9
|
+
// we created authSession getter because we want to access it as authn.authSession externally
|
|
10
|
+
get authSession() { return this.session; }
|
|
11
|
+
currentUser() {
|
|
12
|
+
const app = appContext();
|
|
13
|
+
if (app.viewingNoAuthPage) {
|
|
14
|
+
return sym(app.webId);
|
|
15
|
+
}
|
|
16
|
+
if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
|
|
17
|
+
return sym(this.session.info.webId);
|
|
18
|
+
}
|
|
19
|
+
return offlineTestID(); // null unless testing
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Retrieves currently logged in webId from either
|
|
23
|
+
* defaultTestUser or SolidAuth
|
|
24
|
+
* Also activates a session after login
|
|
25
|
+
* @param [setUserCallback] Optional callback
|
|
26
|
+
* @returns Resolves with webId uri, if no callback provided
|
|
27
|
+
*/
|
|
28
|
+
async checkUser(setUserCallback) {
|
|
29
|
+
// Save hash for "restorePreviousSession"
|
|
30
|
+
const preLoginRedirectHash = new URL(window.location.href).hash;
|
|
31
|
+
if (preLoginRedirectHash) {
|
|
32
|
+
window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
|
|
33
|
+
}
|
|
34
|
+
this.session.events.on(EVENTS.SESSION_RESTORED, (url) => {
|
|
35
|
+
debug.log(`Session restored to ${url}`);
|
|
36
|
+
if (document.location.toString() !== url)
|
|
37
|
+
history.replaceState(null, '', url);
|
|
38
|
+
});
|
|
39
|
+
/**
|
|
40
|
+
* Handle a successful authentication redirect
|
|
41
|
+
*/
|
|
42
|
+
const redirectUrl = new URL(window.location.href);
|
|
43
|
+
redirectUrl.hash = '';
|
|
44
|
+
await this.session
|
|
45
|
+
.handleIncomingRedirect({
|
|
46
|
+
restorePreviousSession: true,
|
|
47
|
+
url: redirectUrl.href
|
|
48
|
+
});
|
|
49
|
+
// Check to see if a hash was stored in local storage
|
|
50
|
+
const postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
|
|
51
|
+
if (postLoginRedirectHash) {
|
|
52
|
+
const curUrl = new URL(window.location.href);
|
|
53
|
+
if (curUrl.hash !== postLoginRedirectHash) {
|
|
54
|
+
if (history.pushState) {
|
|
55
|
+
// debug.log('Setting window.location.has using pushState')
|
|
56
|
+
history.pushState(null, document.title, postLoginRedirectHash);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
// debug.warn('Setting window.location.has using location.hash')
|
|
60
|
+
location.hash = postLoginRedirectHash;
|
|
61
|
+
}
|
|
62
|
+
curUrl.hash = postLoginRedirectHash;
|
|
63
|
+
}
|
|
64
|
+
// See https://stackoverflow.com/questions/3870057/how-can-i-update-window-location-hash-without-jumping-the-document
|
|
65
|
+
// window.location.href = curUrl.toString()// @@ See https://developer.mozilla.org/en-US/docs/Web/API/Window/location
|
|
66
|
+
window.localStorage.setItem('preLoginRedirectHash', '');
|
|
67
|
+
}
|
|
68
|
+
// Check to see if already logged in / have the WebID
|
|
69
|
+
let me = offlineTestID();
|
|
70
|
+
if (me) {
|
|
71
|
+
return Promise.resolve(setUserCallback ? setUserCallback(me) : me);
|
|
72
|
+
}
|
|
73
|
+
const webId = this.webIdFromSession(this.session.info);
|
|
74
|
+
if (webId) {
|
|
75
|
+
me = this.saveUser(webId);
|
|
76
|
+
}
|
|
77
|
+
if (me) {
|
|
78
|
+
debug.log(`(Logged in as ${me} by authentication)`);
|
|
79
|
+
}
|
|
80
|
+
return Promise.resolve(setUserCallback ? setUserCallback(me) : me);
|
|
81
|
+
}
|
|
82
|
+
/**
|
|
83
|
+
* Saves `webId` in `context.me`
|
|
84
|
+
* @param webId
|
|
85
|
+
* @param context
|
|
86
|
+
*
|
|
87
|
+
* @returns Returns the WebID, after setting it
|
|
88
|
+
*/
|
|
89
|
+
saveUser(webId, context) {
|
|
90
|
+
let webIdUri;
|
|
91
|
+
if (webId) {
|
|
92
|
+
webIdUri = (typeof webId === 'string') ? webId : webId.uri;
|
|
93
|
+
const me = namedNode(webIdUri);
|
|
94
|
+
if (context) {
|
|
95
|
+
context.me = me;
|
|
96
|
+
}
|
|
97
|
+
return me;
|
|
98
|
+
}
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
101
|
+
/**
|
|
102
|
+
* @returns {Promise<string|null>} Resolves with WebID URI or null
|
|
103
|
+
*/
|
|
104
|
+
webIdFromSession(session) {
|
|
105
|
+
const webId = (session === null || session === void 0 ? void 0 : session.webId) && session.isLoggedIn ? session.webId : null;
|
|
106
|
+
return webId;
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=SolidAuthnLogic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SolidAuthnLogic.js","sourceRoot":"","sources":["../../src/authn/SolidAuthnLogic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import { sym } from 'rdflib';
|
|
2
|
+
import * as debug from '../util/debug';
|
|
3
|
+
/**
|
|
4
|
+
* find a user or app's context as set in window.SolidAppContext
|
|
5
|
+
* this is a const, not a function, because we have problems to jest mock it otherwise
|
|
6
|
+
* see: https://github.com/facebook/jest/issues/936#issuecomment-545080082 for more
|
|
7
|
+
* @return {any} - an appContext object
|
|
8
|
+
*/
|
|
9
|
+
export const appContext = () => {
|
|
10
|
+
let { SolidAppContext } = window;
|
|
11
|
+
SolidAppContext || (SolidAppContext = {});
|
|
12
|
+
SolidAppContext.viewingNoAuthPage = false;
|
|
13
|
+
if (SolidAppContext.noAuth && window.document) {
|
|
14
|
+
const currentPage = window.document.location.href;
|
|
15
|
+
if (currentPage.startsWith(SolidAppContext.noAuth)) {
|
|
16
|
+
SolidAppContext.viewingNoAuthPage = true;
|
|
17
|
+
const params = new URLSearchParams(window.document.location.search);
|
|
18
|
+
if (params) {
|
|
19
|
+
let viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
|
|
20
|
+
if (viewedPage) {
|
|
21
|
+
viewedPage = decodeURI(viewedPage);
|
|
22
|
+
if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
|
|
23
|
+
const ary = viewedPage.split(/\//);
|
|
24
|
+
SolidAppContext.idp = ary[0] + '//' + ary[2];
|
|
25
|
+
SolidAppContext.viewingNoAuthPage = false;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
return SolidAppContext;
|
|
32
|
+
};
|
|
33
|
+
/**
|
|
34
|
+
* Returns `sym($SolidTestEnvironment.username)` if
|
|
35
|
+
* `$SolidTestEnvironment.username` is defined as a global
|
|
36
|
+
* or
|
|
37
|
+
* returns testID defined in the HTML page
|
|
38
|
+
* @returns {NamedNode|null}
|
|
39
|
+
*/
|
|
40
|
+
export function offlineTestID() {
|
|
41
|
+
const { $SolidTestEnvironment } = window;
|
|
42
|
+
if (typeof $SolidTestEnvironment !== 'undefined' &&
|
|
43
|
+
$SolidTestEnvironment.username) {
|
|
44
|
+
// Test setup
|
|
45
|
+
debug.log('Assuming the user is ' + $SolidTestEnvironment.username);
|
|
46
|
+
return sym($SolidTestEnvironment.username);
|
|
47
|
+
}
|
|
48
|
+
// hack that makes SolidOS work in offline mode by adding the webId directly in html
|
|
49
|
+
// example usage: https://github.com/solidos/mashlib/blob/29b8b53c46bf02e0e219f0bacd51b0e9951001dd/test/contact/local.html#L37
|
|
50
|
+
if (typeof document !== 'undefined' &&
|
|
51
|
+
document.location &&
|
|
52
|
+
('' + document.location).slice(0, 16) === 'http://localhost') {
|
|
53
|
+
const div = document.getElementById('appTarget');
|
|
54
|
+
if (!div)
|
|
55
|
+
return null;
|
|
56
|
+
const id = div.getAttribute('testID');
|
|
57
|
+
if (!id)
|
|
58
|
+
return null;
|
|
59
|
+
debug.log('Assuming user is ' + id);
|
|
60
|
+
return sym(id);
|
|
61
|
+
}
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=authUtil.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"authUtil.js","sourceRoot":"","sources":["../../src/authn/authUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,GAAG,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,eAAe,CAAA;AAEtC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,GAAO,EAAE;IAC/B,IAAI,EAAE,eAAe,EAAE,GAAQ,MAAM,CAAA;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,MAAM,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,MAAM,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,MAAM,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;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa;IACzB,MAAM,EAAE,qBAAqB,EAAE,GAAQ,MAAM,CAAA;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,GAAG,CAAC,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,MAAM,GAAG,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;QAChD,IAAI,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACrB,MAAM,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,GAAG,CAAC,EAAE,CAAC,CAAA;IAChB,CAAC;IACD,OAAO,IAAI,CAAA;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatLogic.d.ts","sourceRoot":"","sources":["../../src/chat/chatLogic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA4C,MAAM,UAAU,CAAA;AAM9E,wBAAgB,eAAe,CAAC,KAAK,KAAA,EAAE,YAAY,KAAA,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"chatLogic.d.ts","sourceRoot":"","sources":["../../src/chat/chatLogic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAA4C,MAAM,UAAU,CAAA;AAM9E,wBAAgB,eAAe,CAAC,KAAK,KAAA,EAAE,YAAY,KAAA,GAAG,SAAS,CAyN9D"}
|
|
@@ -0,0 +1,157 @@
|
|
|
1
|
+
import { NamedNode, st, term } from 'rdflib';
|
|
2
|
+
import { ns as namespace } from '../util/ns';
|
|
3
|
+
import { determineChatContainer, newThing } from '../util/utils';
|
|
4
|
+
const CHAT_LOCATION_IN_CONTAINER = 'index.ttl#this';
|
|
5
|
+
export function createChatLogic(store, profileLogic) {
|
|
6
|
+
const ns = namespace;
|
|
7
|
+
async function setAcl(chatContainer, me, invitee) {
|
|
8
|
+
// Some servers don't present a Link http response header
|
|
9
|
+
// if the container doesn't exist yet, so refetch the container
|
|
10
|
+
// now that it has been created:
|
|
11
|
+
await store.fetcher.load(chatContainer);
|
|
12
|
+
// FIXME: check the Why value on this quad:
|
|
13
|
+
const chatAclDoc = store.any(chatContainer, new NamedNode('http://www.iana.org/assignments/link-relations/acl'));
|
|
14
|
+
if (!chatAclDoc) {
|
|
15
|
+
throw new Error('Chat ACL doc not found!');
|
|
16
|
+
}
|
|
17
|
+
const aclBody = `
|
|
18
|
+
@prefix acl: <http://www.w3.org/ns/auth/acl#>.
|
|
19
|
+
<#owner>
|
|
20
|
+
a acl:Authorization;
|
|
21
|
+
acl:agent <${me.value}>;
|
|
22
|
+
acl:accessTo <.>;
|
|
23
|
+
acl:default <.>;
|
|
24
|
+
acl:mode
|
|
25
|
+
acl:Read, acl:Write, acl:Control.
|
|
26
|
+
<#invitee>
|
|
27
|
+
a acl:Authorization;
|
|
28
|
+
acl:agent <${invitee.value}>;
|
|
29
|
+
acl:accessTo <.>;
|
|
30
|
+
acl:default <.>;
|
|
31
|
+
acl:mode
|
|
32
|
+
acl:Read, acl:Append.
|
|
33
|
+
`;
|
|
34
|
+
await store.fetcher.webOperation('PUT', chatAclDoc.value, {
|
|
35
|
+
data: aclBody,
|
|
36
|
+
contentType: 'text/turtle',
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
async function addToPrivateTypeIndex(chatThing, me) {
|
|
40
|
+
// Add to private type index
|
|
41
|
+
const privateTypeIndex = store.any(me, ns.solid('privateTypeIndex'));
|
|
42
|
+
if (!privateTypeIndex) {
|
|
43
|
+
throw new Error('Private type index not found!');
|
|
44
|
+
}
|
|
45
|
+
await store.fetcher.load(privateTypeIndex);
|
|
46
|
+
const reg = newThing(privateTypeIndex);
|
|
47
|
+
const ins = [
|
|
48
|
+
st(reg, ns.rdf('type'), ns.solid('TypeRegistration'), privateTypeIndex.doc()),
|
|
49
|
+
st(reg, ns.solid('forClass'), ns.meeting('LongChat'), privateTypeIndex.doc()),
|
|
50
|
+
st(reg, ns.solid('instance'), chatThing, privateTypeIndex.doc()),
|
|
51
|
+
];
|
|
52
|
+
await new Promise((resolve, reject) => {
|
|
53
|
+
store.updater.update([], ins, function (_uri, ok, errm) {
|
|
54
|
+
if (!ok) {
|
|
55
|
+
reject(new Error(errm));
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
resolve(null);
|
|
59
|
+
}
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
async function findChat(invitee) {
|
|
64
|
+
const me = await profileLogic.loadMe();
|
|
65
|
+
const podRoot = await profileLogic.getPodRoot(me);
|
|
66
|
+
const chatContainer = determineChatContainer(invitee, podRoot);
|
|
67
|
+
let exists = true;
|
|
68
|
+
try {
|
|
69
|
+
await store.fetcher.load(new NamedNode(chatContainer.value + 'index.ttl#this'));
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
exists = false;
|
|
73
|
+
}
|
|
74
|
+
return { me, chatContainer, exists };
|
|
75
|
+
}
|
|
76
|
+
async function createChatThing(chatContainer, me) {
|
|
77
|
+
const created = await mintNew({
|
|
78
|
+
me,
|
|
79
|
+
newBase: chatContainer.value,
|
|
80
|
+
});
|
|
81
|
+
return created.newInstance;
|
|
82
|
+
}
|
|
83
|
+
function mintNew(newPaneOptions) {
|
|
84
|
+
const kb = store;
|
|
85
|
+
const updater = kb.updater;
|
|
86
|
+
if (newPaneOptions.me && !newPaneOptions.me.uri) {
|
|
87
|
+
throw new Error('chat mintNew: Invalid userid ' + newPaneOptions.me);
|
|
88
|
+
}
|
|
89
|
+
const newInstance = (newPaneOptions.newInstance =
|
|
90
|
+
newPaneOptions.newInstance ||
|
|
91
|
+
kb.sym(newPaneOptions.newBase + CHAT_LOCATION_IN_CONTAINER));
|
|
92
|
+
const newChatDoc = newInstance.doc();
|
|
93
|
+
kb.add(newInstance, ns.rdf('type'), ns.meeting('LongChat'), newChatDoc);
|
|
94
|
+
kb.add(newInstance, ns.dc('title'), 'Chat channel', newChatDoc);
|
|
95
|
+
kb.add(newInstance, ns.dc('created'), term(new Date(Date.now())), newChatDoc);
|
|
96
|
+
if (newPaneOptions.me) {
|
|
97
|
+
kb.add(newInstance, ns.dc('author'), newPaneOptions.me, newChatDoc);
|
|
98
|
+
}
|
|
99
|
+
return new Promise(function (resolve, reject) {
|
|
100
|
+
updater === null || updater === void 0 ? void 0 : updater.put(newChatDoc, kb.statementsMatching(undefined, undefined, undefined, newChatDoc), 'text/turtle', function (uri2, ok, message) {
|
|
101
|
+
if (ok) {
|
|
102
|
+
resolve({
|
|
103
|
+
...newPaneOptions,
|
|
104
|
+
newInstance,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
reject(new Error('FAILED to save new chat channel at: ' + uri2 + ' : ' + message));
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
});
|
|
112
|
+
}
|
|
113
|
+
/**
|
|
114
|
+
* Find (and optionally create) an individual chat between the current user and the given invitee
|
|
115
|
+
* @param invitee - The person to chat with
|
|
116
|
+
* @param createIfMissing - Whether the chat should be created, if missing
|
|
117
|
+
* @returns null if missing, or a node referring to an already existing chat, or the newly created chat
|
|
118
|
+
*/
|
|
119
|
+
async function getChat(invitee, createIfMissing = true) {
|
|
120
|
+
const { me, chatContainer, exists } = await findChat(invitee);
|
|
121
|
+
if (exists) {
|
|
122
|
+
return new NamedNode(chatContainer.value + CHAT_LOCATION_IN_CONTAINER);
|
|
123
|
+
}
|
|
124
|
+
if (createIfMissing) {
|
|
125
|
+
const chatThing = await createChatThing(chatContainer, me);
|
|
126
|
+
await sendInvite(invitee, chatThing);
|
|
127
|
+
await setAcl(chatContainer, me, invitee);
|
|
128
|
+
await addToPrivateTypeIndex(chatThing, me);
|
|
129
|
+
return chatThing;
|
|
130
|
+
}
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
async function sendInvite(invitee, chatThing) {
|
|
134
|
+
var _a;
|
|
135
|
+
await store.fetcher.load(invitee.doc());
|
|
136
|
+
const inviteeInbox = store.any(invitee, ns.ldp('inbox'), undefined, invitee.doc());
|
|
137
|
+
if (!inviteeInbox) {
|
|
138
|
+
throw new Error(`Invitee inbox not found! ${invitee.value}`);
|
|
139
|
+
}
|
|
140
|
+
const inviteBody = `
|
|
141
|
+
<> a <http://www.w3.org/ns/pim/meeting#LongChatInvite> ;
|
|
142
|
+
${ns.rdf('seeAlso')} <${chatThing.value}> .
|
|
143
|
+
`;
|
|
144
|
+
const inviteResponse = await ((_a = store.fetcher) === null || _a === void 0 ? void 0 : _a.webOperation('POST', inviteeInbox.value, {
|
|
145
|
+
data: inviteBody,
|
|
146
|
+
contentType: 'text/turtle',
|
|
147
|
+
}));
|
|
148
|
+
const locationStr = inviteResponse === null || inviteResponse === void 0 ? void 0 : inviteResponse.headers.get('location');
|
|
149
|
+
if (!locationStr) {
|
|
150
|
+
throw new Error(`Invite sending returned a ${inviteResponse === null || inviteResponse === void 0 ? void 0 : inviteResponse.status}`);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return {
|
|
154
|
+
setAcl, addToPrivateTypeIndex, findChat, createChatThing, getChat, sendInvite, mintNew
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
//# sourceMappingURL=chatLogic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chatLogic.js","sourceRoot":"","sources":["../../src/chat/chatLogic.ts"],"names":[],"mappings":"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"}
|