Wire Android SSO Custom Tabs, carousel-safe swipes, and core saveMedia.
Open SSO in Capacitor Browser with paarrot://android return; stop swipe-to-reply stealing carousel scrolls; bump cinny for shared save helpers and register MediaStore from the overlay.
This commit is contained in:
@@ -0,0 +1,127 @@
|
||||
import { App } from '@capacitor/app';
|
||||
import { Browser } from '@capacitor/browser';
|
||||
import { isCapacitorNative } from './tauri';
|
||||
|
||||
const PROTOCOL_SCHEME = 'paarrot';
|
||||
|
||||
/**
|
||||
* Converts a paarrot:// deep link into an in-app hash route.
|
||||
* Supports:
|
||||
* - Hash routes: paarrot://anything/#/login/server/
|
||||
* - Path routes (SSO-safe): paarrot://android/login/server/?loginToken=...
|
||||
* Preserves SSO loginToken from the URL query (Synapse inserts it before `#`).
|
||||
*/
|
||||
export function deepLinkToHashRoute(deepLink: string): string | null {
|
||||
if (!deepLink) {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (!deepLink.toLowerCase().startsWith(`${PROTOCOL_SCHEME}://`)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let hashRoute: string | null = null;
|
||||
let loginToken: string | null = null;
|
||||
|
||||
try {
|
||||
const parsed = new URL(deepLink);
|
||||
loginToken = parsed.searchParams.get('loginToken');
|
||||
|
||||
if (parsed.hash && parsed.hash.length > 1) {
|
||||
const hashValue = parsed.hash.slice(1);
|
||||
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
|
||||
} else if (parsed.pathname && parsed.pathname !== '/') {
|
||||
// paarrot://android/login/... → /login/...
|
||||
hashRoute = parsed.pathname;
|
||||
if (parsed.search && parsed.search.length > 1) {
|
||||
const params = new URLSearchParams(parsed.search);
|
||||
params.delete('loginToken');
|
||||
const rest = params.toString();
|
||||
if (rest) {
|
||||
hashRoute += `?${rest}`;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
const hashIndex = deepLink.indexOf('#');
|
||||
if (hashIndex !== -1) {
|
||||
const hashValue = deepLink.slice(hashIndex + 1);
|
||||
if (hashValue) {
|
||||
hashRoute = hashValue.startsWith('/') ? hashValue : `/${hashValue}`;
|
||||
}
|
||||
}
|
||||
|
||||
const match = deepLink.match(/[?&]loginToken=([^&#]+)/i);
|
||||
if (match) {
|
||||
try {
|
||||
loginToken = decodeURIComponent(match[1]);
|
||||
} catch {
|
||||
loginToken = match[1];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (loginToken) {
|
||||
if (!hashRoute) {
|
||||
hashRoute = '/';
|
||||
}
|
||||
const queryIndex = hashRoute.indexOf('?');
|
||||
const pathPart = queryIndex === -1 ? hashRoute : hashRoute.slice(0, queryIndex);
|
||||
const params = new URLSearchParams(queryIndex === -1 ? '' : hashRoute.slice(queryIndex + 1));
|
||||
if (!params.has('loginToken')) {
|
||||
params.set('loginToken', loginToken);
|
||||
}
|
||||
const query = params.toString();
|
||||
hashRoute = query ? `${pathPart}?${query}` : pathPart;
|
||||
}
|
||||
|
||||
return hashRoute;
|
||||
}
|
||||
|
||||
async function applyDeepLink(deepLink: string): Promise<void> {
|
||||
const hashRoute = deepLinkToHashRoute(deepLink);
|
||||
if (!hashRoute) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await Browser.close();
|
||||
} catch {
|
||||
// Browser may already be closed or never opened.
|
||||
}
|
||||
|
||||
const nextHash = hashRoute.startsWith('/') ? `#${hashRoute}` : `#/${hashRoute}`;
|
||||
if (window.location.hash === nextHash) {
|
||||
// Force TokenLogin to re-run if we land on the same route again.
|
||||
window.location.hash = '#/';
|
||||
window.setTimeout(() => {
|
||||
window.location.hash = nextHash;
|
||||
}, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
window.location.hash = nextHash;
|
||||
}
|
||||
|
||||
/**
|
||||
* Listen for paarrot:// SSO returns (and cold-start launch URLs) on Capacitor Android.
|
||||
*/
|
||||
export async function initAndroidDeepLinks(): Promise<void> {
|
||||
if (!isCapacitorNative()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const launch = await App.getLaunchUrl();
|
||||
if (launch?.url) {
|
||||
await applyDeepLink(launch.url);
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('[androidDeepLink] Failed to read launch URL:', error);
|
||||
}
|
||||
|
||||
await App.addListener('appUrlOpen', ({ url }) => {
|
||||
if (!url) return;
|
||||
void applyDeepLink(url);
|
||||
});
|
||||
}
|
||||
+11
-47
@@ -1,7 +1,5 @@
|
||||
import FileSaver from 'file-saver';
|
||||
import { Capacitor, registerPlugin } from '@capacitor/core';
|
||||
import { downloadMedia } from './matrix';
|
||||
import { getCurrentAccessToken } from './auth';
|
||||
import { registerMediaSaver } from './saveMedia';
|
||||
|
||||
interface AndroidShareHandlerSavePlugin {
|
||||
saveFile(options: {
|
||||
@@ -9,19 +7,10 @@ interface AndroidShareHandlerSavePlugin {
|
||||
mimeType?: string;
|
||||
base64: string;
|
||||
}): Promise<{ saved: boolean; shared?: boolean; uri?: string }>;
|
||||
shareFile(options: {
|
||||
filename: string;
|
||||
mimeType?: string;
|
||||
base64: string;
|
||||
}): Promise<{ shared: boolean }>;
|
||||
}
|
||||
|
||||
const AndroidShareHandler = registerPlugin<AndroidShareHandlerSavePlugin>('AndroidShareHandler');
|
||||
|
||||
const isAndroidNative = (): boolean =>
|
||||
Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android';
|
||||
|
||||
/** Convert a Blob to raw base64 (no data: prefix). */
|
||||
const blobToBase64 = (blob: Blob): Promise<string> =>
|
||||
new Promise((resolve, reject) => {
|
||||
const reader = new FileReader();
|
||||
@@ -62,42 +51,17 @@ const guessMimeFromName = (filename: string): string | undefined => {
|
||||
};
|
||||
|
||||
/**
|
||||
* Persist a Blob to disk. On Capacitor Android, uses MediaStore via the native
|
||||
* ShareHandler plugin (FileSaver / `<a download>` does not work in WebView).
|
||||
* Elsewhere falls back to FileSaver.
|
||||
* Wire Capacitor Android MediaStore saves into the core saveMedia helpers.
|
||||
* Call once at app startup from the mobile overlay entry.
|
||||
*/
|
||||
export const saveMediaBlob = async (blob: Blob, filename: string): Promise<void> => {
|
||||
if (isAndroidNative()) {
|
||||
export function registerAndroidMediaSaver(): void {
|
||||
if (!(Capacitor.isNativePlatform() && Capacitor.getPlatform() === 'android')) {
|
||||
return;
|
||||
}
|
||||
|
||||
registerMediaSaver(async (blob, filename) => {
|
||||
const base64 = await blobToBase64(blob);
|
||||
const mimeType = blob.type || guessMimeFromName(filename) || 'application/octet-stream';
|
||||
await AndroidShareHandler.saveFile({ filename, mimeType, base64 });
|
||||
return;
|
||||
}
|
||||
FileSaver.saveAs(blob, filename);
|
||||
};
|
||||
|
||||
/**
|
||||
* Fetch media (auth download or blob:/http URL) and save it via [saveMediaBlob].
|
||||
*/
|
||||
export const downloadAndSaveMedia = async (
|
||||
src: string,
|
||||
filename: string,
|
||||
accessToken?: string | null
|
||||
): Promise<void> => {
|
||||
let blob: Blob;
|
||||
try {
|
||||
if (src.startsWith('blob:') || src.startsWith('data:')) {
|
||||
const res = await fetch(src);
|
||||
if (!res.ok) throw new Error(`Failed to fetch ${src}`);
|
||||
blob = await res.blob();
|
||||
} else {
|
||||
blob = await downloadMedia(src, accessToken ?? getCurrentAccessToken());
|
||||
}
|
||||
} catch (error) {
|
||||
console.warn('[saveMedia] downloadMedia failed, trying fetch fallback:', error);
|
||||
const res = await fetch(src);
|
||||
if (!res.ok) throw error;
|
||||
blob = await res.blob();
|
||||
}
|
||||
await saveMediaBlob(blob, filename);
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -4,7 +4,7 @@
|
||||
*/
|
||||
export const openExternalUrl = async (url: string): Promise<void> => {
|
||||
console.log('[openExternalUrl] called with:', url);
|
||||
|
||||
|
||||
// Use Electron's shell.openExternal if in Electron
|
||||
if (isElectron()) {
|
||||
try {
|
||||
@@ -18,7 +18,20 @@ export const openExternalUrl = async (url: string): Promise<void> => {
|
||||
console.warn('[openExternalUrl] Electron shell.openExternal failed:', err);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Capacitor: SSO (and other handoffs) need Chrome Custom Tabs / in-app Browser
|
||||
// so paarrot:// redirects return into the app instead of a blank external tab.
|
||||
if (isCapacitorNative()) {
|
||||
try {
|
||||
const { Browser } = await import('@capacitor/browser');
|
||||
await Browser.open({ url, presentationStyle: 'popover' });
|
||||
console.log('[openExternalUrl] Capacitor Browser.open succeeded');
|
||||
return;
|
||||
} catch (err) {
|
||||
console.warn('[openExternalUrl] Capacitor Browser.open failed:', err);
|
||||
}
|
||||
}
|
||||
|
||||
// Use Tauri for actual Tauri builds
|
||||
if (isTauri() && !isElectron()) {
|
||||
try {
|
||||
@@ -30,7 +43,7 @@ export const openExternalUrl = async (url: string): Promise<void> => {
|
||||
return;
|
||||
} catch (pluginErr) {
|
||||
console.warn('[openExternalUrl] Tauri opener plugin failed:', pluginErr);
|
||||
|
||||
|
||||
// Fallback: try the custom command (useful if plugin fails due to ACL)
|
||||
try {
|
||||
console.log('[openExternalUrl] trying Tauri invoke command fallback...');
|
||||
@@ -43,7 +56,7 @@ export const openExternalUrl = async (url: string): Promise<void> => {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log('[openExternalUrl] falling back to window.open');
|
||||
window.open(url, '_blank');
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user