@ldo/solid-react 1.0.0-alpha.46 → 1.0.0-alpha.48
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 +5 -5
- package/dist/SolidAuthContext.cjs +3 -1
- package/dist/SolidAuthContext.d.cts +18 -0
- package/dist/SolidAuthContext.d.cts.map +1 -0
- package/dist/SolidAuthContext.d.mts +18 -0
- package/dist/SolidAuthContext.d.mts.map +1 -0
- package/dist/SolidAuthContext.mjs +3 -1
- package/dist/SolidAuthContext.mjs.map +1 -1
- package/dist/createBrowserSolidReactMethods.cjs +62 -53
- package/dist/createBrowserSolidReactMethods.d.cts +13 -7
- package/dist/createBrowserSolidReactMethods.d.cts.map +1 -1
- package/dist/createBrowserSolidReactMethods.d.mts +12 -6
- package/dist/createBrowserSolidReactMethods.d.mts.map +1 -1
- package/dist/createBrowserSolidReactMethods.mjs +62 -54
- package/dist/createBrowserSolidReactMethods.mjs.map +1 -1
- package/dist/defaultIntance.d.cts +17 -4
- package/dist/defaultIntance.d.cts.map +1 -1
- package/dist/defaultIntance.d.mts +17 -4
- package/dist/defaultIntance.d.mts.map +1 -1
- package/dist/node_modules/@rdfjs/types/data-model.d.cts +159 -0
- package/dist/node_modules/@rdfjs/types/data-model.d.cts.map +1 -0
- package/dist/node_modules/@rdfjs/types/data-model.d.mts +159 -0
- package/dist/node_modules/@rdfjs/types/data-model.d.mts.map +1 -0
- package/dist/packages/dataset/dist/createDatasetFromSerializedInput.d.cts +1 -0
- package/dist/packages/dataset/dist/createDatasetFromSerializedInput.d.mts +1 -0
- package/dist/packages/dataset/dist/createExtendedDatasetFromSerializedInput.d.cts +1 -0
- package/dist/packages/dataset/dist/createExtendedDatasetFromSerializedInput.d.mts +1 -0
- package/dist/packages/dataset/dist/index.d.cts +1 -0
- package/dist/packages/dataset/dist/index.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/ContextUtil.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/ContextUtil.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/JsonldDatasetProxyBuilder.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/JsonldDatasetProxyBuilder.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/LdoJsonldContext.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/LdoJsonldContext.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/ProxyContext.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/ProxyContext.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/graphOf.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/graphOf.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/index.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/index.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/jsonldDatasetProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/jsonldDatasetProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/language/languageMapProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/language/languageMapProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/language/languageUtils.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/language/languageUtils.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/SetProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/SetProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/createNewSetProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/createNewSetProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/isSetProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/isSetProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/ldSet/LdSet.d.cts +166 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/ldSet/LdSet.d.cts.map +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/ldSet/LdSet.d.mts +166 -0
- package/dist/packages/jsonld-dataset-proxy/dist/setProxy/ldSet/LdSet.d.mts.map +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/SubjectProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/SubjectProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/createSubjectHandler.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/createSubjectHandler.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/deleteFromDataset.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/deleteFromDataset.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/getValueForKey.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/getValueForKey.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/isSubjectProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/subjectProxy/isSubjectProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/NodeSet.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/NodeSet.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/addObjectToDataset.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/addObjectToDataset.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/getNodeFromRaw.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/getNodeFromRaw.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/isProxy.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/isProxy.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/nodeToJsonldRepresentation.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/util/nodeToJsonldRepresentation.d.mts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/write.d.cts +1 -0
- package/dist/packages/jsonld-dataset-proxy/dist/write.d.mts +1 -0
- package/dist/packages/ldo/dist/LdoBuilder.d.cts +1 -0
- package/dist/packages/ldo/dist/LdoBuilder.d.mts +1 -0
- package/dist/packages/ldo/dist/LdoDataset.d.cts +1 -0
- package/dist/packages/ldo/dist/LdoDataset.d.mts +1 -0
- package/dist/packages/ldo/dist/LdoDatasetFactory.d.cts +1 -0
- package/dist/packages/ldo/dist/LdoDatasetFactory.d.mts +1 -0
- package/dist/packages/ldo/dist/LdoTransactionDataset.d.cts +1 -0
- package/dist/packages/ldo/dist/LdoTransactionDataset.d.mts +1 -0
- package/dist/packages/ldo/dist/ShapeType.d.cts +61 -0
- package/dist/packages/ldo/dist/ShapeType.d.cts.map +1 -0
- package/dist/packages/ldo/dist/ShapeType.d.mts +61 -0
- package/dist/packages/ldo/dist/ShapeType.d.mts.map +1 -0
- package/dist/packages/ldo/dist/createLdoDataset.d.cts +1 -0
- package/dist/packages/ldo/dist/createLdoDataset.d.mts +1 -0
- package/dist/packages/ldo/dist/index.d.cts +9 -0
- package/dist/packages/ldo/dist/index.d.cts.map +1 -0
- package/dist/packages/ldo/dist/index.d.mts +9 -0
- package/dist/packages/ldo/dist/index.d.mts.map +1 -0
- package/dist/packages/ldo/dist/methods.d.cts +1 -0
- package/dist/packages/ldo/dist/methods.d.mts +1 -0
- package/dist/packages/ldo/dist/node_modules/@types/shexj/index.d.cts +547 -0
- package/dist/packages/ldo/dist/node_modules/@types/shexj/index.d.cts.map +1 -0
- package/dist/packages/ldo/dist/node_modules/@types/shexj/index.d.mts +547 -0
- package/dist/packages/ldo/dist/node_modules/@types/shexj/index.d.mts.map +1 -0
- package/dist/packages/ldo/dist/parseRdf.d.cts +1 -0
- package/dist/packages/ldo/dist/parseRdf.d.mts +1 -0
- package/dist/packages/ldo/dist/types.d.cts +1 -0
- package/dist/packages/ldo/dist/types.d.mts +1 -0
- package/dist/packages/ldo/dist/util.d.cts +10 -0
- package/dist/packages/ldo/dist/util.d.cts.map +1 -0
- package/dist/packages/ldo/dist/util.d.mts +10 -0
- package/dist/packages/ldo/dist/util.d.mts.map +1 -0
- package/dist/packages/rdf-utils/dist/datasetConverters.d.cts +1 -0
- package/dist/packages/rdf-utils/dist/datasetConverters.d.mts +1 -0
- package/dist/packages/rdf-utils/dist/index.d.cts +1 -0
- package/dist/packages/rdf-utils/dist/index.d.mts +1 -0
- package/dist/packages/rdf-utils/dist/nodeSerialization.d.cts +21 -0
- package/dist/packages/rdf-utils/dist/nodeSerialization.d.cts.map +1 -0
- package/dist/packages/rdf-utils/dist/nodeSerialization.d.mts +21 -0
- package/dist/packages/rdf-utils/dist/nodeSerialization.d.mts.map +1 -0
- package/dist/packages/rdf-utils/dist/rdfjsDataModel.d.cts +1 -0
- package/dist/packages/rdf-utils/dist/rdfjsDataModel.d.mts +1 -0
- package/dist/packages/rdf-utils/dist/serializedToQuads.d.cts +1 -0
- package/dist/packages/rdf-utils/dist/serializedToQuads.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/SubscribableDataset.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/SubscribableDataset.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/SubscribableDatasetFactory.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/SubscribableDatasetFactory.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/TransactionDataset.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/TransactionDataset.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/TransactionDatasetFactory.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/TransactionDatasetFactory.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/createSubscribableDataset.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/createSubscribableDataset.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/createSubscribableDatasetFromSerializedInput.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/createSubscribableDatasetFromSerializedInput.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/index.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/index.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/mergeDatasetChanges.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/mergeDatasetChanges.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/types.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/types.d.mts +1 -0
- package/dist/packages/subscribable-dataset/dist/util.d.cts +1 -0
- package/dist/packages/subscribable-dataset/dist/util.d.mts +1 -0
- package/dist/useRootContainerFor.mjs.map +1 -1
- package/package.json +8 -7
- package/src/SolidAuthContext.ts +14 -17
- package/src/UnauthenticatedSolidLdoProvider.tsx +17 -34
- package/src/createBrowserSolidReactMethods.tsx +82 -87
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodeSerialization.d.mts","names":["BlankNode","DefaultGraph","Literal","NamedNode","Quad","Term","NodeTermTypes","Node","Set","SubjectNode","SubjectTermTypes","PredicateNode","PredicateTermTypes","ObjectNode","ObjectTermTypes","GraphNode","GraphTermTypes","AnyNode","AnyTermTypes","SimpleQuad","subject","predicate","object","graph","QuadMatch","subjectNodeToString","node","predicateNodeToString","objectNodeToString","grpahNodeToString","nodeToString","quadToString","quad","quadMatchToString","quadMatch","stringToSubjectNode","input","stringToPredicateNode","stringToObjectNode","stringToGraphNode","stringToNode","expectTermType","stringToQuad","stringToQuadMatch"],"sources":["../../../../../rdf-utils/dist/nodeSerialization.d.mts"],"mappings":";;;KAYKS,WAAAA,GAAcN,SAAAA,GAAYH,SAAAA;AAAAA,KAE1BW,aAAAA,GAAgBR,SAAAA;AAAAA,KAEhBU,UAAAA,GAAaV,SAAAA,GAAYH,SAAAA,GAAYE,OAAAA;AAAAA,KAErCa,SAAAA,GAAYZ,SAAAA,GAAYH,SAAAA,GAAYC,YAAAA;AAAAA,KA0BpCuB,SAAAA,IAAaf,WAAAA,qBAAgCE,aAAAA,qBAAkCE,UAAAA,qBAA+BE,SAAAA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
package/dist/packages/subscribable-dataset/dist/createSubscribableDatasetFromSerializedInput.d.cts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
package/dist/packages/subscribable-dataset/dist/createSubscribableDatasetFromSerializedInput.d.mts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRootContainerFor.mjs","names":[],"sources":["../src/useRootContainerFor.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\nimport type { ConnectedLdoDataset, ConnectedPlugin } from \"@ldo/connected\";\nimport type {\n SolidConnectedPlugin,\n SolidContainer,\n SolidContainerUri,\n SolidLeafUri,\n} from \"@ldo/connected-solid\";\nimport type { UseResourceOptions, createUseResource } from \"@ldo/react\";\n\n/**\n * @internal\n *\n * Creates a useRootContainerFor function\n */\nexport function createUseRootContainerFor(\n dataset: ConnectedLdoDataset<SolidConnectedPlugin[]>,\n useResource: ReturnType<typeof createUseResource<ConnectedPlugin[]>>,\n) {\n /**\n * Gets the root container for a specific URI\n */\n return function useRootContainerFor(\n uri?: SolidContainerUri | SolidLeafUri,\n options?: UseResourceOptions<\"solid\">,\n ): SolidContainer | undefined {\n const [rootContainerUri, setRootContainerUri] = useState<\n SolidContainerUri | undefined\n >(undefined);\n\n useEffect(() => {\n if (uri) {\n const givenResource = dataset.getResource(uri);\n givenResource.getRootContainer().then((result) => {\n if (!result.isError) {\n setRootContainerUri(result.uri);\n }\n });\n } else {\n setRootContainerUri(undefined);\n }\n }, [uri]);\n\n return useResource(rootContainerUri, options) as SolidContainer | undefined;\n };\n}\n"],"mappings":";;;;;;;AAeA,SAAgB,0BACd,SACA,aACA;;;;AAIA,QAAO,SAAS,oBACd,KACA,SAC4B;EAC5B,MAAM,CAAC,kBAAkB,uBAAuB,SAE9C,KAAA,EAAU;AAEZ,kBAAgB;AACd,OAAI,IACoB,SAAQ,YAAY,
|
|
1
|
+
{"version":3,"file":"useRootContainerFor.mjs","names":[],"sources":["../src/useRootContainerFor.ts"],"sourcesContent":["import { useEffect, useState } from \"react\";\nimport type { ConnectedLdoDataset, ConnectedPlugin } from \"@ldo/connected\";\nimport type {\n SolidConnectedPlugin,\n SolidContainer,\n SolidContainerUri,\n SolidLeafUri,\n} from \"@ldo/connected-solid\";\nimport type { UseResourceOptions, createUseResource } from \"@ldo/react\";\n\n/**\n * @internal\n *\n * Creates a useRootContainerFor function\n */\nexport function createUseRootContainerFor(\n dataset: ConnectedLdoDataset<SolidConnectedPlugin[]>,\n useResource: ReturnType<typeof createUseResource<ConnectedPlugin[]>>,\n) {\n /**\n * Gets the root container for a specific URI\n */\n return function useRootContainerFor(\n uri?: SolidContainerUri | SolidLeafUri,\n options?: UseResourceOptions<\"solid\">,\n ): SolidContainer | undefined {\n const [rootContainerUri, setRootContainerUri] = useState<\n SolidContainerUri | undefined\n >(undefined);\n\n useEffect(() => {\n if (uri) {\n const givenResource = dataset.getResource(uri);\n givenResource.getRootContainer().then((result) => {\n if (!result.isError) {\n setRootContainerUri(result.uri);\n }\n });\n } else {\n setRootContainerUri(undefined);\n }\n }, [uri]);\n\n return useResource(rootContainerUri, options) as SolidContainer | undefined;\n };\n}\n"],"mappings":";;;;;;;AAeA,SAAgB,0BACd,SACA,aACA;;;;AAIA,QAAO,SAAS,oBACd,KACA,SAC4B;EAC5B,MAAM,CAAC,kBAAkB,uBAAuB,SAE9C,KAAA,EAAU;AAEZ,kBAAgB;AACd,OAAI,IACoB,SAAQ,YAAY,IAC7B,CAAC,kBAAkB,CAAC,MAAM,WAAW;AAChD,QAAI,CAAC,OAAO,QACV,qBAAoB,OAAO,IAAI;KAEjC;OAEF,qBAAoB,KAAA,EAAU;KAE/B,CAAC,IAAI,CAAC;AAET,SAAO,YAAY,kBAAkB,QAAQ"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ldo/solid-react",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.48",
|
|
4
4
|
"description": "A React library for LDO and Solid",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.cjs",
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
},
|
|
22
22
|
"scripts": {
|
|
23
23
|
"build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 tsdown",
|
|
24
|
+
"dev": "vite --config dev/vite.config.ts --host 127.0.0.1",
|
|
24
25
|
"test": "vitest run --coverage",
|
|
25
26
|
"prepublishOnly": "npm run build",
|
|
26
27
|
"build:ldo": "ldo build --input src/shapes --output src/ldo",
|
|
@@ -40,7 +41,7 @@
|
|
|
40
41
|
"devDependencies": {
|
|
41
42
|
"@babel/core": "^7.26.10",
|
|
42
43
|
"@babel/preset-env": "^7.26.9",
|
|
43
|
-
"@ldo/rdf-utils": "^1.0.0-alpha.
|
|
44
|
+
"@ldo/rdf-utils": "^1.0.0-alpha.48",
|
|
44
45
|
"@rdfjs/types": "^1.0.1",
|
|
45
46
|
"@testing-library/react": "^14.1.2",
|
|
46
47
|
"remove-dist": "rimraf dist/",
|
|
@@ -48,10 +49,10 @@
|
|
|
48
49
|
"whatwg-fetch": "^3.6.20"
|
|
49
50
|
},
|
|
50
51
|
"dependencies": {
|
|
51
|
-
"@
|
|
52
|
-
"@ldo/connected": "^1.0.0-alpha.
|
|
53
|
-
"@ldo/
|
|
54
|
-
"@
|
|
52
|
+
"@ldo/connected": "^1.0.0-alpha.48",
|
|
53
|
+
"@ldo/connected-solid": "^1.0.0-alpha.48",
|
|
54
|
+
"@ldo/react": "^1.0.0-alpha.48",
|
|
55
|
+
"@uvdsl/solid-oidc-client-browser": "^0.2.2",
|
|
55
56
|
"cross-fetch": "^3.1.6"
|
|
56
57
|
},
|
|
57
58
|
"files": [
|
|
@@ -61,5 +62,5 @@
|
|
|
61
62
|
"publishConfig": {
|
|
62
63
|
"access": "public"
|
|
63
64
|
},
|
|
64
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "088bddcc93bb029bc538c5a08dbf74eba3d25129"
|
|
65
66
|
}
|
package/src/SolidAuthContext.ts
CHANGED
|
@@ -1,29 +1,26 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
ISessionInfo,
|
|
3
|
-
ILoginInputOptions,
|
|
4
|
-
} from "@inrupt/solid-client-authn-core";
|
|
1
|
+
import type { SessionCore } from "@uvdsl/solid-oidc-client-browser/core";
|
|
5
2
|
import { createContext, useContext } from "react";
|
|
6
3
|
|
|
7
|
-
export type SessionInfo = ISessionInfo;
|
|
8
|
-
export type LoginOptions = ILoginInputOptions;
|
|
9
|
-
|
|
10
4
|
/**
|
|
11
5
|
* Functions for authenticating with Solid
|
|
12
6
|
*/
|
|
13
7
|
export interface SolidAuthFunctions {
|
|
14
|
-
login:
|
|
15
|
-
logout:
|
|
16
|
-
signUp:
|
|
17
|
-
fetch:
|
|
18
|
-
session:
|
|
8
|
+
login: SessionCore["login"];
|
|
9
|
+
logout: SessionCore["logout"];
|
|
10
|
+
signUp: SessionCore["login"];
|
|
11
|
+
fetch: SessionCore["authFetch"];
|
|
12
|
+
session: SessionCore;
|
|
19
13
|
ranInitialAuthCheck: boolean;
|
|
20
14
|
}
|
|
21
15
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
export const SolidAuthContext = createContext<SolidAuthFunctions>(undefined);
|
|
16
|
+
export const SolidAuthContext = createContext<SolidAuthFunctions | undefined>(
|
|
17
|
+
undefined,
|
|
18
|
+
);
|
|
26
19
|
|
|
27
20
|
export function useSolidAuth(): SolidAuthFunctions {
|
|
28
|
-
|
|
21
|
+
const solidAuth = useContext(SolidAuthContext);
|
|
22
|
+
if (!solidAuth) {
|
|
23
|
+
throw new Error("useSolidAuth must be used within a SolidAuthContext");
|
|
24
|
+
}
|
|
25
|
+
return solidAuth;
|
|
29
26
|
}
|
|
@@ -1,59 +1,42 @@
|
|
|
1
1
|
/* istanbul ignore file */
|
|
2
2
|
import React, { useCallback, useMemo } from "react";
|
|
3
3
|
import type { FunctionComponent, PropsWithChildren } from "react";
|
|
4
|
-
import
|
|
4
|
+
import { SessionCore } from "@uvdsl/solid-oidc-client-browser/core";
|
|
5
|
+
import type { SolidAuthFunctions } from "./SolidAuthContext";
|
|
5
6
|
import { SolidAuthContext } from "./SolidAuthContext";
|
|
6
7
|
import libraryFetch from "cross-fetch";
|
|
7
8
|
|
|
8
|
-
const DUMMY_SESSION: SessionInfo = {
|
|
9
|
-
isLoggedIn: false,
|
|
10
|
-
webId: undefined,
|
|
11
|
-
clientAppId: undefined,
|
|
12
|
-
sessionId: "no_session",
|
|
13
|
-
expirationDate: undefined,
|
|
14
|
-
};
|
|
15
|
-
|
|
16
9
|
/**
|
|
17
10
|
* A provider for interacting with Solid Pods without authenticating
|
|
18
11
|
*/
|
|
19
12
|
export const UnauthenticatedSolidLdoProvider: FunctionComponent<
|
|
20
13
|
PropsWithChildren
|
|
21
14
|
> = ({ children }) => {
|
|
22
|
-
const
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
);
|
|
30
|
-
|
|
31
|
-
const logout = useCallback(async () => {
|
|
15
|
+
const session = useMemo(() => new SessionCore(), []);
|
|
16
|
+
const login = useCallback<SolidAuthFunctions["login"]>(async () => {
|
|
17
|
+
throw new Error(
|
|
18
|
+
"login is not available for a UnauthenticatedSolidLdoProvider",
|
|
19
|
+
);
|
|
20
|
+
}, []);
|
|
21
|
+
const logout = useCallback<SolidAuthFunctions["logout"]>(async () => {
|
|
32
22
|
throw new Error(
|
|
33
23
|
"logout is not available for a UnauthenticatedSolidLdoProvider",
|
|
34
24
|
);
|
|
35
25
|
}, []);
|
|
26
|
+
const fetch = useCallback<SolidAuthFunctions["fetch"]>((input, init) => {
|
|
27
|
+
return libraryFetch(input, init);
|
|
28
|
+
}, []);
|
|
36
29
|
|
|
37
|
-
const
|
|
38
|
-
async (_issuer: string, _options?: LoginOptions) => {
|
|
39
|
-
throw new Error(
|
|
40
|
-
"signUp is not available for a UnauthenticatedSolidLdoProvider",
|
|
41
|
-
);
|
|
42
|
-
},
|
|
43
|
-
[],
|
|
44
|
-
);
|
|
45
|
-
|
|
46
|
-
const solidAuthFunctions = useMemo(
|
|
30
|
+
const solidAuthFunctions = useMemo<SolidAuthFunctions>(
|
|
47
31
|
() => ({
|
|
48
|
-
runInitialAuthCheck: () => {},
|
|
49
32
|
login,
|
|
50
33
|
logout,
|
|
51
|
-
signUp,
|
|
52
|
-
|
|
34
|
+
signUp: login,
|
|
35
|
+
fetch,
|
|
36
|
+
session,
|
|
53
37
|
ranInitialAuthCheck: true,
|
|
54
|
-
fetch: libraryFetch,
|
|
55
38
|
}),
|
|
56
|
-
[login, logout,
|
|
39
|
+
[fetch, login, logout, session],
|
|
57
40
|
);
|
|
58
41
|
|
|
59
42
|
return (
|
|
@@ -1,20 +1,32 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { useEffect, useMemo, useState } from "react";
|
|
2
2
|
import type { FunctionComponent, PropsWithChildren } from "react";
|
|
3
|
-
import type { LoginOptions, SessionInfo } from "./SolidAuthContext";
|
|
4
3
|
import { SolidAuthContext, useSolidAuth } from "./SolidAuthContext";
|
|
5
|
-
import {
|
|
6
|
-
getDefaultSession,
|
|
7
|
-
handleIncomingRedirect,
|
|
8
|
-
login as libraryLogin,
|
|
9
|
-
logout as libraryLogout,
|
|
10
|
-
fetch as libraryFetch,
|
|
11
|
-
} from "@inrupt/solid-client-authn-browser";
|
|
4
|
+
import { Session as SolidOidcSession } from "@uvdsl/solid-oidc-client-browser";
|
|
12
5
|
import type { ConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
|
|
13
6
|
import type { SolidConnectedPlugin } from "@ldo/connected-solid";
|
|
14
7
|
import { createUseRootContainerFor } from "./useRootContainerFor";
|
|
15
8
|
import { createUseResource } from "@ldo/react";
|
|
9
|
+
import libraryFetch from "cross-fetch";
|
|
16
10
|
|
|
17
|
-
|
|
11
|
+
type SolidOidcBrowserSession = InstanceType<typeof SolidOidcSession>;
|
|
12
|
+
type BrowserSolidLdoProviderProps = PropsWithChildren<{
|
|
13
|
+
clientDetails?: ConstructorParameters<typeof SolidOidcSession>[0];
|
|
14
|
+
sessionOptions?: ConstructorParameters<typeof SolidOidcSession>[1];
|
|
15
|
+
}>;
|
|
16
|
+
|
|
17
|
+
function bindSessionMethods(
|
|
18
|
+
session: SolidOidcBrowserSession,
|
|
19
|
+
): SolidOidcBrowserSession {
|
|
20
|
+
session.login = session.login.bind(session);
|
|
21
|
+
session.handleRedirectFromLogin =
|
|
22
|
+
session.handleRedirectFromLogin.bind(session);
|
|
23
|
+
session.restore = session.restore.bind(session);
|
|
24
|
+
session.logout = session.logout.bind(session);
|
|
25
|
+
session.authFetch = session.authFetch.bind(session);
|
|
26
|
+
session.isExpired = session.isExpired.bind(session);
|
|
27
|
+
session.getExpiresIn = session.getExpiresIn.bind(session);
|
|
28
|
+
return session;
|
|
29
|
+
}
|
|
18
30
|
|
|
19
31
|
/**
|
|
20
32
|
* Creates special react methods specific to the Solid
|
|
@@ -24,98 +36,81 @@ const PRE_REDIRECT_URI = "PRE_REDIRECT_URI";
|
|
|
24
36
|
export function createBrowserSolidReactMethods(
|
|
25
37
|
dataset: ConnectedLdoDataset<(SolidConnectedPlugin | ConnectedPlugin)[]>,
|
|
26
38
|
) {
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
const [session, setSession] = useState<SessionInfo>(
|
|
33
|
-
getDefaultSession().info,
|
|
39
|
+
let currentSession: SolidOidcBrowserSession | undefined;
|
|
40
|
+
const authFetch = ((input: RequestInfo | URL, init?: RequestInit) => {
|
|
41
|
+
return (
|
|
42
|
+
currentSession?.authFetch(input as string | URL | Request, init) ??
|
|
43
|
+
libraryFetch(input, init)
|
|
34
44
|
);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
const runInitialAuthCheck = useCallback(async () => {
|
|
38
|
-
if (!window.localStorage.getItem(PRE_REDIRECT_URI)) {
|
|
39
|
-
window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href);
|
|
40
|
-
}
|
|
45
|
+
}) as typeof fetch;
|
|
41
46
|
|
|
42
|
-
|
|
43
|
-
restorePreviousSession: true,
|
|
44
|
-
});
|
|
45
|
-
// Set timout to ensure this happens after the redirect
|
|
46
|
-
setTimeout(() => {
|
|
47
|
-
setSession({ ...getDefaultSession().info });
|
|
48
|
-
window.history.replaceState(
|
|
49
|
-
{},
|
|
50
|
-
"",
|
|
51
|
-
window.localStorage.getItem(PRE_REDIRECT_URI),
|
|
52
|
-
);
|
|
53
|
-
window.localStorage.removeItem(PRE_REDIRECT_URI);
|
|
47
|
+
dataset.setContext("solid", { fetch: authFetch });
|
|
54
48
|
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
49
|
+
const BrowserSolidLdoProvider: FunctionComponent<
|
|
50
|
+
BrowserSolidLdoProviderProps
|
|
51
|
+
> = ({ children, clientDetails, sessionOptions }) => {
|
|
52
|
+
const [version, setVersion] = useState(0);
|
|
53
|
+
const [ranInitialAuthCheck, setRanInitialAuthCheck] = useState(false);
|
|
54
|
+
const [session] = useState(() => {
|
|
55
|
+
const solidSession = bindSessionMethods(
|
|
56
|
+
new SolidOidcSession(clientDetails, {
|
|
57
|
+
...sessionOptions,
|
|
58
|
+
onSessionStateChange: (event) => {
|
|
59
|
+
sessionOptions?.onSessionStateChange?.(event);
|
|
60
|
+
setVersion((currentVersion) => currentVersion + 1);
|
|
61
|
+
},
|
|
62
|
+
onSessionExpirationWarning: (event) => {
|
|
63
|
+
sessionOptions?.onSessionExpirationWarning?.(event);
|
|
64
|
+
setVersion((currentVersion) => currentVersion + 1);
|
|
65
|
+
},
|
|
66
|
+
onSessionExpiration: (event) => {
|
|
67
|
+
sessionOptions?.onSessionExpiration?.(event);
|
|
68
|
+
setVersion((currentVersion) => currentVersion + 1);
|
|
69
|
+
},
|
|
70
|
+
}),
|
|
71
|
+
);
|
|
72
|
+
currentSession = solidSession;
|
|
73
|
+
return solidSession;
|
|
74
|
+
});
|
|
58
75
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const cleanUrl = new URL(window.location.href);
|
|
62
|
-
cleanUrl.hash = "";
|
|
63
|
-
cleanUrl.search = "";
|
|
64
|
-
const fullOptions = {
|
|
65
|
-
redirectUrl: cleanUrl.toString(),
|
|
66
|
-
clientName: "Solid App",
|
|
67
|
-
oidcIssuer: issuer,
|
|
68
|
-
...options,
|
|
69
|
-
};
|
|
70
|
-
window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href);
|
|
71
|
-
await libraryLogin(fullOptions);
|
|
72
|
-
setSession({ ...getDefaultSession().info });
|
|
73
|
-
},
|
|
74
|
-
[],
|
|
75
|
-
);
|
|
76
|
+
useEffect(() => {
|
|
77
|
+
let isMounted = true;
|
|
76
78
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
async function initializeSession() {
|
|
80
|
+
await session.handleRedirectFromLogin();
|
|
81
|
+
if (!session.isActive) {
|
|
82
|
+
await session.restore().catch(() => undefined);
|
|
83
|
+
}
|
|
84
|
+
if (isMounted) {
|
|
85
|
+
setRanInitialAuthCheck(true);
|
|
86
|
+
setVersion((currentVersion) => currentVersion + 1);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
81
89
|
|
|
82
|
-
|
|
83
|
-
async (issuer: string, options?: LoginOptions) => {
|
|
84
|
-
// The typings on @inrupt/solid-client-authn-core have not yet been updated
|
|
85
|
-
// TODO: remove this ts-ignore when they are updated.
|
|
86
|
-
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
87
|
-
// @ts-ignore
|
|
88
|
-
return login(issuer, { ...options, prompt: "create" });
|
|
89
|
-
},
|
|
90
|
-
[login],
|
|
91
|
-
);
|
|
90
|
+
initializeSession();
|
|
92
91
|
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
92
|
+
return () => {
|
|
93
|
+
isMounted = false;
|
|
94
|
+
if (currentSession === session) {
|
|
95
|
+
currentSession = undefined;
|
|
96
|
+
}
|
|
97
|
+
};
|
|
98
|
+
}, [session]);
|
|
96
99
|
|
|
97
|
-
const
|
|
100
|
+
const solidAuth = useMemo(
|
|
98
101
|
() => ({
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
102
|
+
login: session.login,
|
|
103
|
+
logout: session.logout,
|
|
104
|
+
signUp: session.login,
|
|
105
|
+
fetch: session.authFetch,
|
|
103
106
|
session,
|
|
104
107
|
ranInitialAuthCheck,
|
|
105
|
-
fetch: libraryFetch,
|
|
106
108
|
}),
|
|
107
|
-
[
|
|
108
|
-
login,
|
|
109
|
-
logout,
|
|
110
|
-
ranInitialAuthCheck,
|
|
111
|
-
runInitialAuthCheck,
|
|
112
|
-
session,
|
|
113
|
-
signUp,
|
|
114
|
-
],
|
|
109
|
+
[ranInitialAuthCheck, session, version],
|
|
115
110
|
);
|
|
116
111
|
|
|
117
112
|
return (
|
|
118
|
-
<SolidAuthContext.Provider value={
|
|
113
|
+
<SolidAuthContext.Provider value={solidAuth}>
|
|
119
114
|
{children}
|
|
120
115
|
</SolidAuthContext.Provider>
|
|
121
116
|
);
|