feat(dashboard-v2): show instance, offer SSO when advertised
This commit is contained in:
1 parent
98acd6aad0
commit
c3b636bf72
4 files changed
+37
-10
No files matched your search
@@ -90,10 +90,15 @@ export interface ComponentVersion {
|
||||
}
|
||||
|
||||
export const api = {
|
||||
authStatus: () =>
|
||||
request<{ setup_required?: boolean; user?: unknown }>(
|
||||
"/api/auth/status",
|
||||
),
|
||||
export interface AuthStatus {
|
||||
setup_required?: boolean;
|
||||
user?: unknown;
|
||||
oidc?: boolean;
|
||||
instance?: string;
|
||||
}
|
||||
|
||||
export const api = {
|
||||
authStatus: () => request<AuthStatus>("/api/auth/status"),
|
||||
services: () => request<Service[]>("/api/services"),
|
||||
version: () => request<{ components: ComponentVersion[] }>("/api/version"),
|
||||
signIn: (email: string, password: string) =>
|
||||
|
||||
@@ -25,7 +25,7 @@ const contentStyle: CSSProperties = {
|
||||
};
|
||||
|
||||
export default function LoginPage() {
|
||||
const { signIn } = useSession();
|
||||
const { signIn, instance, oidc } = useSession();
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
@@ -98,6 +98,21 @@ export default function LoginPage() {
|
||||
isLoading={isLoading}
|
||||
onClick={() => void handleSignIn()}
|
||||
/>
|
||||
{oidc && (
|
||||
<Button
|
||||
label="Continue with SSO"
|
||||
variant="secondary"
|
||||
size="lg"
|
||||
onClick={() => {
|
||||
window.location.href = "/oauth2/login";
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{instance && (
|
||||
<Text type="supporting" color="secondary" justify="center">
|
||||
{instance}
|
||||
</Text>
|
||||
)}
|
||||
</VStack>
|
||||
</Card>
|
||||
</VStack>
|
||||
|
||||
@@ -15,12 +15,16 @@ const SessionContext = createContext<{
|
||||
state: SessionState;
|
||||
signIn: (email: string, password: string) => Promise<void>;
|
||||
expire: () => void;
|
||||
instance: string | null;
|
||||
oidc: boolean;
|
||||
} | null>(null);
|
||||
|
||||
// The only client state in the app: who is signed in. Everything else is
|
||||
// server state behind useQuery.
|
||||
export function SessionProvider({ children }: { children: ReactNode }) {
|
||||
const [state, setState] = useState<SessionState>("unknown");
|
||||
const [instance, setInstance] = useState<string | null>(null);
|
||||
const [oidc, setOidc] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
let live = true;
|
||||
@@ -28,10 +32,12 @@ export function SessionProvider({ children }: { children: ReactNode }) {
|
||||
.authStatus()
|
||||
.then((status) => {
|
||||
// The status is 200 for anonymous visitors too, with a null user.
|
||||
if (live)
|
||||
setState(
|
||||
status.setup_required ? "setup" : status.user ? "authed" : "guest",
|
||||
);
|
||||
if (!live) return;
|
||||
setInstance(status.instance ?? null);
|
||||
setOidc(status.oidc ?? false);
|
||||
setState(
|
||||
status.setup_required ? "setup" : status.user ? "authed" : "guest",
|
||||
);
|
||||
})
|
||||
.catch(() => {
|
||||
// Any failure to prove a session means no session: the login page
|
||||
@@ -51,7 +57,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
|
||||
const expire = useCallback(() => setState("guest"), []);
|
||||
|
||||
return (
|
||||
<SessionContext.Provider value={{ state, signIn, expire }}>
|
||||
<SessionContext.Provider value={{ state, signIn, expire, instance, oidc }}>
|
||||
{children}
|
||||
</SessionContext.Provider>
|
||||
);
|
||||
|
||||
@@ -14,6 +14,7 @@ export default defineConfig({
|
||||
"/api": { target: "http://127.0.0.1:8484", changeOrigin: false },
|
||||
"/health": { target: "http://127.0.0.1:8484", changeOrigin: false },
|
||||
"/webhooks": { target: "http://127.0.0.1:8484", changeOrigin: false },
|
||||
"/oauth2": { target: "http://127.0.0.1:8484", changeOrigin: false },
|
||||
},
|
||||
},
|
||||
});
|
||||
Reference in new issue
Block a user