Skip to content

Add saved login restore flow #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imissapixel wants to merge 1 commit into
base: main
Choose a base branch
from
+115 −8
Open

Add saved login restore flow #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions app/src-tauri/src/commands/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,36 @@ pub async fn cmd_connect(
Ok(true)
}

#[tauri::command]
pub async fn cmd_auth_restore_session(
app_handle: tauri::AppHandle,
state: State<'_, TelegramState>,
api_id: i32,
) -> Result<AuthResult, String> {
*state.api_id.lock().await = Some(api_id);
let client = ensure_client_initialized(&app_handle, &state, api_id).await?;

match client.is_authorized().await {
Ok(true) => {
log::info!("Restored authorized Telegram session.");
Ok(AuthResult {
success: true,
next_step: Some("dashboard".to_string()),
error: None,
})
}
Ok(false) => {
log::info!("Saved Telegram session is not authorized.");
Ok(AuthResult {
success: false,
next_step: Some("phone".to_string()),
error: None,
})
}
Err(e) => Err(format!("Failed to restore Telegram session: {}", e)),
}
}

#[tauri::command]
pub async fn cmd_check_connection(
app_handle: tauri::AppHandle,
Expand Down
1 change: 1 addition & 0 deletions app/src-tauri/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ pub fn run() {
})
.invoke_handler(tauri::generate_handler![
commands::cmd_auth_request_code,
commands::cmd_auth_restore_session,
commands::cmd_auth_sign_in,
commands::cmd_auth_check_password,
commands::cmd_get_files,
Expand Down
85 changes: 77 additions & 8 deletions app/src/components/AuthWizard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { load } from '@tauri-apps/plugin-store';
import { useTheme } from '../context/ThemeContext';
import { open } from '@tauri-apps/plugin-shell';

type Step = "setup" | "phone" | "code" | "password";
type Step = "checking" | "setup" | "phone" | "code" | "password";

function AuthThemeToggle() {
const { theme, toggleTheme } = useTheme();
Expand Down Expand Up @@ -45,11 +45,12 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
)
}

const [step, setStep] = useState<Step>("setup");
const [step, setStep] = useState<Step>("checking");
const [loading, setLoading] = useState(false);

const [apiId, setApiId] = useState("");
const [apiHash, setApiHash] = useState("");
const [rememberLogin, setRememberLogin] = useState(true);

const [phone, setPhone] = useState("");
const [code, setCode] = useState("");
Expand Down Expand Up @@ -77,23 +78,49 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
const store = await load('config.json');
const savedId = await store.get<string>('api_id');
const savedHash = await store.get<string>('api_hash');
const savedRemember = await store.get<boolean>('remember_login');
const shouldRemember = savedRemember !== false;
setRememberLogin(shouldRemember);

if (savedId && savedHash) {
if (savedId) {
setApiId(savedId);
setApiHash(savedHash);
if (savedHash) setApiHash(savedHash);
if (shouldRemember) {
const idInt = parseInt(savedId, 10);
if (!isNaN(idInt)) {
try {
const res = await invoke<{ success: boolean; next_step?: string }>("cmd_auth_restore_session", { apiId: idInt });
if (res.success) {
onLogin();
return;
}
} catch (err) {
setError(`Could not restore saved Telegram session: ${String(err)}`);
}
}
}
setStep(savedHash ? "phone" : "setup");
return;
}

setStep("setup");
} catch {
// config not found, starting fresh
setStep("setup");
}
};
initStore();
}, []);
}, [onLogin]);

const saveCredentials = async () => {
try {
const store = await load('config.json');
await store.set('api_id', apiId);
await store.set('api_hash', apiHash);
await store.set('remember_login', rememberLogin);
if (rememberLogin) {
await store.set('api_id', apiId);
} else {
await store.delete('api_id');
}
await store.delete('api_hash');
await store.save();
} catch {
// store write failure, non-critical
Expand Down Expand Up @@ -122,6 +149,7 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
setLoading(true);
setError(null);
try {
await saveCredentials();
const idInt = parseInt(apiId, 10);
if (isNaN(idInt)) throw new Error("API ID must be a number");

Expand Down Expand Up @@ -156,6 +184,7 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
try {
const res = await invoke<{ success: boolean; next_step?: string }>("cmd_auth_sign_in", { code });
if (res.success) {
await saveCredentials();
onLogin();
} else if (res.next_step === "password") {
setStep("password");
Expand All @@ -176,6 +205,7 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
try {
const res = await invoke<{ success: boolean; next_step?: string }>("cmd_auth_check_password", { password });
if (res.success) {
await saveCredentials();
onLogin();
} else {
setError("Password verification failed.");
Expand Down Expand Up @@ -231,6 +261,23 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
</motion.div>
) : (
<>
{step === "checking" && (
<motion.div
key="checking"
initial={{ opacity: 0 }}
animate={{ opacity: 1 }}
exit={{ opacity: 0 }}
className="text-center space-y-6"
>
<div className="w-16 h-16 bg-blue-500/20 rounded-full flex items-center justify-center mx-auto">
<div className="w-8 h-8 border-4 border-blue-400 border-t-transparent rounded-full animate-spin" />
</div>
<div>
<h2 className="text-xl font-bold text-white mb-2">Checking Saved Session</h2>
<p className="text-sm text-gray-400">Looking for an existing Telegram login on this computer.</p>
</div>
</motion.div>
)}


{step === "setup" && (
Expand Down Expand Up @@ -269,6 +316,17 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
/>
</div>
</div>
<label className="flex items-start gap-3 rounded-xl border border-white/10 bg-white/5 p-3 text-sm text-white/80">
<input
type="checkbox"
checked={rememberLogin}
onChange={(e) => setRememberLogin(e.target.checked)}
className="mt-0.5 h-4 w-4 rounded border-white/20 bg-transparent accent-blue-500"
/>
<span>
<span className="block font-medium text-white">Keep me logged in on this device</span>
</span>
</label>
</div>

<button
Expand Down Expand Up @@ -321,6 +379,17 @@ export function AuthWizard({ onLogin }: { onLogin: () => void }) {
className="w-full glass-input rounded-xl pl-12 pr-4 py-4 text-white placeholder-gray-600 focus:outline-none focus:border-blue-500 transition-all text-lg tracking-wide"
/>
</div>
<label className="flex items-start gap-3 rounded-xl border border-white/10 bg-white/5 p-3 text-sm text-white/80">
<input
type="checkbox"
checked={rememberLogin}
onChange={(e) => setRememberLogin(e.target.checked)}
className="mt-0.5 h-4 w-4 rounded border-white/20 bg-transparent accent-blue-500"
/>
<span>
<span className="block font-medium text-white">Keep me logged in on this device</span>
</span>
</label>
</div>

<div className="flex flex-col gap-3">
Expand Down
7 changes: 7 additions & 0 deletions app/src/hooks/useTelegramConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ export function useTelegramConnection(onLogoutParent: () => void) {
const savedActiveFolderId = await _store.get<number | null>('activeFolderId');
if (savedActiveFolderId !== undefined) setActiveFolderId(savedActiveFolderId);

const existingConnection = await invoke<boolean>('cmd_check_connection').catch(() => false);
if (existingConnection) {
setIsConnected(true);
queryClient.invalidateQueries({ queryKey: ['files'] });
return;
}

const apiIdStr = await _store.get<string>('api_id');
if (apiIdStr) {
try {
Expand Down