remove version (#3184)

This commit is contained in:
Caleb Doxsey 2022-03-23 11:51:24 -06:00 committed by GitHub
parent 956febf6a6
commit 7d00ad9b7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 45 deletions

View file

@ -28,7 +28,6 @@ import (
"github.com/pomerium/pomerium/internal/sessions" "github.com/pomerium/pomerium/internal/sessions"
"github.com/pomerium/pomerium/internal/telemetry/trace" "github.com/pomerium/pomerium/internal/telemetry/trace"
"github.com/pomerium/pomerium/internal/urlutil" "github.com/pomerium/pomerium/internal/urlutil"
"github.com/pomerium/pomerium/internal/version"
"github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/cryptutil"
"github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/grpc/databroker"
"github.com/pomerium/pomerium/pkg/grpc/directory" "github.com/pomerium/pomerium/pkg/grpc/directory"
@ -592,7 +591,6 @@ func (a *Authenticate) getUserInfoData(r *http.Request) (handlers.UserInfoData,
WebAuthnCreationOptions: creationOptions, WebAuthnCreationOptions: creationOptions,
WebAuthnRequestOptions: requestOptions, WebAuthnRequestOptions: requestOptions,
WebAuthnURL: urlutil.WebAuthnURL(r, authenticateURL, state.sharedKey, r.URL.Query()), WebAuthnURL: urlutil.WebAuthnURL(r, authenticateURL, state.sharedKey, r.URL.Query()),
PomeriumVersion: version.FullVersion(),
}, nil }, nil
} }

View file

@ -26,7 +26,6 @@ type UserInfoData struct {
WebAuthnCreationOptions *webauthn.PublicKeyCredentialCreationOptions WebAuthnCreationOptions *webauthn.PublicKeyCredentialCreationOptions
WebAuthnRequestOptions *webauthn.PublicKeyCredentialRequestOptions WebAuthnRequestOptions *webauthn.PublicKeyCredentialRequestOptions
WebAuthnURL string WebAuthnURL string
PomeriumVersion string
} }
// ToJSON converts the data into a JSON map. // ToJSON converts the data into a JSON map.
@ -53,7 +52,6 @@ func (data UserInfoData) ToJSON() map[string]interface{} {
m["webAuthnCreationOptions"] = data.WebAuthnCreationOptions m["webAuthnCreationOptions"] = data.WebAuthnCreationOptions
m["webAuthnRequestOptions"] = data.WebAuthnRequestOptions m["webAuthnRequestOptions"] = data.WebAuthnRequestOptions
m["webAuthnUrl"] = data.WebAuthnURL m["webAuthnUrl"] = data.WebAuthnURL
m["pomeriumVersion"] = data.PomeriumVersion
return m return m
} }

View file

@ -52,7 +52,6 @@ func (e *HTTPError) ErrorResponse(w http.ResponseWriter, r *http.Request) {
StatusText string `json:"-"` StatusText string `json:"-"`
RequestID string `json:",omitempty"` RequestID string `json:",omitempty"`
CanDebug bool `json:"-"` CanDebug bool `json:"-"`
Version string `json:"-"`
DebugURL *url.URL `json:",omitempty"` DebugURL *url.URL `json:",omitempty"`
}{ }{
Status: e.Status, Status: e.Status,
@ -76,7 +75,6 @@ func (e *HTTPError) ErrorResponse(w http.ResponseWriter, r *http.Request) {
"requestId": response.RequestID, "requestId": response.RequestID,
"status": response.Status, "status": response.Status,
"statusText": response.StatusText, "statusText": response.StatusText,
"version": response.Version,
} }
if response.DebugURL != nil { if response.DebugURL != nil {
m["debugUrl"] = response.DebugURL.String() m["debugUrl"] = response.DebugURL.String()

View file

@ -1,7 +1,6 @@
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import CssBaseline from "@mui/material/CssBaseline"; import CssBaseline from "@mui/material/CssBaseline";
import { ThemeProvider } from "@mui/material/styles"; import { ThemeProvider } from "@mui/material/styles";
import { get } from "lodash";
import React, { FC } from "react"; import React, { FC } from "react";
import ErrorPage from "./components/ErrorPage"; import ErrorPage from "./components/ErrorPage";
@ -53,7 +52,7 @@ const App: FC = () => {
<ToolbarOffset /> <ToolbarOffset />
</Box> </Box>
</Box> </Box>
<Footer pomeriumVersion={get(data, "pomeriumVersion")} /> <Footer />
</SubpageContextProvider> </SubpageContextProvider>
</ThemeProvider> </ThemeProvider>
); );

View file

@ -1,20 +1,17 @@
import AppBar from "@mui/material/AppBar";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import React, { FC } from "react"; import React, { FC } from "react";
import {FooterLink} from "./FooterLink";
import AppBar from "@mui/material/AppBar";
type FooterData = { import { FooterLink } from "./FooterLink";
pomeriumVersion?: string;
}
const Footer: FC<FooterData> = ({pomeriumVersion}) => { const Footer: FC = () => {
return ( return (
<AppBar <AppBar
position="fixed" position="fixed"
sx={{ sx={{
zIndex: (theme) => theme.zIndex.drawer + 1, zIndex: (theme) => theme.zIndex.drawer + 1,
top: 'auto', top: "auto",
bottom: 0, bottom: 0,
}} }}
> >
@ -31,40 +28,15 @@ const Footer: FC<FooterData> = ({pomeriumVersion}) => {
}} }}
> >
<Box> <Box>
<FooterLink <FooterLink href="https://pomerium.com/">Home</FooterLink>
href="https://pomerium.com/"
>
Home
</FooterLink>
</Box> </Box>
<Box> <Box>
<FooterLink <FooterLink href="https://pomerium.com/docs">Docs</FooterLink>
href="https://pomerium.com/docs"
>
Docs
</FooterLink>
</Box> </Box>
<Box> <Box>
<FooterLink <FooterLink href="https://discuss.pomerium.com">Support</FooterLink>
href="https://discuss.pomerium.com"
>
Support
</FooterLink>
</Box> </Box>
</Stack> </Stack>
{!!pomeriumVersion && (
<Stack
direction="row"
spacing={2}
justifyContent="center"
sx={{
paddingBottom: "6px",
fontSize: "0.85rem",
}}
>
<Box><b>Pomerium Version:</b> {pomeriumVersion}</Box>
</Stack>
)}
</AppBar> </AppBar>
); );
}; };

View file

@ -92,7 +92,6 @@ export type ErrorPageData = BasePageData & {
requestId?: string; requestId?: string;
status?: number; status?: number;
statusText?: string; statusText?: string;
version?: string;
}; };
export type UserInfoData = { export type UserInfoData = {
@ -104,7 +103,6 @@ export type UserInfoData = {
webAuthnCreationOptions?: WebAuthnCreationOptions; webAuthnCreationOptions?: WebAuthnCreationOptions;
webAuthnRequestOptions?: WebAuthnRequestOptions; webAuthnRequestOptions?: WebAuthnRequestOptions;
webAuthnUrl?: string; webAuthnUrl?: string;
pomeriumVersion: string;
}; };
export type DeviceEnrolledPageData = BasePageData & export type DeviceEnrolledPageData = BasePageData &