Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-01-14 20:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "revert me"

Browse Source 
This reverts commit 75955cbf1e.
This commit is contained in:
James Brunton 2025-12-18 11:04:38 +00:00
parent 75955cbf1e
commit d012f7997e
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/core/src/main/resources/application.properties
View File

@ -63,8 +63,5 @@ spring.main.allow-bean-definition-overriding=true
# Set up a consistent temporary directory location # Set up a consistent temporary directory location
java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf} java.io.tmpdir=${stirling.tempfiles.directory:${java.io.tmpdir}/stirling-pdf}
# Force Google OAuth to always show account chooser (self-hosted SSO desktop parity with SaaS)
spring.security.oauth2.client.provider.google.authorization-uri=https://accounts.google.com/o/oauth2/v2/auth?prompt=select_account
# V2 features # V2 features
v2=true v2=true

46
frontend/src/desktop/services/authService.ts
View File

@ -516,33 +516,10 @@ export class AuthService {
*/ */
async loginWithSelfHostedOAuth(providerPath: string, serverUrl: string): Promise<UserInfo> { async loginWithSelfHostedOAuth(providerPath: string, serverUrl: string): Promise<UserInfo> {
const trimmedServer = serverUrl.replace(/\/+$/, ''); const trimmedServer = serverUrl.replace(/\/+$/, '');
const baseUrl = providerPath.startsWith('http') const fullUrl = providerPath.startsWith('http')
? providerPath ? providerPath
: `${trimmedServer}${providerPath.startsWith('/') ? providerPath : `/${providerPath}`}`; : `${trimmedServer}${providerPath.startsWith('/') ? providerPath : `/${providerPath}`}`;
// Force account chooser like SaaS: add prompt=select_account (and max_age=0 to force re-auth)
const urlObj = new URL(baseUrl, trimmedServer);
urlObj.searchParams.set('prompt', 'select_account');
urlObj.searchParams.set('max_age', '0');
// Ensure any provider-specific "login_hint" or session cookies are ignored by requiring explicit approval
urlObj.searchParams.set('approval_prompt', 'force'); // for older OAuth providers
urlObj.searchParams.set('access_type', 'offline'); // common param, sometimes influences prompt behavior
// Break Keycloak/Okta/Google session by adding a random state to defeat cached redirect
urlObj.searchParams.set('state', `${crypto.randomUUID?.() ?? Date.now().toString(36)}-desktop`);
// For Google specifically, be extra aggressive about forcing the chooser/consent
const isGoogle = providerPath.toLowerCase().includes('google');
if (isGoogle) {
urlObj.searchParams.set('prompt', 'select_account consent');
urlObj.searchParams.set('include_granted_scopes', 'false');
urlObj.searchParams.delete('login_hint');
urlObj.searchParams.set('authuser', '-1'); // tell Google to show account selector
}
const fullUrl = urlObj.toString();
// Ensure backend redirects back to /auth/callback // Ensure backend redirects back to /auth/callback
try { try {
document.cookie = `stirling_redirect_path=${encodeURIComponent('/auth/callback')}; path=/; max-age=300; SameSite=Lax`; document.cookie = `stirling_redirect_path=${encodeURIComponent('/auth/callback')}; path=/; max-age=300; SameSite=Lax`;
@ -551,26 +528,7 @@ export class AuthService {
} }
// Force a real popup so the main webview stays on the app // Force a real popup so the main webview stays on the app
let authWindow: Window | null = null; const authWindow = window.open(fullUrl, 'stirling-desktop-sso', 'width=900,height=900');
const popupName = `stirling-desktop-sso-${Date.now()}`;
if (isGoogle) {
// Hit the Google AccountChooser directly with prompt=select_account and continue to our OAuth URL
const googleAccountChooser = `https://accounts.google.com/AccountChooser?prompt=select_account&continue=${encodeURIComponent(fullUrl)}`;
authWindow = window.open(googleAccountChooser, popupName, 'width=900,height=900');
// Fallback: if navigation fails, push to OAuth URL shortly after
setTimeout(() => {
try {
if (authWindow && !authWindow.closed) {
authWindow.location.assign(fullUrl);
}
} catch (err) {
console.warn('Failed to navigate Google popup to OAuth URL', err);
}
}, 1500);
} else {
authWindow = window.open(fullUrl, popupName, 'width=900,height=900');
}
// Fallback: use Tauri shell.open and wait for deep link back // Fallback: use Tauri shell.open and wait for deep link back
if (!authWindow) { if (!authWindow) {