mirror of
https://github.com/pomerium/pomerium.git
synced 2025-05-30 09:27:19 +02:00
remove version (#3184)
This commit is contained in:
parent
956febf6a6
commit
7d00ad9b7d
6 changed files with 8 additions and 45 deletions
|
@ -28,7 +28,6 @@ import (
|
|||
"github.com/pomerium/pomerium/internal/sessions"
|
||||
"github.com/pomerium/pomerium/internal/telemetry/trace"
|
||||
"github.com/pomerium/pomerium/internal/urlutil"
|
||||
"github.com/pomerium/pomerium/internal/version"
|
||||
"github.com/pomerium/pomerium/pkg/cryptutil"
|
||||
"github.com/pomerium/pomerium/pkg/grpc/databroker"
|
||||
"github.com/pomerium/pomerium/pkg/grpc/directory"
|
||||
|
@ -592,7 +591,6 @@ func (a *Authenticate) getUserInfoData(r *http.Request) (handlers.UserInfoData,
|
|||
WebAuthnCreationOptions: creationOptions,
|
||||
WebAuthnRequestOptions: requestOptions,
|
||||
WebAuthnURL: urlutil.WebAuthnURL(r, authenticateURL, state.sharedKey, r.URL.Query()),
|
||||
PomeriumVersion: version.FullVersion(),
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@ type UserInfoData struct {
|
|||
WebAuthnCreationOptions *webauthn.PublicKeyCredentialCreationOptions
|
||||
WebAuthnRequestOptions *webauthn.PublicKeyCredentialRequestOptions
|
||||
WebAuthnURL string
|
||||
PomeriumVersion string
|
||||
}
|
||||
|
||||
// ToJSON converts the data into a JSON map.
|
||||
|
@ -53,7 +52,6 @@ func (data UserInfoData) ToJSON() map[string]interface{} {
|
|||
m["webAuthnCreationOptions"] = data.WebAuthnCreationOptions
|
||||
m["webAuthnRequestOptions"] = data.WebAuthnRequestOptions
|
||||
m["webAuthnUrl"] = data.WebAuthnURL
|
||||
m["pomeriumVersion"] = data.PomeriumVersion
|
||||
return m
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@ func (e *HTTPError) ErrorResponse(w http.ResponseWriter, r *http.Request) {
|
|||
StatusText string `json:"-"`
|
||||
RequestID string `json:",omitempty"`
|
||||
CanDebug bool `json:"-"`
|
||||
Version string `json:"-"`
|
||||
DebugURL *url.URL `json:",omitempty"`
|
||||
}{
|
||||
Status: e.Status,
|
||||
|
@ -76,7 +75,6 @@ func (e *HTTPError) ErrorResponse(w http.ResponseWriter, r *http.Request) {
|
|||
"requestId": response.RequestID,
|
||||
"status": response.Status,
|
||||
"statusText": response.StatusText,
|
||||
"version": response.Version,
|
||||
}
|
||||
if response.DebugURL != nil {
|
||||
m["debugUrl"] = response.DebugURL.String()
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
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";
|
||||
|
@ -53,7 +52,7 @@ const App: FC = () => {
|
|||
<ToolbarOffset />
|
||||
</Box>
|
||||
</Box>
|
||||
<Footer pomeriumVersion={get(data, "pomeriumVersion")} />
|
||||
<Footer />
|
||||
</SubpageContextProvider>
|
||||
</ThemeProvider>
|
||||
);
|
||||
|
|
|
@ -1,20 +1,17 @@
|
|||
import AppBar from "@mui/material/AppBar";
|
||||
import Box from "@mui/material/Box";
|
||||
import Stack from "@mui/material/Stack";
|
||||
import React, { FC } from "react";
|
||||
import {FooterLink} from "./FooterLink";
|
||||
import AppBar from "@mui/material/AppBar";
|
||||
|
||||
type FooterData = {
|
||||
pomeriumVersion?: string;
|
||||
}
|
||||
import { FooterLink } from "./FooterLink";
|
||||
|
||||
const Footer: FC<FooterData> = ({pomeriumVersion}) => {
|
||||
const Footer: FC = () => {
|
||||
return (
|
||||
<AppBar
|
||||
position="fixed"
|
||||
sx={{
|
||||
zIndex: (theme) => theme.zIndex.drawer + 1,
|
||||
top: 'auto',
|
||||
top: "auto",
|
||||
bottom: 0,
|
||||
}}
|
||||
>
|
||||
|
@ -31,40 +28,15 @@ const Footer: FC<FooterData> = ({pomeriumVersion}) => {
|
|||
}}
|
||||
>
|
||||
<Box>
|
||||
<FooterLink
|
||||
href="https://pomerium.com/"
|
||||
>
|
||||
Home
|
||||
</FooterLink>
|
||||
<FooterLink href="https://pomerium.com/">Home</FooterLink>
|
||||
</Box>
|
||||
<Box>
|
||||
<FooterLink
|
||||
href="https://pomerium.com/docs"
|
||||
>
|
||||
Docs
|
||||
</FooterLink>
|
||||
<FooterLink href="https://pomerium.com/docs">Docs</FooterLink>
|
||||
</Box>
|
||||
<Box>
|
||||
<FooterLink
|
||||
href="https://discuss.pomerium.com"
|
||||
>
|
||||
Support
|
||||
</FooterLink>
|
||||
<FooterLink href="https://discuss.pomerium.com">Support</FooterLink>
|
||||
</Box>
|
||||
</Stack>
|
||||
{!!pomeriumVersion && (
|
||||
<Stack
|
||||
direction="row"
|
||||
spacing={2}
|
||||
justifyContent="center"
|
||||
sx={{
|
||||
paddingBottom: "6px",
|
||||
fontSize: "0.85rem",
|
||||
}}
|
||||
>
|
||||
<Box><b>Pomerium Version:</b> {pomeriumVersion}</Box>
|
||||
</Stack>
|
||||
)}
|
||||
</AppBar>
|
||||
);
|
||||
};
|
||||
|
|
|
@ -92,7 +92,6 @@ export type ErrorPageData = BasePageData & {
|
|||
requestId?: string;
|
||||
status?: number;
|
||||
statusText?: string;
|
||||
version?: string;
|
||||
};
|
||||
|
||||
export type UserInfoData = {
|
||||
|
@ -104,7 +103,6 @@ export type UserInfoData = {
|
|||
webAuthnCreationOptions?: WebAuthnCreationOptions;
|
||||
webAuthnRequestOptions?: WebAuthnRequestOptions;
|
||||
webAuthnUrl?: string;
|
||||
pomeriumVersion: string;
|
||||
};
|
||||
|
||||
export type DeviceEnrolledPageData = BasePageData &
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue