colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #838 from gotify/fix-ci

This commit is contained in:
Jannis Mattheis 2025-09-13 10:44:29 +02:00 committed by GitHub
parent 93ffad9abe b394578a18
commit 0239db0a6e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -2,11 +2,7 @@ LICENSE_DIR=./licenses/
BUILD_DIR=./build BUILD_DIR=./build
DOCKER_DIR=./docker/ DOCKER_DIR=./docker/
SHELL := /bin/bash SHELL := /bin/bash
ifdef GOTOOLCHAIN GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
GO_VERSION=$(GOTOOLCHAIN)
else
GO_VERSION=$(shell go mod edit -json | jq -r .Toolchain | sed -e 's/go//')
endif
DOCKER_BUILD_IMAGE=docker.io/gotify/build DOCKER_BUILD_IMAGE=docker.io/gotify/build
DOCKER_WORKDIR=/proj DOCKER_WORKDIR=/proj
DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR} DOCKER_RUN=docker run --rm -e LD_FLAGS="$$LD_FLAGS" -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pkg/mod/.:/go/pkg/mod:ro" -w ${DOCKER_WORKDIR}

20
ui/src/layout/Layout.tsx
View File

@ -55,6 +55,7 @@ const Layout = observer(() => {
const { const {
currentUser: { currentUser: {
loggedIn, loggedIn,
authenticating,
user: {name, admin}, user: {name, admin},
logout, logout,
tryReconnect, tryReconnect,
@ -79,7 +80,9 @@ const Layout = observer(() => {
}; };
const authed = (children: React.ReactNode) => ( const authed = (children: React.ReactNode) => (
<RequireAuth loggedIn={loggedIn}>{children}</RequireAuth> <RequireAuth loggedIn={loggedIn} authenticating={authenticating}>
{children}
</RequireAuth>
); );
return ( return (
@ -167,11 +170,16 @@ const Lazy = ({component}: {component: () => Promise<{default: React.ComponentTy
); );
}; };
const RequireAuth: React.FC<React.PropsWithChildren<{loggedIn: boolean}>> = ({ const RequireAuth: React.FC<
children, React.PropsWithChildren<{loggedIn: boolean; authenticating: boolean}>
loggedIn, > = ({children, authenticating, loggedIn}) => {
}) => { if (authenticating) {
return loggedIn ? <>{children}</> : <Navigate replace={true} to="/login" />; return <LoadingSpinner />;
}
if (!loggedIn) {
return <Navigate replace={true} to="/login" />;
}
return <>{children}</>;
}; };
export default Layout; export default Layout;