forked from baron/baron-sso
로그인 url path 방식 수정
This commit is contained in:
@@ -133,8 +133,8 @@ func (h *AuthHandler) InitEnchantedLink(c *fiber.Ctx) error {
|
|||||||
loginID = strings.ReplaceAll(loginID, " ", "")
|
loginID = strings.ReplaceAll(loginID, " ", "")
|
||||||
|
|
||||||
// Generate secure tokens
|
// Generate secure tokens
|
||||||
token := generateSecureToken(4)
|
token := generateSecureToken(3)
|
||||||
pendingRef := generateSecureToken(4)
|
pendingRef := generateSecureToken(3)
|
||||||
|
|
||||||
// Store in Redis
|
// Store in Redis
|
||||||
h.RedisService.Set(prefixSession+pendingRef, fmt.Sprintf(`{"status":"%s"}`, statusPending), defaultExpiration)
|
h.RedisService.Set(prefixSession+pendingRef, fmt.Sprintf(`{"status":"%s"}`, statusPending), defaultExpiration)
|
||||||
@@ -144,7 +144,7 @@ func (h *AuthHandler) InitEnchantedLink(c *fiber.Ctx) error {
|
|||||||
// Frontend URL should be dynamic or env based, but restoring hardcoded/env logic
|
// Frontend URL should be dynamic or env based, but restoring hardcoded/env logic
|
||||||
// The frontend uses ssologin.hmac.kr
|
// The frontend uses ssologin.hmac.kr
|
||||||
frontendURL := "http://ssologin.hmac.kr"
|
frontendURL := "http://ssologin.hmac.kr"
|
||||||
link := fmt.Sprintf("%s/?t=%s", frontendURL, token)
|
link := fmt.Sprintf("%s/verify/%s", frontendURL, token)
|
||||||
content := fmt.Sprintf("[Baron SSO] 로그인 링크: %s", link)
|
content := fmt.Sprintf("[Baron SSO] 로그인 링크: %s", link)
|
||||||
|
|
||||||
log.Printf("[Enchanted] Sending link to %s", loginID)
|
log.Printf("[Enchanted] Sending link to %s", loginID)
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import '../../../core/services/web_auth_integration.dart';
|
|||||||
import '../../../core/services/auth_proxy_service.dart';
|
import '../../../core/services/auth_proxy_service.dart';
|
||||||
|
|
||||||
class LoginScreen extends ConsumerStatefulWidget {
|
class LoginScreen extends ConsumerStatefulWidget {
|
||||||
const LoginScreen({super.key});
|
final String? verificationToken;
|
||||||
|
const LoginScreen({super.key, this.verificationToken});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
ConsumerState<LoginScreen> createState() => _LoginScreenState();
|
ConsumerState<LoginScreen> createState() => _LoginScreenState();
|
||||||
@@ -30,12 +31,18 @@ class _LoginScreenState extends ConsumerState<LoginScreen>
|
|||||||
super.initState();
|
super.initState();
|
||||||
_tabController = TabController(length: 2, vsync: this);
|
_tabController = TabController(length: 2, vsync: this);
|
||||||
|
|
||||||
// Check for 't' token in URL (Magic Link / Enchanted Link verification)
|
// Check for tokens (Path Parameter or Legacy Query Parameter)
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (widget.verificationToken != null) {
|
||||||
|
_verifyToken(widget.verificationToken!);
|
||||||
|
} else {
|
||||||
final uri = Uri.base;
|
final uri = Uri.base;
|
||||||
if (uri.queryParameters.containsKey('t')) {
|
if (uri.queryParameters.containsKey('t')) {
|
||||||
_verifyToken(uri.queryParameters['t']!);
|
_verifyToken(uri.queryParameters['t']!);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final uri = Uri.base;
|
||||||
if (uri.queryParameters.containsKey('redirect_url')) {
|
if (uri.queryParameters.containsKey('redirect_url')) {
|
||||||
_redirectUrl = uri.queryParameters['redirect_url'];
|
_redirectUrl = uri.queryParameters['redirect_url'];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,11 +4,13 @@ import 'package:flutter_dotenv/flutter_dotenv.dart';
|
|||||||
import 'package:descope/descope.dart';
|
import 'package:descope/descope.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:flutter_web_plugins/url_strategy.dart';
|
||||||
import 'features/auth/presentation/login_screen.dart';
|
import 'features/auth/presentation/login_screen.dart';
|
||||||
import 'features/dashboard/presentation/dashboard_screen.dart';
|
import 'features/dashboard/presentation/dashboard_screen.dart';
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
usePathUrlStrategy();
|
||||||
|
|
||||||
// Load Env (Handling error if missing for now)
|
// Load Env (Handling error if missing for now)
|
||||||
try {
|
try {
|
||||||
@@ -36,6 +38,13 @@ final _router = GoRouter(
|
|||||||
initialLocation: '/',
|
initialLocation: '/',
|
||||||
routes: [
|
routes: [
|
||||||
GoRoute(path: '/', builder: (context, state) => const LoginScreen()),
|
GoRoute(path: '/', builder: (context, state) => const LoginScreen()),
|
||||||
|
GoRoute(
|
||||||
|
path: '/verify/:token',
|
||||||
|
builder: (context, state) {
|
||||||
|
final token = state.pathParameters['token'];
|
||||||
|
return LoginScreen(verificationToken: token);
|
||||||
|
},
|
||||||
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/dashboard',
|
path: '/dashboard',
|
||||||
builder: (context, state) => const DashboardScreen(),
|
builder: (context, state) => const DashboardScreen(),
|
||||||
@@ -44,10 +53,11 @@ final _router = GoRouter(
|
|||||||
redirect: (context, state) {
|
redirect: (context, state) {
|
||||||
final isLoggedIn =
|
final isLoggedIn =
|
||||||
Descope.sessionManager.session?.refreshToken.isExpired == false;
|
Descope.sessionManager.session?.refreshToken.isExpired == false;
|
||||||
final isLoggingIn = state.uri.toString() == '/';
|
final path = state.uri.path;
|
||||||
|
final isLoggingIn = path == '/' || path.startsWith('/verify/');
|
||||||
|
|
||||||
if (!isLoggedIn && !isLoggingIn) return '/';
|
if (!isLoggedIn && !isLoggingIn) return '/';
|
||||||
if (isLoggedIn && isLoggingIn) return '/dashboard';
|
if (isLoggedIn && path == '/') return '/dashboard';
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user