Skip to content

Commit ffd4602

Browse files
fix: okta auth flow (#1533)
* fix: okta auth component no longer throws errors about missing restoreOriginalUri * Update src/index.okta.tsx Co-authored-by: Bill Glesias <[email protected]> * prettier --------- Co-authored-by: Bill Glesias <[email protected]>
1 parent dbd2252 commit ffd4602

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

src/index.okta.tsx

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import React from "react";
22
import { createRoot } from "react-dom/client";
3-
import { Router } from "react-router-dom";
3+
import { Router, withRouter } from "react-router-dom";
44
import { createTheme, ThemeProvider } from "@material-ui/core";
55

66
// @ts-ignore
7-
import { OktaAuth } from "@okta/okta-auth-js";
7+
import { OktaAuth, toRelativeUrl } from "@okta/okta-auth-js";
88
import { Security } from "@okta/okta-react";
99
import { history } from "./utils/historyUtils";
1010
import AppOkta from "./containers/AppOkta";
@@ -25,13 +25,23 @@ if (process.env.VITE_OKTA) {
2525
clientId: process.env.VITE_OKTA_CLIENTID,
2626
redirectUri: window.location.origin + "/implicit/callback",
2727
});
28+
29+
const AppWithRouter = withRouter(({ history }) => {
30+
const restoreOriginalUri = (_oktaAuth, originalUri) =>
31+
history.replace(toRelativeUrl(originalUri || "/", window.location.origin));
32+
33+
return (
34+
<Security oktaAuth={oktaAuth} restoreOriginalUri={restoreOriginalUri}>
35+
<AppOkta />
36+
</Security>
37+
);
38+
});
39+
2840
/* istanbul ignore next */
2941
root.render(
3042
<Router history={history}>
3143
<ThemeProvider theme={theme}>
32-
<Security oktaAuth={oktaAuth}>
33-
<AppOkta />
34-
</Security>
44+
<AppWithRouter />
3545
</ThemeProvider>
3646
</Router>
3747
);

0 commit comments

Comments
 (0)