Skip to content

Commit

Permalink
Merge pull request #23 from bcgsc/fix/KBDEV-960-fix-auth
Browse files Browse the repository at this point in the history
fix: replace auth with simiplier updated solution
  • Loading branch information
areisle authored Feb 2, 2022
2 parents fa69be4 + 62b7609 commit 248e73b
Show file tree
Hide file tree
Showing 28 changed files with 463 additions and 751 deletions.
130 changes: 93 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"json-cycle": "^1.3.0",
"jsonwebtoken": "^8.3.0",
"jss": "^10.1.1",
"keycloak-js": "^4.8.2",
"keycloak-js": "~12.0.4",
"lodash.isobject": "^3.0.2",
"lodash.merge": "^4.6.2",
"lodash.omit": "^4.5.0",
Expand All @@ -47,8 +47,8 @@
"react": "^16.13.1",
"react-dom": "^16.13.1",
"react-google-charts": "^3.0.15",
"react-query": "^1.5.7",
"react-router-dom": "^5.2.0",
"react-query": "^2.26.4",
"react-router-dom": "~5.3.0",
"react-select": "^2.4.4",
"slugify": "^1.4.0",
"use-debounce": "^3.4.2",
Expand Down
6 changes: 5 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { SnackbarProvider } from 'notistack';
import React from 'react';
import { BrowserRouter } from 'react-router-dom';

import { AuthProvider } from '@/components/Auth';

import * as cssTheme from './_theme.scss';
import MainView from './views/MainView';

Expand Down Expand Up @@ -78,7 +80,9 @@ function App() {
<MuiThemeProvider theme={theme}>
<SnackbarProvider anchorOrigin={{ vertical: 'bottom', horizontal: 'right' }}>
<BrowserRouter basename={window._env_.PUBLIC_PATH}>
<MainView />
<AuthProvider>
<MainView />
</AuthProvider>
</BrowserRouter>
</SnackbarProvider>
</MuiThemeProvider>
Expand Down
Loading

0 comments on commit 248e73b

Please sign in to comment.