@ldo/solid-react 0.0.1-alpha.26 → 0.0.1-alpha.27

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.
@@ -17,19 +17,24 @@ const BrowserSolidLdoProvider = ({ children, }) => {
17
17
  await (0, solid_client_authn_browser_1.handleIncomingRedirect)({
18
18
  restorePreviousSession: true,
19
19
  });
20
- setSession({ ...(0, solid_client_authn_browser_1.getDefaultSession)().info });
21
- window.history.replaceState({}, "", window.localStorage.getItem(PRE_REDIRECT_URI));
22
- window.localStorage.removeItem(PRE_REDIRECT_URI);
23
- setRanInitialAuthCheck(true);
20
+ setTimeout(() => {
21
+ setSession({ ...(0, solid_client_authn_browser_1.getDefaultSession)().info });
22
+ window.history.replaceState({}, "", window.localStorage.getItem(PRE_REDIRECT_URI));
23
+ window.localStorage.removeItem(PRE_REDIRECT_URI);
24
+ setRanInitialAuthCheck(true);
25
+ }, 0);
24
26
  }, []);
25
27
  const login = (0, react_1.useCallback)(async (issuer, options) => {
28
+ const cleanUrl = new URL(window.location.href);
29
+ cleanUrl.hash = "";
30
+ cleanUrl.search = "";
26
31
  const fullOptions = {
27
- redirectUrl: window.location.href,
32
+ redirectUrl: cleanUrl.toString(),
28
33
  clientName: "Solid App",
29
34
  oidcIssuer: issuer,
30
35
  ...options,
31
36
  };
32
- window.localStorage.setItem(PRE_REDIRECT_URI, fullOptions.redirectUrl);
37
+ window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href);
33
38
  await (0, solid_client_authn_browser_1.login)(fullOptions);
34
39
  setSession({ ...(0, solid_client_authn_browser_1.getDefaultSession)().info });
35
40
  }, []);
@@ -1 +1 @@
1
- {"version":3,"file":"BrowserSolidLdoProvider.js","sourceRoot":"","sources":["../src/BrowserSolidLdoProvider.tsx"],"names":[],"mappings":";;;;AAAA,iCAAyE;AAGzE,yDAAsD;AACtD,mFAM4C;AAC5C,yDAAsD;AAEtD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC;AAErC,MAAM,uBAAuB,GAAyC,CAAC,EAC5E,QAAQ,GACT,EAAE,EAAE;IACH,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAc,IAAA,8CAAiB,GAAE,CAAC,IAAI,CAAC,CAAC;IAC9E,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAEtE,MAAM,mBAAmB,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QACjD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YAClD,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;SACrE;QAED,MAAM,IAAA,mDAAsB,EAAC;YAC3B,sBAAsB,EAAE,IAAI;SAC7B,CAAC,CAAC;QACH,UAAU,CAAC,EAAE,GAAG,IAAA,8CAAiB,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5C,MAAM,CAAC,OAAO,CAAC,YAAY,CACzB,EAAE,EACF,EAAE,EACF,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAC9C,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QAEjD,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,KAAK,EAAE,MAAc,EAAE,OAAsB,EAAE,EAAE;QACzE,MAAM,WAAW,GAAG;YAClB,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI;YACjC,UAAU,EAAE,WAAW;YACvB,UAAU,EAAE,MAAM;YAClB,GAAG,OAAO;SACX,CAAC;QACF,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;QACvE,MAAM,IAAA,kCAAY,EAAC,WAAW,CAAC,CAAC;QAChC,UAAU,CAAC,EAAE,GAAG,IAAA,8CAAiB,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QACpC,MAAM,IAAA,mCAAa,GAAE,CAAC;QACtB,UAAU,CAAC,EAAE,GAAG,IAAA,8CAAiB,GAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,IAAA,mBAAW,EACxB,KAAK,EAAE,MAAc,EAAE,OAAsB,EAAE,EAAE;QAK/C,OAAO,KAAK,CAAC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC,EACD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,mBAAmB,EAAE,CAAC;IACxB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,kBAAkB,GAAG,IAAA,eAAO,EAChC,GAAG,EAAE,CAAC,CAAC;QACL,mBAAmB;QACnB,KAAK;QACL,MAAM;QACN,MAAM;QACN,OAAO;QACP,mBAAmB;QACnB,KAAK,EAAE,kCAAY;KACpB,CAAC,EACF,CAAC,KAAK,EAAE,MAAM,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,CAAC,CAC3E,CAAC;IAEF,OAAO,CACL,uBAAC,mCAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,kBAAkB,YAClD,uBAAC,mCAAgB,cAAE,QAAQ,GAAoB,GACrB,CAC7B,CAAC;AACJ,CAAC,CAAC;AA3EW,QAAA,uBAAuB,2BA2ElC"}
1
+ {"version":3,"file":"BrowserSolidLdoProvider.js","sourceRoot":"","sources":["../src/BrowserSolidLdoProvider.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ldo/solid-react",
3
- "version": "0.0.1-alpha.26",
3
+ "version": "0.0.1-alpha.27",
4
4
  "description": "A React library for LDO and Solid",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
@@ -52,5 +52,5 @@
52
52
  "publishConfig": {
53
53
  "access": "public"
54
54
  },
55
- "gitHead": "598755bbfc0681ad05a7093844bf699bfbe1311f"
55
+ "gitHead": "e4f41174c2b249dc0ff52d3e509b3878a17fe279"
56
56
  }
@@ -27,25 +27,31 @@ export const BrowserSolidLdoProvider: FunctionComponent<PropsWithChildren> = ({
27
27
  await handleIncomingRedirect({
28
28
  restorePreviousSession: true,
29
29
  });
30
- setSession({ ...getDefaultSession().info });
31
- window.history.replaceState(
32
- {},
33
- "",
34
- window.localStorage.getItem(PRE_REDIRECT_URI),
35
- );
36
- window.localStorage.removeItem(PRE_REDIRECT_URI);
30
+ // Set timout to ensure this happens after the redirect
31
+ setTimeout(() => {
32
+ setSession({ ...getDefaultSession().info });
33
+ window.history.replaceState(
34
+ {},
35
+ "",
36
+ window.localStorage.getItem(PRE_REDIRECT_URI),
37
+ );
38
+ window.localStorage.removeItem(PRE_REDIRECT_URI);
37
39
 
38
- setRanInitialAuthCheck(true);
40
+ setRanInitialAuthCheck(true);
41
+ }, 0);
39
42
  }, []);
40
43
 
41
44
  const login = useCallback(async (issuer: string, options?: LoginOptions) => {
45
+ const cleanUrl = new URL(window.location.href);
46
+ cleanUrl.hash = "";
47
+ cleanUrl.search = "";
42
48
  const fullOptions = {
43
- redirectUrl: window.location.href,
49
+ redirectUrl: cleanUrl.toString(),
44
50
  clientName: "Solid App",
45
51
  oidcIssuer: issuer,
46
52
  ...options,
47
53
  };
48
- window.localStorage.setItem(PRE_REDIRECT_URI, fullOptions.redirectUrl);
54
+ window.localStorage.setItem(PRE_REDIRECT_URI, window.location.href);
49
55
  await libraryLogin(fullOptions);
50
56
  setSession({ ...getDefaultSession().info });
51
57
  }, []);