forked from baron/baron-sso
userfront code check 오류 수정
This commit is contained in:
@@ -3,6 +3,7 @@ import 'package:go_router/go_router.dart';
|
||||
import '../../../../core/i18n/locale_utils.dart';
|
||||
import '../../../../core/services/auth_proxy_service.dart';
|
||||
import '../../../../core/services/auth_token_store.dart';
|
||||
import '../../../../core/services/web_window.dart';
|
||||
|
||||
class ApproveQrScreen extends StatefulWidget {
|
||||
final String? pendingRef;
|
||||
@@ -60,7 +61,7 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||
if (!mounted) return;
|
||||
final target = buildLocalizedSigninPath(Uri.base);
|
||||
context.go('$target?notice=qr_login_required');
|
||||
webWindow.redirectTo('$target?notice=qr_login_required');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -102,7 +103,7 @@ class _ApproveQrScreenState extends State<ApproveQrScreen> {
|
||||
if (storedToken == null && !hasCookie) {
|
||||
if (mounted) {
|
||||
final target = buildLocalizedSigninPath(Uri.base);
|
||||
context.go('$target?notice=qr_login_required');
|
||||
webWindow.redirectTo('$target?notice=qr_login_required');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -53,6 +53,20 @@ Map<String, dynamic>? _decodeErrorDetails(String? raw) {
|
||||
return null;
|
||||
}
|
||||
|
||||
bool _hasActiveLocalSession() {
|
||||
final token = AuthTokenStore.getToken();
|
||||
return (token != null && token.isNotEmpty) || AuthTokenStore.usesCookie();
|
||||
}
|
||||
|
||||
String? _redirectPrivateLocaleRoute(GoRouterState state) {
|
||||
if (_hasActiveLocalSession()) {
|
||||
return null;
|
||||
}
|
||||
final localeCode =
|
||||
extractLocaleFromPath(state.uri) ?? resolvePreferredLocaleCode();
|
||||
return buildSigninRedirectPath(localeCode, state.uri);
|
||||
}
|
||||
|
||||
void _attemptRecoveryFromNullCheck({
|
||||
required Object exception,
|
||||
StackTrace? stackTrace,
|
||||
@@ -254,6 +268,7 @@ final _router = GoRouter(
|
||||
routes: [
|
||||
GoRoute(
|
||||
path: 'dashboard',
|
||||
redirect: (context, state) => _redirectPrivateLocaleRoute(state),
|
||||
builder: (context, state) {
|
||||
return ScopedTheme(
|
||||
controller: ThemeController.app,
|
||||
@@ -263,6 +278,7 @@ final _router = GoRouter(
|
||||
),
|
||||
GoRoute(
|
||||
path: 'profile',
|
||||
redirect: (context, state) => _redirectPrivateLocaleRoute(state),
|
||||
builder: (context, state) => ScopedTheme(
|
||||
controller: ThemeController.app,
|
||||
child: const ProfilePage(),
|
||||
@@ -422,6 +438,19 @@ final _router = GoRouter(
|
||||
),
|
||||
GoRoute(
|
||||
path: 'approve',
|
||||
redirect: (context, state) {
|
||||
final token = AuthTokenStore.getToken();
|
||||
final isLoggedIn =
|
||||
(token != null && token.isNotEmpty) ||
|
||||
AuthTokenStore.usesCookie();
|
||||
if (isLoggedIn) {
|
||||
return null;
|
||||
}
|
||||
final localeCode =
|
||||
extractLocaleFromPath(state.uri) ??
|
||||
resolvePreferredLocaleCode();
|
||||
return '/$localeCode/signin?notice=qr_login_required';
|
||||
},
|
||||
builder: (context, state) => ScopedTheme(
|
||||
controller: ThemeController.auth,
|
||||
child: ApproveQrScreen(
|
||||
@@ -431,6 +460,17 @@ final _router = GoRouter(
|
||||
),
|
||||
GoRoute(
|
||||
path: 'ql/:ref',
|
||||
redirect: (context, state) {
|
||||
final localeCode =
|
||||
extractLocaleFromPath(state.uri) ??
|
||||
resolvePreferredLocaleCode();
|
||||
final pendingRef = state.pathParameters['ref'];
|
||||
if (pendingRef == null || pendingRef.isEmpty) {
|
||||
return '/$localeCode/approve';
|
||||
}
|
||||
final encodedRef = Uri.encodeQueryComponent(pendingRef);
|
||||
return '/$localeCode/approve?ref=$encodedRef';
|
||||
},
|
||||
builder: (context, state) => ScopedTheme(
|
||||
controller: ThemeController.auth,
|
||||
child: ApproveQrScreen(pendingRef: state.pathParameters['ref']),
|
||||
@@ -438,6 +478,7 @@ final _router = GoRouter(
|
||||
),
|
||||
GoRoute(
|
||||
path: 'scan',
|
||||
redirect: (context, state) => _redirectPrivateLocaleRoute(state),
|
||||
builder: (context, state) => ScopedTheme(
|
||||
controller: ThemeController.auth,
|
||||
child: const QRScanScreen(),
|
||||
@@ -445,6 +486,7 @@ final _router = GoRouter(
|
||||
),
|
||||
GoRoute(
|
||||
path: 'admin/users',
|
||||
redirect: (context, state) => _redirectPrivateLocaleRoute(state),
|
||||
builder: (context, state) => ScopedTheme(
|
||||
controller: ThemeController.app,
|
||||
child: const UserManagementScreen(),
|
||||
@@ -568,11 +610,15 @@ class _LocaleEntryRedirectScreenState extends State<LocaleEntryRedirectScreen> {
|
||||
if (!mounted || _redirected) {
|
||||
return;
|
||||
}
|
||||
|
||||
// This parent route is also built for nested locale routes, so only
|
||||
// redirect when the current location is exactly `/{locale}`.
|
||||
if (stripLocalePath(Uri.base) != '/') {
|
||||
return;
|
||||
}
|
||||
|
||||
_redirected = true;
|
||||
final token = AuthTokenStore.getToken();
|
||||
final isLoggedIn =
|
||||
(token != null && token.isNotEmpty) || AuthTokenStore.usesCookie();
|
||||
if (!isLoggedIn) {
|
||||
if (!_hasActiveLocalSession()) {
|
||||
context.go('/${widget.localeCode}/signin');
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user