login logic and settings disconnect/connect sora account

This commit is contained in:
bflatastic committed 2025-05-08 14:14:54 +07:00
1 parent 0e111c4233
commit e76aea2c12
13 files changed
+260 -108

No files matched your search

@@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react";
import React, { useEffect } from "react";
import { useSignals } from "@preact/signals-react/runtime";
import { LoadingDots, TopBar } from "~/components";
import { Controls3D } from "./comps/Controls3D";
@@ -8,7 +8,7 @@ import { ErrorDialog, LoadingDots } from "~/components";
import { GenerateModals } from "~/pages/PageEnigma/comps/GenerateModals/GenerateModals";
import { Toaster } from "@storyteller/ui-toaster";
import { EditorLoadingBar } from "./comps/EditorLoadingBar";
import { Wizard } from "~/pages/PageEnigma/Wizard/Wizard";
// import { Wizard } from "~/pages/PageEnigma/Wizard/Wizard";
import { useSignals } from "@preact/signals-react/runtime";
import { useEffect, useState } from "react";
import * as gpu from "detect-gpu";
@@ -91,7 +91,7 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => {
});
useEffect(() => {
console.log('installing event listeners')
console.log("installing event listeners");
InstallSounds();
InstallImageGenerationSuccess();
InstallImageGenerationFailure();
@@ -117,7 +117,7 @@ export const PageEnigma = ({ sceneToken }: { sceneToken?: string }) => {
/>
<GenerateModals />
<ErrorDialog />
<Wizard />
{/* <Wizard /> */}
</EngineProvider>
<EditorLoadingBar />
<Toaster offsetTop={70} offsetRight={12} />
@@ -14,7 +14,7 @@ export interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
iconClassName?: string;
iconFlip?: boolean;
htmlFor?: string;
variant?: "primary" | "secondary" | "action";
variant?: "primary" | "secondary" | "action" | "destructive";
loading?: boolean;
as?: "button" | "link";
href?: string;
@@ -44,6 +44,9 @@ export const Button = ({
case "action": {
return "bg-action hover:bg-action-900 text-white focus-visible:outline-action";
}
case "destructive": {
return "bg-red/70 hover:bg-red/50 text-white focus-visible:outline-red";
}
case "primary":
default: {
return "bg-primary hover:bg-primary-400 text-white focus-visible:outline-primary-600";
@@ -46,7 +46,8 @@ export const Input = React.forwardRef(
id={id ? id : label ? label : undefined}
className={twMerge(
"h-10 w-full rounded-lg bg-[#242424] px-3 py-2.5 text-white placeholder-white/50 outline-none",
"border border-[#363636] transition-all duration-150 ease-in-out hover:border-brand-primary/60 focus:border-brand-primary focus:!outline-none",
"border border-[#363636] transition-all duration-150 ease-in-out hover:border-primary/60 focus:border-primary focus:!outline-none",
"disabled:cursor-not-allowed disabled:opacity-60 disabled:hover:border-[#363636]",
icon && "pl-10",
isError && "outline-red focus:outline-red",
inputClassName
@@ -8,14 +8,18 @@ import {
} from "@fortawesome/pro-solid-svg-icons";
import { faDiscord } from "@fortawesome/free-brands-svg-icons";
import { IsDesktopApp } from "@storyteller/tauri-utils";
import { CheckSoraSession, SoraSessionState } from "@storyteller/tauri-api";
import {
CheckSoraSession,
SoraSessionState,
useSoraLoginListener,
} from "@storyteller/tauri-api";
import { invoke } from "@tauri-apps/api/core";
interface LoginModalProps {
onClose: () => void;
videoSrc2D: string;
videoSrc3D: string;
openAiLogo: string;
videoSrc2D?: string;
videoSrc3D?: string;
openAiLogo?: string;
}
export function LoginModal({
@@ -26,11 +30,15 @@ export function LoginModal({
}: LoginModalProps) {
const [step, setStep] = useState(1);
const [isLoading, setIsLoading] = useState(false);
const [hasSession, setHasSession] = useState(false);
const [isOpen, setIsOpen] = useState(false);
const [isLoginClicked, setIsLoginClicked] = useState(false);
const totalSteps = 3;
useSoraLoginListener((payload) => {
console.log("Login success!", payload);
setStep(3);
});
// Check session on component mount
useEffect(() => {
const initSession = async () => {
@@ -52,14 +60,12 @@ export function LoginModal({
const handleNext = async () => {
if (step === 2) {
setIsLoading(true);
setIsLoginClicked(true);
try {
if (IsDesktopApp()) {
await invoke("open_sora_login_command");
// Add 3 second delay before setting session to true
await new Promise((resolve) => setTimeout(resolve, 3000));
setHasSession(true);
const result = await CheckSoraSession();
const sessionExists = result.state === SoraSessionState.Valid;
if (sessionExists) {
@@ -69,7 +75,6 @@ export function LoginModal({
alert("Please open the desktop app to login");
// Add 3 second delay before setting session to true
await new Promise((resolve) => setTimeout(resolve, 3000));
setHasSession(true);
const sessionExists = true;
if (sessionExists) {
@@ -169,9 +174,6 @@ export function LoginModal({
alt="OpenAI Logo"
className="w-72 h-72 mx-auto grow"
/>
{/*<div>
<Button onClick={() => handleClose()}>Cancel (temporary)</Button>
</div>*/}
</div>
);
case 3:
@@ -255,17 +257,6 @@ export function LoginModal({
>
{step === 2 ? "Login with OpenAI" : "Continue"}
</Button>
{step > 1 && step !== 3 ? (
<Button
variant="secondary"
onClick={() => {
setStep(step + 1);
}}
disabled={!isLoginClicked}
>
Next
</Button>
) : null}
</>
) : (
<Button
@@ -0,0 +1,112 @@
import { useState, useEffect } from "react";
import { Button } from "@storyteller/ui-button";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faSpinnerThird } from "@fortawesome/pro-solid-svg-icons";
import {
CheckSoraSession,
SoraSessionState,
LogoutSoraSession,
useSoraLoginListener,
} from "@storyteller/tauri-api";
import { invoke } from "@tauri-apps/api/core";
interface SoraAccountButtonProps {
cacheKey?: string;
cacheTtlMs?: number;
}
export const SoraAccountButton = ({
cacheKey = "soraSettingsSessionCache",
cacheTtlMs = 5 * 60 * 1000,
}: SoraAccountButtonProps) => {
const [soraSession, setSoraSession] = useState<SoraSessionState | null>(null);
const [isCheckingSoraSession, setIsCheckingSoraSession] = useState(false);
useSoraLoginListener(() => {
setIsCheckingSoraSession(true);
CheckSoraSession()
.then((result) => {
setSoraSession(result.state);
localStorage.setItem(
cacheKey,
JSON.stringify({ state: result.state, timestamp: Date.now() })
);
})
.finally(() => setIsCheckingSoraSession(false));
});
useEffect(() => {
const fetchSession = async () => {
setIsCheckingSoraSession(true);
try {
const cached = localStorage.getItem(cacheKey);
if (cached) {
const { state, timestamp } = JSON.parse(cached);
if (Date.now() - timestamp < cacheTtlMs) {
setSoraSession(state);
setIsCheckingSoraSession(false);
return;
}
}
const result = await CheckSoraSession();
setSoraSession(result.state);
localStorage.setItem(
cacheKey,
JSON.stringify({ state: result.state, timestamp: Date.now() })
);
} catch (e) {
console.error("Error fetching Sora session", e);
setSoraSession(null);
} finally {
setIsCheckingSoraSession(false);
}
};
fetchSession();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [cacheKey, cacheTtlMs]);
const handleSoraButton = async () => {
if (isCheckingSoraSession) return;
if (soraSession === SoraSessionState.Valid) {
setIsCheckingSoraSession(true);
await LogoutSoraSession();
setSoraSession(SoraSessionState.NotSetUp);
localStorage.removeItem(cacheKey);
setIsCheckingSoraSession(false);
} else {
setIsCheckingSoraSession(true);
try {
await invoke("open_sora_login_command");
} catch (e) {
} finally {
setIsCheckingSoraSession(false);
}
}
};
return (
<Button
variant={
soraSession === SoraSessionState.Valid && !isCheckingSoraSession
? "destructive"
: soraSession === SoraSessionState.NotSetUp
? "primary"
: "secondary"
}
className="h-[30px]"
onClick={handleSoraButton}
disabled={isCheckingSoraSession}
>
{isCheckingSoraSession ? (
<FontAwesomeIcon
icon={faSpinnerThird}
className="animate-spin text-sm"
/>
) : soraSession === SoraSessionState.Valid ? (
"Disconnect"
) : (
"Connect"
)}
</Button>
);
};
@@ -1,6 +1,7 @@
import { useState } from "react";
import { Button } from "@storyteller/ui-button";
import { Input } from "@storyteller/ui-input";
import { SoraAccountButton } from "../components/SoraAccountButton";
interface AccountInfo {
username: string;
@@ -10,78 +11,81 @@ interface AccountInfo {
export const AccountSettingsPane = () => {
const [accountInfo] = useState<AccountInfo>({
username: "Username [logout]",
subscription: "Pro-tier [change/upgrade]",
credits: 10233,
username: "-",
subscription: "-",
credits: 0,
});
const [palApiKey, setPalApiKey] = useState("");
const [klingApiKey, setKlingApiKey] = useState("");
return (
<div className="space-y-4">
<div className="flex justify-between">
<span>ArtCraft Account:</span>
<span className="text-white/80">{accountInfo.username}</span>
</div>
<div className="flex justify-between">
<span>ArtCraft Subscription:</span>
<span className="text-white/80">{accountInfo.subscription}</span>
</div>
<div className="flex justify-between">
<span>Credits Remaining:</span>
<span className="text-white/80">{accountInfo.credits}</span>
</div>
<div className="rounded-md p-4 text-sm dark:bg-white/5">
<p className="text-white/60">
Note: You can optionally log into other accounts and use your credits
at those providers. Some features are only available via 3rd party
accounts, such as OpenAI / Sora GPT 4.0 Images. For other features,
ArtCraft credits are consumed unless you log into your third party
account.
</p>
</div>
<div className="flex justify-between items-center">
<span>OpenAI / Sora Account:</span>
<Button variant="secondary" className="py-1">
Connect
</Button>
</div>
<div className="flex justify-between items-center">
<span>Google / Veo Account:</span>
<Button variant="secondary" className="py-1">
Connect
</Button>
</div>
<>
<div className="space-y-4">
<div>
<label htmlFor="pal-api-key" className="mb-2 block">
Pal API Key (optional)
</label>
<Input
id="pal-api-key"
type="password"
value={palApiKey}
onChange={(e) => setPalApiKey((e.target as any).value)}
placeholder="Enter API Key"
/>
<div className="flex justify-between">
<span>ArtCraft Account:</span>
<span className="text-white/80">{accountInfo.username}</span>
</div>
<div>
<label htmlFor="kling-api-key" className="mb-2 block">
Kling API Key (optional)
</label>
<Input
id="kling-api-key"
type="password"
value={klingApiKey}
onChange={(e) => setKlingApiKey((e.target as any).value)}
placeholder="Enter API Key"
/>
<div className="flex justify-between">
<span>ArtCraft Subscription:</span>
<span className="text-white/80">{accountInfo.subscription}</span>
</div>
<div className="flex justify-between">
<span>Credits Remaining:</span>
<span className="text-white/80">{accountInfo.credits}</span>
</div>
<div className="rounded-md p-4 text-sm dark:bg-white/5">
<p className="text-white/60">
Note: You can optionally log into other accounts and use your
credits at those providers. Some features are only available via 3rd
party accounts, such as OpenAI / Sora GPT 4.0 Images. For other
features, ArtCraft credits are consumed unless you log into your
third party account.
</p>
</div>
<div className="flex justify-between items-center">
<span>OpenAI / Sora Account:</span>
<SoraAccountButton />
</div>
<div className="flex justify-between items-center">
<span>Google / Veo Account:</span>
<Button variant="secondary" disabled className="h-[30px]">
Connect
</Button>
</div>
<div className="space-y-4">
<div>
<label htmlFor="pal-api-key" className="mb-2 block">
Pal API Key (optional)
</label>
<Input
id="pal-api-key"
type="password"
value={palApiKey}
onChange={(e) => setPalApiKey((e.target as any).value)}
placeholder="Enter API Key"
disabled
/>
</div>
<div>
<label htmlFor="kling-api-key" className="mb-2 block">
Kling API Key (optional)
</label>
<Input
id="kling-api-key"
type="password"
value={klingApiKey}
onChange={(e) => setKlingApiKey((e.target as any).value)}
placeholder="Enter API Key"
disabled
/>
</div>
</div>
</div>
</div>
</>
);
};
@@ -8,21 +8,24 @@
{
"path": "../label"
},
{
"path": "../switch"
},
{
"path": "../select"
},
{
"path": "../../tauri-api"
},
{
"path": "../../soundboard"
},
{
"path": "../input"
},
{
"path": "../button"
},
{
"path": "../../soundboard"
},
{
"path": "./tsconfig.lib.json"
},
@@ -49,20 +49,23 @@
{
"path": "../label/tsconfig.lib.json"
},
{
"path": "../switch/tsconfig.lib.json"
},
{
"path": "../select/tsconfig.lib.json"
},
{
"path": "../../tauri-api/tsconfig.lib.json"
},
{
"path": "../../soundboard/tsconfig.lib.json"
},
{
"path": "../input/tsconfig.lib.json"
},
{
"path": "../button/tsconfig.lib.json"
},
{
"path": "../../soundboard/tsconfig.lib.json"
}
]
}
+5 -4
View File
@@ -1,4 +1,5 @@
export * from './lib/settings/GetAppPreferences.js';
export * from './lib/settings/UpdateAppPreference.js';
export * from './lib/sora/CheckSoraSession.js';
export * from "./lib/settings/GetAppPreferences.js";
export * from "./lib/settings/UpdateAppPreference.js";
export * from "./lib/sora/CheckSoraSession.js";
export * from "./lib/sora/useSoraLoginListener.js";
export * from "./lib/sora/LogoutSoraSession.js";
@@ -1,8 +1,8 @@
import { invoke } from "@tauri-apps/api/core";
export interface CheckSoraSessionResult {
state: SoraSessionState,
maybe_account_email?: string,
state: SoraSessionState;
maybe_account_email?: string;
}
export enum SoraSessionState {
@@ -11,8 +11,8 @@ export enum SoraSessionState {
Valid = "valid",
}
export const CheckSoraSession = async () : Promise<CheckSoraSessionResult> => {
let result = await invoke("check_sora_session_command");
export const CheckSoraSession = async (): Promise<CheckSoraSessionResult> => {
const result = await invoke("check_sora_session_command");
console.log(">>> sora result", result);
return (result as CheckSoraSessionResult);
}
return result as CheckSoraSessionResult;
};
@@ -0,0 +1,4 @@
export const LogoutSoraSession = async (): Promise<void> => {
// Replace with real Tauri command to logout Sora session - BFlat
return new Promise((resolve) => setTimeout(resolve, 500));
};
@@ -0,0 +1,30 @@
import { useEffect } from "react";
import { listen } from "@tauri-apps/api/event";
type SoraLoginSuccessPayload = {
// TODO
};
export function useSoraLoginListener(
onSuccess: (payload: SoraLoginSuccessPayload) => void
) {
useEffect(() => {
let unlisten: () => void;
const setupListener = async () => {
const stop = await listen<SoraLoginSuccessPayload>(
"sora-login-success",
(event) => {
onSuccess(event.payload);
}
);
unlisten = stop;
};
setupListener();
return () => {
if (unlisten) unlisten();
};
}, [onSuccess]);
}