Skip to content

Commit

Permalink
fix: Auth redirect for auth errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@richiemcilroy
richiemcilroy committed Oct 30, 2024
1 parent 0771214 commit f79d8b2
Show file tree
Hide file tree
Showing 3 changed files with 135 additions and 44 deletions.
12 changes: 10 additions & 2 deletions apps/desktop/src-tauri/src/auth.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ impl AuthStore {
.map_err(|e| e.to_string())
}

pub async fn handle_auth_error(app: &AppHandle, error: &str) -> Result<(), String> {
if error.contains("Authentication expired") || error.contains("Unauthorized") {
// Clear auth and redirect to sign in
Self::set(app, None)?;
crate::delete_auth_open_signin(app.clone()).await?;
}
Ok(())
}

pub async fn fetch_and_update_plan(app: &AppHandle) -> Result<(), String> {
let auth = Self::get(app)?;
let Some(mut auth) = auth else {
Expand All @@ -47,8 +56,7 @@ impl AuthStore {
.map_err(|e| e.to_string())?;

if response.status() == reqwest::StatusCode::UNAUTHORIZED {
println!("Authentication expired. Please log in again.");
Self::set(app, None)?;
Self::handle_auth_error(app, "Authentication expired").await?;
return Err("Authentication expired. Please log in again.".to_string());
}

Expand Down
132 changes: 91 additions & 41 deletions apps/desktop/src-tauri/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,32 @@ async fn stop_recording(app: AppHandle, state: MutableState<'_, App>) -> Result<
if let Ok(Some(auth)) = AuthStore::get(&app) {
if auth.is_upgraded() && settings.auto_create_shareable_link {
if let Some(pre_created_video) = state.pre_created_video.take() {
// Copy link to clipboard
#[cfg(target_os = "macos")]
{
use cocoa::appkit::NSPasteboard;
use cocoa::base::{id, nil};
use cocoa::foundation::{NSArray, NSString};
use objc::rc::autoreleasepool;

unsafe {
autoreleasepool(|| {
let pasteboard: id = NSPasteboard::generalPasteboard(nil);
NSPasteboard::clearContents(pasteboard);
let ns_string =
NSString::alloc(nil).init_str(&pre_created_video.link);
let objects: id = NSArray::arrayWithObject(nil, ns_string);
NSPasteboard::writeObjects(pasteboard, objects);
});
}
}

// Send notification for shareable link
notifications::send_notification(
&app,
notifications::NotificationType::ShareableLinkCopied,
);

// Open the pre-created shareable link
open_external_link(app.clone(), pre_created_video.link.clone()).ok();

Expand All @@ -521,6 +547,7 @@ async fn stop_recording(app: AppHandle, state: MutableState<'_, App>) -> Result<
{
Ok(_) => {
println!("Video uploaded successfully");
// Don't send notification here since we already did it above
break;
}
Err(e) => {
Expand All @@ -531,11 +558,9 @@ async fn stop_recording(app: AppHandle, state: MutableState<'_, App>) -> Result<
);

if retry_count < max_retries {
// Wait for a short time before retrying
tokio::time::sleep(std::time::Duration::from_secs(5)).await;
} else {
println!("Max retries reached. Upload failed.");
// Optionally, you can notify the user about the failure
notifications::send_notification(
&app_clone,
notifications::NotificationType::UploadFailed,
Expand Down Expand Up @@ -1697,24 +1722,40 @@ async fn upload_rendered_video(
pre_created_video: Option<PreCreatedVideo>,
) -> Result<UploadResult, String> {
let Ok(Some(mut auth)) = AuthStore::get(&app) else {
println!("not authenticated!");
// Sign out and redirect to sign in
AuthStore::set(&app, None).map_err(|e| e.to_string())?;
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
};

// Check if user has an upgraded plan
if !auth.is_upgraded() {
// Fetch and update plan information
if let Err(e) = AuthStore::fetch_and_update_plan(&app).await {
println!("Failed to update plan information: {}", e);
return Ok(UploadResult::PlanCheckFailed);
match AuthStore::fetch_and_update_plan(&app).await {
Ok(_) => {
// Refresh auth information after update
match AuthStore::get(&app) {
Ok(Some(updated_auth)) => {
auth = updated_auth;
}
Ok(None) => {
// Auth was invalidated during plan check
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
}
Err(e) => return Err(format!("Failed to refresh auth: {}", e)),
}
}
Err(e) => {
if e.contains("Authentication expired") {
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
}
return Ok(UploadResult::PlanCheckFailed);
}
}

// Refresh auth information after update
auth = AuthStore::get(&app).unwrap().unwrap();

// Re-check upgraded status after refresh
if !auth.is_upgraded() {
println!("User plan still not upgraded after refresh.");
open_upgrade_window(app).await;
return Ok(UploadResult::UpgradeRequired);
}
Expand All @@ -1724,6 +1765,10 @@ async fn upload_rendered_video(
let mut meta = editor_instance.meta();

let share_link = if let Some(sharing) = meta.sharing {
notifications::send_notification(
&app,
notifications::NotificationType::ShareableLinkCopied,
);
sharing.link
} else if let Some(pre_created) = pre_created_video {
// Use the pre-created video information
Expand All @@ -1749,6 +1794,17 @@ async fn upload_rendered_video(
meta.save_for_project();
RecordingMetaChanged { id: video_id }.emit(&app).ok();

// Don't send notification here if it was pre-created
let general_settings = GeneralSettingsStore::get(&app)?;
if !general_settings
.map(|settings| settings.auto_create_shareable_link)
.unwrap_or(false)
{
notifications::send_notification(
&app,
notifications::NotificationType::ShareableLinkCopied,
);
}
pre_created.link
}
Err(e) => {
Expand Down Expand Up @@ -1780,6 +1836,10 @@ async fn upload_rendered_video(
meta.save_for_project();
RecordingMetaChanged { id: video_id }.emit(&app).ok();

notifications::send_notification(
&app,
notifications::NotificationType::ShareableLinkCopied,
);
uploaded_video.link
}
Err(e) => {
Expand All @@ -1792,9 +1852,6 @@ async fn upload_rendered_video(
}
};

// Only send success notification if we actually got here
notifications::send_notification(&app, notifications::NotificationType::ShareableLinkCopied);

#[cfg(target_os = "macos")]
{
use cocoa::appkit::NSPasteboard;
Expand Down Expand Up @@ -1823,44 +1880,37 @@ async fn upload_screenshot(
screenshot_path: PathBuf,
) -> Result<UploadResult, String> {
let Ok(Some(mut auth)) = AuthStore::get(&app) else {
println!("not authenticated!");
// Sign out and redirect to sign in
AuthStore::set(&app, None).map_err(|e| e.to_string())?;
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
};

if !auth.is_upgraded() {
println!("User plan not upgraded. Fetching and updating plan information.");
// Fetch and update plan information
if let Err(e) = AuthStore::fetch_and_update_plan(&app).await {
println!("Failed to update plan information: {}", e);
return Ok(UploadResult::PlanCheckFailed);
}

println!("Plan information updated. Refreshing auth information.");
// Refresh auth information after update
auth = match AuthStore::get(&app) {
Ok(Some(updated_auth)) => {
println!("Auth information refreshed successfully.");
updated_auth
}
Ok(None) => {
println!("Error: No auth information found after refresh.");
return Err("Authentication information not found".to_string());
}
match AuthStore::fetch_and_update_plan(&app).await {
Ok(_) => match AuthStore::get(&app) {
Ok(Some(updated_auth)) => {
auth = updated_auth;
}
Ok(None) => {
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
}
Err(e) => return Err(format!("Failed to refresh auth: {}", e)),
},
Err(e) => {
println!("Error refreshing auth information: {}", e);
return Err("Failed to refresh authentication information".to_string());
if e.contains("Authentication expired") {
delete_auth_open_signin(app).await?;
return Ok(UploadResult::NotAuthenticated);
}
return Ok(UploadResult::PlanCheckFailed);
}
};
}

// Re-check upgraded status after refresh
if !auth.is_upgraded() {
println!("User plan still not upgraded after refresh.");
open_upgrade_window(app).await;
return Ok(UploadResult::UpgradeRequired);
}
println!("User plan is now upgraded.");
} else {
println!("User plan is already upgraded.");
}

println!("Uploading screenshot: {:?}", screenshot_path);
Expand Down
35 changes: 34 additions & 1 deletion apps/desktop/src/routes/(window-chrome)/signin.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@ import { Button } from "@cap/ui-solid";
import * as shell from "@tauri-apps/plugin-shell";
import { listen } from "@tauri-apps/api/event";
import { invoke } from "@tauri-apps/api/core";
import { action, redirect, useAction, useSubmission } from "@solidjs/router";
import {
action,
redirect,
useAction,
useSubmission,
useNavigate,
} from "@solidjs/router";
import { onMount, onCleanup } from "solid-js";

import callbackTemplate from "./callback.template";
import { authStore } from "~/store";
Expand Down Expand Up @@ -44,6 +51,8 @@ const signInAction = action(async () => {
throw new Error("Invalid token or expires");
}

await authStore.set(null);

await authStore.set({
token,
expires,
Expand All @@ -56,13 +65,37 @@ const signInAction = action(async () => {

return redirect("/");
} catch (error) {
console.error("Sign in failed:", error);
await authStore.set(null);
throw error;
}
});

export default function Page() {
const signIn = useAction(signInAction);
const submission = useSubmission(signInAction);
const navigate = useNavigate();

// Listen for auth changes and redirect to signin if auth is cleared
onMount(async () => {
let unsubscribe: (() => void) | undefined;

try {
unsubscribe = await authStore.listen((auth) => {
if (!auth) {
// Replace the current route with signin
navigate("/signin", { replace: true });
}
});
} catch (error) {
console.error("Failed to set up auth listener:", error);
}

// Clean up the listener when component unmounts
onCleanup(() => {
unsubscribe?.();
});
});

return (
<div class="flex flex-col p-[1rem] gap-[0.75rem] text-[0.875rem] font-[400] flex-1 bg-gray-100">
Expand Down

1 comment on commit f79d8b2

@vercel
Copy link

@vercel vercel bot commented on f79d8b2 Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

cap-web – ./

cap-web-git-main-mc-ilroy.vercel.app
cap-web-mc-ilroy.vercel.app
cap.so
cap-web-nu.vercel.app
www.cap.so

Please sign in to comment.