3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-14 00:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

authenticate: show the device enrolled page as the user info page (#3151)

Browse source
This commit is contained in:
Caleb Doxsey 2022-03-17 12:15:57 -06:00 • committed by GitHub
parent bb7de0d227
commit da97546de1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 109 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ui/src/App.tsx
View file

@ -1,4 +1,9 @@
import DeviceEnrolledPage from "./components/DeviceEnrolledPage";
import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import { get } from "lodash";
import React, { FC } from "react";
import ErrorPage from "./components/ErrorPage";
import Footer from "./components/Footer";
import Header from "./components/Header";
@ -8,12 +13,7 @@ import UserInfoPage from "./components/UserInfoPage";
import WebAuthnRegistrationPage from "./components/WebAuthnRegistrationPage";
import { SubpageContextProvider } from "./context/Subpage";
import { createTheme } from "./theme";
import {PageData, UserInfoPageData} from "./types";
import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles";
import React, { FC } from "react";
import {get} from "lodash";
import { PageData, UserInfoPageData } from "./types";
const theme = createTheme();
@ -21,15 +21,13 @@ const App: FC = () => {
const data = (window["POMERIUM_DATA"] || {}) as PageData;
let body: React.ReactNode = <></>;
switch (data?.page) {
case "DeviceEnrolled":
body = <DeviceEnrolledPage data={data} />;
break;
case "Error":
body = <ErrorPage data={data} />;
break;
case "SignOutConfirm":
body = <SignOutConfirmPage data={data} />;
break;
case "DeviceEnrolled":
case "UserInfo":
body = <UserInfoPage data={data} />;
break;
@ -40,7 +38,7 @@ const App: FC = () => {
return (
<ThemeProvider theme={theme}>
<CssBaseline />
<SubpageContextProvider>
<SubpageContextProvider page={data?.page}>
<Header includeSidebar={data?.page === "UserInfo"} data={data} />
<ToolbarOffset />
<Box sx={{ overflow: "hidden", height: "calc(100vh - 120px)" }}>
@ -55,7 +53,7 @@ const App: FC = () => {
<ToolbarOffset />
</Box>
</Box>
<Footer pomeriumVersion={get(data, 'pomeriumVersion')} />
<Footer pomeriumVersion={get(data, "pomeriumVersion")} />
</SubpageContextProvider>
</ThemeProvider>
);