kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

Merge branch 'dev/qr'

Browse Source
This commit is contained in:
조찬영
2026-01-20 15:38:16 +09:00
parent 85d3044ace 20e848deb6
commit 03c8c14aa1
14 changed files with 186 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/lib/features/admin/presentation/create_user_screen.dart
View File

@@ -67,7 +67,7 @@ class _CreateUserScreenState extends State<CreateUserScreen> {
// If cancelled or empty
if (inputPassword == null || inputPassword.isEmpty) {
if (mounted) context.go('/dashboard'); // Kick out
if (mounted) context.go('/'); // Kick out
return;
}
@@ -88,7 +88,7 @@ class _CreateUserScreenState extends State<CreateUserScreen> {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Invalid Password. Access Denied.'), backgroundColor: Colors.red),
);
context.go('/dashboard'); // Kick out
context.go('/'); // Kick out
}
}
}
@@ -152,7 +152,7 @@ class _CreateUserScreenState extends State<CreateUserScreen> {
title: const Text('Create User'),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => context.go('/dashboard'),
onPressed: () => context.go('/'),
),
),
body: Center(

6
frontend/lib/features/admin/presentation/user_management_screen.dart
View File

@@ -78,7 +78,7 @@ class _UserManagementScreenState extends State<UserManagementScreen> with Single
);
if (inputPassword == null || inputPassword.isEmpty) {
if (mounted) context.go('/dashboard');
if (mounted) context.go('/');
return;
}
@@ -97,7 +97,7 @@ class _UserManagementScreenState extends State<UserManagementScreen> with Single
} else {
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Invalid Password'), backgroundColor: Colors.red));
context.go('/dashboard');
context.go('/');
}
}
}
@@ -277,7 +277,7 @@ class _UserManagementScreenState extends State<UserManagementScreen> with Single
title: const Text('User Management'),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
onPressed: () => context.go('/dashboard'),
onPressed: () => context.go('/'),
),
bottom: TabBar(
controller: _tabController,

8
frontend/lib/features/auth/presentation/approve_qr_screen.dart
View File

@@ -22,7 +22,7 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
final session = Descope.sessionManager.session;
if (session == null || session.refreshToken.isExpired) {
setState(() => _message = "Please log in on your phone first.");
context.go('/'); // Redirect to login
context.go('/login'); // Redirect to login
return;
}
@@ -43,7 +43,7 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
// Automatically go to dashboard after a short delay
Future.delayed(const Duration(seconds: 1), () {
if (mounted) context.go('/dashboard');
if (mounted) context.go('/');
});
} catch (e) {
setState(() => _message = "Error: $e");
@@ -103,14 +103,14 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
Padding(
padding: const EdgeInsets.only(top: 16),
child: TextButton(
onPressed: () => context.go('/'),
onPressed: () => context.go('/login'),
child: const Text("Login on this device first"),
),
),
if (_success)
FilledButton(
onPressed: () => context.go('/dashboard'),
onPressed: () => context.go('/'),
child: const Text("Go to My Dashboard"),
),
],

35
frontend/lib/features/auth/presentation/login_screen.dart
View File

@@ -449,25 +449,30 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
details: "User logged in via Baron SSO",
);
// 1. Handle Redirect Flow (Redirect to another app)
if (_redirectUrl != null && _redirectUrl!.isNotEmpty) {
final target = "$_redirectUrl?token=$token";
launchUrlString(target, webOnlyWindowName: '_self');
return;
// 1. Handle Popup Flow (Highest Priority for child windows)
// If opened as a popup (has opener), we notify and try to close.
if (WebAuthIntegration.isPopup()) {
debugPrint("[Auth] Popup detected. Notifying opener and attempting to close.");
WebAuthIntegration.sendLoginSuccess(token);
// We don't 'return' here to allow a fallback if window.close() is blocked,
// but in most cases WebAuthIntegration.sendLoginSuccess will close the window.
} else {
// 2. Handle Redirect Flow (Only if NOT a popup)
if (_redirectUrl != null && _redirectUrl!.isNotEmpty) {
debugPrint("[Auth] Redirecting standalone window to: $_redirectUrl");
final target = "$_redirectUrl?token=$token";
launchUrlString(target, webOnlyWindowName: '_self');
return;
}
}
// 2. Handle Popup Flow (Send message to opener)
if (WebAuthIntegration.isPopup()) {
WebAuthIntegration.sendLoginSuccess(token);
// If this window was truly a popup for another app, it should close now.
// If it's still here, we allow it to fall through to the dashboard.
}
// 3. Standalone mode: Go to dashboard
// We call notify() to update the router's state, and go() to ensure navigation.
// 3. Standalone mode / Fallback
// If it's a standard login, or if a popup's window.close() was blocked by the browser.
debugPrint("[Auth] Login success. Navigating to root.");
AuthNotifier.instance.notify();
if (mounted) {
context.go('/dashboard');
context.go('/');
}
}

4
frontend/lib/features/auth/presentation/login_success_screen.dart
View File

@@ -34,7 +34,7 @@ class LoginSuccessScreen extends StatelessWidget {
// 이 버튼이 QR 카메라를 켜는 버튼입니다.
FilledButton.icon(
onPressed: () {
context.push('/qr-scan');
context.push('/scan');
},
icon: const Icon(Icons.camera_alt, size: 28),
label: const Text("QR 인증 (카메라 켜기)"),
@@ -50,7 +50,7 @@ class LoginSuccessScreen extends StatelessWidget {
const SizedBox(height: 24),
TextButton(
onPressed: () {
context.go('/dashboard');
context.go('/');
},
child: const Text("나중에 하기 (대시보드로 이동)", style: TextStyle(color: Colors.grey)),
),

2
frontend/lib/features/dashboard/presentation/dashboard_screen.dart
View File

@@ -25,7 +25,7 @@ class DashboardScreen extends StatelessWidget {
return Scaffold(
backgroundColor: Colors.grey[50],
appBar: AppBar(
title: Text('Baron Launcher', style: GoogleFonts.outfit(fontWeight: FontWeight.bold)),
title: Text('Baron SSO', style: GoogleFonts.outfit(fontWeight: FontWeight.bold)),
elevation: 0,
backgroundColor: Colors.white,
foregroundColor: Colors.black,

44
frontend/lib/main.dart
View File

@@ -70,9 +70,16 @@ final _router = GoRouter(
refreshListenable: AuthNotifier.instance,
routes: [
GoRoute(
path: '/',
path: '/',
builder: (context, state) {
_routerLogger.info("Navigating to root (LoginScreen)");
_routerLogger.info("Navigating to root (DashboardScreen)");
return const DashboardScreen();
},
),
GoRoute(
path: '/login',
builder: (context, state) {
_routerLogger.info("Navigating to /login");
return const LoginScreen();
}
),
@@ -92,13 +99,6 @@ final _router = GoRouter(
return ApproveQrScreen(pendingRef: ref);
},
),
GoRoute(
path: '/dashboard',
builder: (context, state) {
_routerLogger.info("Navigating to /dashboard");
return const DashboardScreen();
},
),
GoRoute(
path: '/scan',
builder: (context, state) {
@@ -118,17 +118,29 @@ final _router = GoRouter(
final isLoggedIn =
Descope.sessionManager.session?.refreshToken?.isExpired == false;
final path = state.uri.path;
final isLoggingIn = path == '/' || path.startsWith('/verify/') || path == '/approve';
// Public paths that don't require login
final isPublicPath = path == '/login' ||
path.startsWith('/verify/') ||
path == '/approve';
_routerLogger.fine("Redirect check - Path: $path, IsLoggedIn: $isLoggedIn");
if (!isLoggedIn && !isLoggingIn) {
_routerLogger.info("Not logged in, redirecting to /");
return '/';
// 0. ALWAYS allow /verify/ to proceed so it can signal the backend
if (path.startsWith('/verify/')) {
return null;
}
if (isLoggedIn && path == '/') {
_routerLogger.info("Logged in, redirecting to /dashboard");
return '/dashboard';
// If not logged in and trying to access a protected page, redirect to /login
if (!isLoggedIn && !isPublicPath) {
_routerLogger.info("Not logged in, redirecting to /login");
return '/login';
}
// If logged in and trying to access login page, redirect to root (dashboard)
if (isLoggedIn && path == '/login') {
_routerLogger.info("Logged in, redirecting to /");
return '/';
}
return null;