diff --git a/lerna.json b/lerna.json index 02c81cc..0fdd22a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,4 +1,4 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", - "version": "0.0.1-alpha.24" + "version": "0.0.1-alpha.27" } diff --git a/package-lock.json b/package-lock.json index d967fb3..dbfa660 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31449,7 +31449,7 @@ }, "packages/cli": { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/schema-converter-shex": "^0.0.1-alpha.24", @@ -31696,10 +31696,10 @@ }, "packages/demo-react": { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.27", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.27", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -31708,7 +31708,7 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -31976,7 +31976,7 @@ }, "packages/ldo": { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", @@ -32277,18 +32277,18 @@ }, "packages/solid": { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "license": "MIT", "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" }, "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -32304,14 +32304,14 @@ }, "packages/solid-react": { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.27", "license": "MIT", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" @@ -38220,8 +38220,8 @@ "requires": { "@craco/craco": "^7.1.0", "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/cli": "^0.0.1-alpha.24", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", + "@ldo/solid-react": "^0.0.1-alpha.27", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", @@ -38561,9 +38561,9 @@ "version": "file:packages/solid", "requires": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", @@ -38607,9 +38607,9 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", diff --git a/packages/cli/package.json b/packages/cli/package.json index 77e08a8..fa67a17 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/cli", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "description": "A Command Line Interface for Linked Data Objects", "main": "./dist/index.js", "bin": { @@ -60,5 +60,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/demo-react/package.json b/packages/demo-react/package.json index 1a63ed7..14d68b1 100644 --- a/packages/demo-react/package.json +++ b/packages/demo-react/package.json @@ -1,9 +1,9 @@ { "name": "@ldo/demo-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.27", "dependencies": { "@inrupt/solid-client-authn-browser": "^2.0.0", - "@ldo/solid-react": "^0.0.1-alpha.24", + "@ldo/solid-react": "^0.0.1-alpha.27", "react": "^18.2.0", "react-dom": "^18.2.0", "react-router-dom": "^6.15.0", @@ -37,13 +37,13 @@ }, "devDependencies": { "@craco/craco": "^7.1.0", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", "@types/jsonld": "^1.5.9", "@types/react": "^18.2.21", "@types/shexj": "^2.1.4", "tsconfig-paths-webpack-plugin": "^4.1.0" }, - "gitHead": "4548985c0de9b0ec83cf5ee93f2d7c1ca2c1b8d8", + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa", "publishConfig": { "access": "public" } diff --git a/packages/ldo/package.json b/packages/ldo/package.json index c7dc0ef..fd23b28 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/ldo", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "description": "", "main": "dist/index.js", "scripts": { @@ -55,5 +55,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index d3e0fb4..3ebfea8 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid-react", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.27", "description": "A React library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -39,8 +39,8 @@ "@inrupt/solid-client-authn-browser": "^2.0.0", "@ldo/dataset": "^0.0.1-alpha.24", "@ldo/jsonld-dataset-proxy": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", - "@ldo/solid": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", + "@ldo/solid": "^0.0.1-alpha.26", "@ldo/subscribable-dataset": "^0.0.1-alpha.24", "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" @@ -52,5 +52,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid-react/src/BrowserSolidLdoProvider.tsx b/packages/solid-react/src/BrowserSolidLdoProvider.tsx index 8d9d652..6213890 100644 --- a/packages/solid-react/src/BrowserSolidLdoProvider.tsx +++ b/packages/solid-react/src/BrowserSolidLdoProvider.tsx @@ -27,25 +27,31 @@ export const BrowserSolidLdoProvider: FunctionComponent = ({ await handleIncomingRedirect({ restorePreviousSession: true, }); - setSession({ ...getDefaultSession().info }); - window.history.replaceState( - {}, - "", - window.localStorage.getItem(PRE_REDIRECT_URI), - ); - window.localStorage.removeItem(PRE_REDIRECT_URI); + // Set timout to ensure this happens after the redirect + setTimeout(() => { + setSession({ ...getDefaultSession().info }); + window.history.replaceState( + {}, + "", + window.localStorage.getItem(PRE_REDIRECT_URI), + ); + window.localStorage.removeItem(PRE_REDIRECT_URI); - setRanInitialAuthCheck(true); + setRanInitialAuthCheck(true); + }, 0); }, []); const login = useCallback(async (issuer: string, options?: LoginOptions) => { + const cleanUrl = new URL(window.location.href); + cleanUrl.hash = ""; + cleanUrl.search = ""; const fullOptions = { - redirectUrl: window.location.href, + redirectUrl: cleanUrl.toString(), clientName: "Solid App", oidcIssuer: issuer, ...options, }; - window.localStorage.setItem(PRE_REDIRECT_URI, fullOptions.redirectUrl); + window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href); await libraryLogin(fullOptions); setSession({ ...getDefaultSession().info }); }, []); diff --git a/packages/solid/package.json b/packages/solid/package.json index 87c84e4..0fa49b0 100644 --- a/packages/solid/package.json +++ b/packages/solid/package.json @@ -1,6 +1,6 @@ { "name": "@ldo/solid", - "version": "0.0.1-alpha.24", + "version": "0.0.1-alpha.26", "description": "A library for LDO and Solid", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://github.com/o-development/ldobjects/tree/main/packages/solid#readme", "devDependencies": { "@inrupt/solid-client-authn-core": "^1.17.1", - "@ldo/cli": "^0.0.1-alpha.24", + "@ldo/cli": "^0.0.1-alpha.26", "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid/community-server": "^6.0.2", @@ -41,7 +41,7 @@ }, "dependencies": { "@ldo/dataset": "^0.0.1-alpha.24", - "@ldo/ldo": "^0.0.1-alpha.24", + "@ldo/ldo": "^0.0.1-alpha.26", "@ldo/rdf-utils": "^0.0.1-alpha.24", "cross-fetch": "^3.1.6", "http-link-header": "^1.1.1" @@ -53,5 +53,5 @@ "publishConfig": { "access": "public" }, - "gitHead": "d2364cd2f8da5f0b673b1202d29df5b7c071a17c" + "gitHead": "c63f055aab22155b60a5fdee4172979b9c287dfa" } diff --git a/packages/solid/test/Integration.test.ts b/packages/solid/test/Integration.test.ts index 4d97db8..2c41548 100644 --- a/packages/solid/test/Integration.test.ts +++ b/packages/solid/test/Integration.test.ts @@ -688,7 +688,7 @@ describe("Integration", () => { expect(realResult.storageContainers[0].uri).toBe( "https://example.com/A/", ); - expect(realResult.storageContainers[0].uri).toBe( + expect(realResult.storageContainers[1].uri).toBe( "https://example.com/B/", ); });