Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
34fdc77818 | ||
|
|
c374ecbffb | ||
|
|
55a9cbdc6e | ||
|
|
a6fc9daab9 | ||
|
|
8b3bff7df0 | ||
|
|
2b2ddc1b1b | ||
|
|
0d5986b81a | ||
|
|
31e3306997 | ||
|
|
5f3ff7f31a | ||
|
|
f90b4a0963 |
@@ -59,10 +59,8 @@ This project uses version-tag-based CI/CD. Releases trigger automated Docker bui
|
|||||||
3. Commit changes: `git commit -m "chore: release vX.X.X"`
|
3. Commit changes: `git commit -m "chore: release vX.X.X"`
|
||||||
4. Create git tag: `git tag vX.X.X`
|
4. Create git tag: `git tag vX.X.X`
|
||||||
5. Push with tags: `git push origin master --tags`
|
5. Push with tags: `git push origin master --tags`
|
||||||
6. Create release in Gitea UI (git.schweitz.net → Releases → New Release)
|
|
||||||
* Select the tag
|
CI/CD auto-triggers when a tag starting with `v` is pushed.
|
||||||
* Add release notes (can copy from CHANGELOG)
|
|
||||||
* **Publish** the release (this triggers CI/CD)
|
|
||||||
|
|
||||||
**What happens on release:**
|
**What happens on release:**
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,50 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [1.1.11] - 2026-01-04
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- API client providers now use `keepAlive: true` to prevent Ref invalidation
|
||||||
|
- Fixes "DioException [unknown]: null" error on /security/users and other API pages
|
||||||
|
- AuthInterceptor's stored Ref was becoming invalid when provider auto-disposed
|
||||||
|
|
||||||
|
## [1.1.10] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Removed page swipe transitions - all navigation is now instant (NoTransitionPage)
|
||||||
|
|
||||||
|
## [1.1.9] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Moved health check to `/health` directory - URL is now `/health` instead of `/health.html`
|
||||||
|
- Enables NPM forward auth path exclusion for health endpoint
|
||||||
|
|
||||||
|
## [1.1.8] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Dark background (`#1a1a2e`) on web/index.html to prevent white flash during auth redirects
|
||||||
|
|
||||||
|
## [1.1.7] - 2026-01-04
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- Removed `/callback` route from Flutter router - AuthController handles callback in main() before app starts
|
||||||
|
- Removed `_OidcCallbackPage` widget - no visible auth UI needed
|
||||||
|
|
||||||
|
## [1.1.6] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Auth moved to standalone controller** - Handles OIDC completely outside Riverpod
|
||||||
|
- New `AuthController` runs in `main()` before `runApp()` - avoids provider lifecycle issues
|
||||||
|
- Handles callback, token exchange, and /auth/sync before app starts
|
||||||
|
- If auth not ready (redirecting), app doesn't start at all
|
||||||
|
- `AuthProvider` now just loads stored tokens (no async OIDC logic)
|
||||||
|
- Fixes "Cannot use Ref after disposed" errors from autoDispose providers
|
||||||
|
|
||||||
|
## [1.1.5] - 2026-01-04
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Race condition in OIDC callback: AuthProvider.build() was initiating silent OIDC while the callback page was processing, causing PKCE state to be cleared. Now skips silent OIDC when on `/callback` route.
|
||||||
|
|
||||||
## [1.1.4] - 2026-01-04
|
## [1.1.4] - 2026-01-04
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
@@ -9,7 +9,10 @@ import 'api_client_native.dart' if (dart.library.html) 'api_client_web.dart'
|
|||||||
part 'api_client.g.dart';
|
part 'api_client.g.dart';
|
||||||
|
|
||||||
/// Provides the Dio instance for Core API.
|
/// Provides the Dio instance for Core API.
|
||||||
@riverpod
|
///
|
||||||
|
/// Uses keepAlive to prevent auto-dispose - the AuthInterceptor stores
|
||||||
|
/// a Ref that must remain valid for the lifetime of API requests.
|
||||||
|
@Riverpod(keepAlive: true)
|
||||||
Dio coreApiClient(Ref ref) {
|
Dio coreApiClient(Ref ref) {
|
||||||
final options = BaseOptions(
|
final options = BaseOptions(
|
||||||
baseUrl: AppConfig.coreApiUrl,
|
baseUrl: AppConfig.coreApiUrl,
|
||||||
@@ -33,7 +36,10 @@ Dio coreApiClient(Ref ref) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Provides the Dio instance for Tatlock API.
|
/// Provides the Dio instance for Tatlock API.
|
||||||
@riverpod
|
///
|
||||||
|
/// Uses keepAlive to prevent auto-dispose - the AuthInterceptor stores
|
||||||
|
/// a Ref that must remain valid for the lifetime of API requests.
|
||||||
|
@Riverpod(keepAlive: true)
|
||||||
Dio tatlockApiClient(Ref ref) {
|
Dio tatlockApiClient(Ref ref) {
|
||||||
final options = BaseOptions(
|
final options = BaseOptions(
|
||||||
baseUrl: AppConfig.tatlockApiUrl,
|
baseUrl: AppConfig.tatlockApiUrl,
|
||||||
|
|||||||
@@ -0,0 +1,288 @@
|
|||||||
|
import 'dart:convert' show jsonDecode, jsonEncode;
|
||||||
|
import 'dart:developer' as developer;
|
||||||
|
|
||||||
|
import 'package:dio/dio.dart';
|
||||||
|
import 'package:flutter/foundation.dart' show kIsWeb;
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
import '../config/app_config.dart';
|
||||||
|
import 'auth_datasource.dart';
|
||||||
|
import 'auth_state.dart';
|
||||||
|
import 'oidc_service_web.dart';
|
||||||
|
import 'permissions.dart';
|
||||||
|
import 'user_preferences.dart';
|
||||||
|
import 'web_utils.dart' as web_utils;
|
||||||
|
|
||||||
|
/// Standalone auth controller that handles OIDC flow before app starts.
|
||||||
|
///
|
||||||
|
/// This runs outside of Riverpod to avoid lifecycle issues. Call [initialize]
|
||||||
|
/// in main() before runApp(). The controller will:
|
||||||
|
/// 1. Handle callback if on /callback route (exchange code, sync, store tokens)
|
||||||
|
/// 2. Check for valid stored tokens
|
||||||
|
/// 3. Redirect to silent OIDC if no tokens (app won't continue)
|
||||||
|
///
|
||||||
|
/// Once auth is complete, [AuthProvider] can simply read the stored tokens.
|
||||||
|
class AuthController {
|
||||||
|
// Storage keys (same as AuthProvider)
|
||||||
|
static const _accessTokenKey = 'auth_access_token';
|
||||||
|
static const _refreshTokenKey = 'auth_refresh_token';
|
||||||
|
static const _expiresAtKey = 'auth_expires_at';
|
||||||
|
static const _userIdKey = 'auth_user_id';
|
||||||
|
static const _authentikIdKey = 'auth_authentik_id';
|
||||||
|
static const _userNameKey = 'auth_user_name';
|
||||||
|
static const _userEmailKey = 'auth_user_email';
|
||||||
|
static const _avatarUrlKey = 'auth_avatar_url';
|
||||||
|
static const _rolesKey = 'auth_roles';
|
||||||
|
static const _preferencesKey = 'auth_preferences';
|
||||||
|
|
||||||
|
/// Initialize auth before app starts.
|
||||||
|
///
|
||||||
|
/// Returns true if auth is ready (tokens available).
|
||||||
|
/// Returns false if redirecting (app should not continue).
|
||||||
|
/// Throws on error.
|
||||||
|
static Future<bool> initialize() async {
|
||||||
|
// Skip auth entirely for LAN mode
|
||||||
|
if (!AppConfig.requiresAuth) {
|
||||||
|
developer.log('Auth not required (LAN mode)', name: 'auth_controller');
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only handle web auth here - mobile uses different flow
|
||||||
|
if (!kIsWeb) {
|
||||||
|
developer.log('Non-web platform, skipping controller init', name: 'auth_controller');
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
final currentUrl = web_utils.getCurrentUrl();
|
||||||
|
developer.log('Auth controller init, URL: $currentUrl', name: 'auth_controller');
|
||||||
|
|
||||||
|
// Check if we're on the callback route
|
||||||
|
if (currentUrl.contains('/callback')) {
|
||||||
|
return _handleCallback(currentUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for valid stored tokens
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
final accessToken = prefs.getString(_accessTokenKey);
|
||||||
|
if (accessToken != null) {
|
||||||
|
final expiresAtMs = prefs.getInt(_expiresAtKey);
|
||||||
|
final expiresAt = expiresAtMs != null
|
||||||
|
? DateTime.fromMillisecondsSinceEpoch(expiresAtMs)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (expiresAt == null || expiresAt.isAfter(DateTime.now())) {
|
||||||
|
developer.log('Valid tokens found', name: 'auth_controller');
|
||||||
|
return true; // Auth ready
|
||||||
|
}
|
||||||
|
developer.log('Tokens expired', name: 'auth_controller');
|
||||||
|
}
|
||||||
|
|
||||||
|
// No valid tokens - initiate silent OIDC
|
||||||
|
developer.log('No valid tokens, starting silent OIDC', name: 'auth_controller');
|
||||||
|
await _initiateSilentOidc();
|
||||||
|
return false; // Redirecting, app should not continue
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Handle the OIDC callback.
|
||||||
|
static Future<bool> _handleCallback(String url) async {
|
||||||
|
final uri = Uri.parse(url);
|
||||||
|
final code = uri.queryParameters['code'];
|
||||||
|
final state = uri.queryParameters['state'];
|
||||||
|
final error = uri.queryParameters['error'];
|
||||||
|
|
||||||
|
developer.log('Handling callback: code=${code != null}, error=$error', name: 'auth_controller');
|
||||||
|
|
||||||
|
// Handle errors
|
||||||
|
if (error != null) {
|
||||||
|
if (error == 'login_required') {
|
||||||
|
// Silent auth failed - no session, start regular OIDC
|
||||||
|
developer.log('Silent auth failed (login_required), starting regular OIDC', name: 'auth_controller');
|
||||||
|
await _initiateRegularOidc();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
throw Exception('Auth error: $error - ${uri.queryParameters['error_description']}');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (code == null || state == null) {
|
||||||
|
throw Exception('Invalid callback - missing code or state');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exchange code for tokens
|
||||||
|
developer.log('Exchanging code for tokens', name: 'auth_controller');
|
||||||
|
final oidcService = OidcServiceWeb();
|
||||||
|
final tokens = await oidcService.exchangeCode(code, state);
|
||||||
|
|
||||||
|
// Sync with core-api
|
||||||
|
developer.log('Syncing with core-api', name: 'auth_controller');
|
||||||
|
final dio = Dio(BaseOptions(
|
||||||
|
baseUrl: AppConfig.coreApiUrl,
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json',
|
||||||
|
},
|
||||||
|
));
|
||||||
|
final authDatasource = AuthDatasource(dio);
|
||||||
|
final syncResponse = await authDatasource.syncUser(tokens.accessToken);
|
||||||
|
|
||||||
|
developer.log('Synced user: ${syncResponse.name}', name: 'auth_controller');
|
||||||
|
|
||||||
|
// Store credentials
|
||||||
|
await _storeAuth(
|
||||||
|
accessToken: tokens.accessToken,
|
||||||
|
refreshToken: tokens.refreshToken,
|
||||||
|
expiresAt: tokens.expiresAt,
|
||||||
|
userId: syncResponse.userId,
|
||||||
|
authentikId: syncResponse.authentikId,
|
||||||
|
userName: syncResponse.name,
|
||||||
|
userEmail: syncResponse.email,
|
||||||
|
avatarUrl: syncResponse.avatarUrl,
|
||||||
|
roles: syncResponse.roles,
|
||||||
|
preferences: syncResponse.preferences,
|
||||||
|
);
|
||||||
|
|
||||||
|
// Redirect to home (removes callback params from URL)
|
||||||
|
developer.log('Auth complete, redirecting to home', name: 'auth_controller');
|
||||||
|
web_utils.redirectTo('/');
|
||||||
|
return false; // Redirecting
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Initiate silent OIDC (prompt=none).
|
||||||
|
static Future<void> _initiateSilentOidc() async {
|
||||||
|
final oidcService = OidcServiceWeb();
|
||||||
|
final authUrl = await oidcService.getAuthorizationUrl(silent: true);
|
||||||
|
developer.log('Redirecting to silent OIDC', name: 'auth_controller');
|
||||||
|
web_utils.redirectTo(authUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Initiate regular OIDC (shows login UI).
|
||||||
|
static Future<void> _initiateRegularOidc() async {
|
||||||
|
final oidcService = OidcServiceWeb();
|
||||||
|
final authUrl = await oidcService.getAuthorizationUrl(silent: false);
|
||||||
|
developer.log('Redirecting to regular OIDC', name: 'auth_controller');
|
||||||
|
web_utils.redirectTo(authUrl);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Store auth data.
|
||||||
|
static Future<void> _storeAuth({
|
||||||
|
required String accessToken,
|
||||||
|
String? refreshToken,
|
||||||
|
DateTime? expiresAt,
|
||||||
|
String? userId,
|
||||||
|
String? authentikId,
|
||||||
|
String? userName,
|
||||||
|
String? userEmail,
|
||||||
|
String? avatarUrl,
|
||||||
|
List<Role>? roles,
|
||||||
|
UserPreferences? preferences,
|
||||||
|
}) async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
|
||||||
|
await prefs.setString(_accessTokenKey, accessToken);
|
||||||
|
if (refreshToken != null) {
|
||||||
|
await prefs.setString(_refreshTokenKey, refreshToken);
|
||||||
|
}
|
||||||
|
if (expiresAt != null) {
|
||||||
|
await prefs.setInt(_expiresAtKey, expiresAt.millisecondsSinceEpoch);
|
||||||
|
}
|
||||||
|
if (userId != null) await prefs.setString(_userIdKey, userId);
|
||||||
|
if (authentikId != null) await prefs.setString(_authentikIdKey, authentikId);
|
||||||
|
if (userName != null) await prefs.setString(_userNameKey, userName);
|
||||||
|
if (userEmail != null) await prefs.setString(_userEmailKey, userEmail);
|
||||||
|
if (avatarUrl != null) await prefs.setString(_avatarUrlKey, avatarUrl);
|
||||||
|
|
||||||
|
if (roles != null) {
|
||||||
|
final rolesJson = jsonEncode(roles.map((r) => {
|
||||||
|
'id': r.id,
|
||||||
|
'name': r.name,
|
||||||
|
'domain': r.domain.value,
|
||||||
|
'category': r.category,
|
||||||
|
'action': r.action.name,
|
||||||
|
}).toList());
|
||||||
|
await prefs.setString(_rolesKey, rolesJson);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (preferences != null) {
|
||||||
|
await prefs.setString(_preferencesKey, jsonEncode(preferences.toJson()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Load stored auth state (for AuthProvider to use).
|
||||||
|
static Future<AuthState> loadStoredAuth() async {
|
||||||
|
try {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
|
||||||
|
final accessToken = prefs.getString(_accessTokenKey);
|
||||||
|
if (accessToken == null) {
|
||||||
|
return const AuthState();
|
||||||
|
}
|
||||||
|
|
||||||
|
final expiresAtMs = prefs.getInt(_expiresAtKey);
|
||||||
|
final expiresAt = expiresAtMs != null
|
||||||
|
? DateTime.fromMillisecondsSinceEpoch(expiresAtMs)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
final rolesJson = prefs.getString(_rolesKey);
|
||||||
|
final roles = rolesJson != null ? _parseRoles(rolesJson) : <Role>[];
|
||||||
|
|
||||||
|
final prefsJson = prefs.getString(_preferencesKey);
|
||||||
|
final preferences = prefsJson != null
|
||||||
|
? UserPreferences.fromJson(jsonDecode(prefsJson) as Map<String, dynamic>)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return AuthState(
|
||||||
|
isAuthenticated: true,
|
||||||
|
accessToken: accessToken,
|
||||||
|
refreshToken: prefs.getString(_refreshTokenKey),
|
||||||
|
expiresAt: expiresAt,
|
||||||
|
userId: prefs.getString(_userIdKey),
|
||||||
|
authentikId: prefs.getString(_authentikIdKey),
|
||||||
|
userName: prefs.getString(_userNameKey),
|
||||||
|
userEmail: prefs.getString(_userEmailKey),
|
||||||
|
avatarUrl: prefs.getString(_avatarUrlKey),
|
||||||
|
roles: roles,
|
||||||
|
preferences: preferences,
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
developer.log('Failed to load stored auth: $e', name: 'auth_controller');
|
||||||
|
return const AuthState();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static List<Role> _parseRoles(String json) {
|
||||||
|
try {
|
||||||
|
final list = jsonDecode(json) as List<dynamic>;
|
||||||
|
return list.map((item) {
|
||||||
|
final map = item as Map<String, dynamic>;
|
||||||
|
final domain = Domain.fromString(map['domain'] as String);
|
||||||
|
final action = Action.fromString(map['action'] as String);
|
||||||
|
|
||||||
|
if (domain == null || action == null) return null;
|
||||||
|
|
||||||
|
return Role(
|
||||||
|
id: map['id'] as String,
|
||||||
|
name: map['name'] as String,
|
||||||
|
domain: domain,
|
||||||
|
category: map['category'] as String? ?? 'general',
|
||||||
|
action: action,
|
||||||
|
);
|
||||||
|
}).whereType<Role>().toList();
|
||||||
|
} catch (e) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Clear stored auth (for logout).
|
||||||
|
static Future<void> clearAuth() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
await prefs.remove(_accessTokenKey);
|
||||||
|
await prefs.remove(_refreshTokenKey);
|
||||||
|
await prefs.remove(_expiresAtKey);
|
||||||
|
await prefs.remove(_userIdKey);
|
||||||
|
await prefs.remove(_authentikIdKey);
|
||||||
|
await prefs.remove(_userNameKey);
|
||||||
|
await prefs.remove(_userEmailKey);
|
||||||
|
await prefs.remove(_avatarUrlKey);
|
||||||
|
await prefs.remove(_rolesKey);
|
||||||
|
await prefs.remove(_preferencesKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -40,44 +40,12 @@ class AuthNotifier extends _$AuthNotifier {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<AuthState> build() async {
|
Future<AuthState> build() async {
|
||||||
// On web with auth required, use silent OIDC to get JWT
|
// AuthController.initialize() in main() handles OIDC flow before app starts.
|
||||||
if (kIsWeb && AppConfig.requiresAuth) {
|
// By the time we get here, tokens are already stored (or we're in LAN mode).
|
||||||
// First check if we have stored tokens
|
// Just load the stored auth state.
|
||||||
final storedAuth = await _loadStoredAuth();
|
|
||||||
if (storedAuth.isAuthenticated && !storedAuth.isTokenExpired) {
|
|
||||||
developer.log('Web: Using stored tokens for ${storedAuth.userName}', name: 'auth');
|
|
||||||
return storedAuth;
|
|
||||||
}
|
|
||||||
|
|
||||||
// No valid tokens - initiate silent OIDC
|
|
||||||
// NPM forward auth ensures user has Authentik session
|
|
||||||
// prompt=none will get us a token instantly without UI
|
|
||||||
developer.log('Web: No valid tokens, initiating silent OIDC', name: 'auth');
|
|
||||||
_initiateSilentOidc();
|
|
||||||
|
|
||||||
// Return unauthenticated state - will redirect before this matters
|
|
||||||
return const AuthState();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mobile/LAN: Load stored auth from SharedPreferences
|
|
||||||
return _loadStoredAuth();
|
return _loadStoredAuth();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Initiate silent OIDC flow on web.
|
|
||||||
///
|
|
||||||
/// Uses prompt=none to get a token without showing login UI.
|
|
||||||
/// Relies on existing Authentik session (established via NPM forward auth).
|
|
||||||
Future<void> _initiateSilentOidc() async {
|
|
||||||
try {
|
|
||||||
final oidcService = OidcServiceWeb();
|
|
||||||
final authUrl = await oidcService.getAuthorizationUrl(silent: true);
|
|
||||||
developer.log('Redirecting to silent OIDC: $authUrl', name: 'auth');
|
|
||||||
web_utils.redirectTo(authUrl);
|
|
||||||
} catch (e) {
|
|
||||||
developer.log('Failed to initiate silent OIDC: $e', name: 'auth');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<AuthState> _loadStoredAuth() async {
|
Future<AuthState> _loadStoredAuth() async {
|
||||||
try {
|
try {
|
||||||
final prefs = await SharedPreferences.getInstance();
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:tatlock_ui/features/control_room/presentation/pages/control_room_page.dart';
|
import 'package:tatlock_ui/features/control_room/presentation/pages/control_room_page.dart';
|
||||||
|
import 'package:tatlock_ui/routing/app_router.dart';
|
||||||
import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
|
import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
|
||||||
|
|
||||||
/// Route paths for Control Room.
|
/// Route paths for Control Room.
|
||||||
@@ -66,7 +67,8 @@ List<RouteBase> controlRoomRoutes() {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: nav.path,
|
path: nav.path,
|
||||||
name: 'controlRoom${_capitalize(nav.id.replaceAll('-', '_'))}',
|
name: 'controlRoom${_capitalize(nav.id.replaceAll('-', '_'))}',
|
||||||
builder: (context, state) => ControlRoomPage(nav: nav),
|
pageBuilder: (context, state) =>
|
||||||
|
noTransitionPage(context, state, ControlRoomPage(nav: nav)),
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:tatlock_ui/features/security/presentation/pages/security_page.dart';
|
import 'package:tatlock_ui/features/security/presentation/pages/security_page.dart';
|
||||||
|
import 'package:tatlock_ui/routing/app_router.dart';
|
||||||
import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
|
import 'package:tatlock_ui/shared/layouts/widgets/nav_panel.dart';
|
||||||
|
|
||||||
/// Route paths for Security room.
|
/// Route paths for Security room.
|
||||||
@@ -60,7 +61,8 @@ List<RouteBase> securityRoutes() {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: nav.path,
|
path: nav.path,
|
||||||
name: 'security${_capitalize(nav.id.replaceAll('-', '_'))}',
|
name: 'security${_capitalize(nav.id.replaceAll('-', '_'))}',
|
||||||
builder: (context, state) => SecurityPage(nav: nav),
|
pageBuilder: (context, state) =>
|
||||||
|
noTransitionPage(context, state, SecurityPage(nav: nav)),
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-5
@@ -4,19 +4,26 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
|
||||||
import 'app.dart';
|
import 'app.dart';
|
||||||
|
import 'core/auth/auth_controller.dart';
|
||||||
import 'core/config/url_strategy.dart';
|
import 'core/config/url_strategy.dart';
|
||||||
import 'version.g.dart';
|
import 'version.g.dart';
|
||||||
|
|
||||||
void main() {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
|
||||||
// Use path-based URLs on web (no-op on mobile/desktop)
|
// Use path-based URLs on web (no-op on mobile/desktop)
|
||||||
configureUrlStrategy();
|
configureUrlStrategy();
|
||||||
|
|
||||||
developer.log(
|
debugPrint('🪣 ${AppVersion.name} v${AppVersion.fullVersion}');
|
||||||
'${AppVersion.name} v${AppVersion.fullVersion}',
|
|
||||||
name: 'tatlock_ui',
|
// Initialize auth before starting the app.
|
||||||
);
|
// This handles OIDC callback and silent auth on web.
|
||||||
|
// If it returns false, we're redirecting and shouldn't continue.
|
||||||
|
final authReady = await AuthController.initialize();
|
||||||
|
if (!authReady) {
|
||||||
|
developer.log('Auth redirecting, not starting app', name: 'tatlock_ui');
|
||||||
|
return; // Don't run the app - browser is redirecting
|
||||||
|
}
|
||||||
|
|
||||||
runApp(const ProviderScope(child: TatlockApp()));
|
runApp(const ProviderScope(child: TatlockApp()));
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-164
@@ -1,8 +1,6 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
import 'package:tatlock_ui/core/auth/auth_provider.dart';
|
|
||||||
import 'package:tatlock_ui/features/control_room/router.dart';
|
import 'package:tatlock_ui/features/control_room/router.dart';
|
||||||
import 'package:tatlock_ui/features/front_hall/presentation/pages/front_hall_page.dart';
|
import 'package:tatlock_ui/features/front_hall/presentation/pages/front_hall_page.dart';
|
||||||
import 'package:tatlock_ui/features/security/router.dart';
|
import 'package:tatlock_ui/features/security/router.dart';
|
||||||
@@ -10,12 +8,19 @@ import 'package:tatlock_ui/shared/layouts/app_scaffold.dart';
|
|||||||
|
|
||||||
part 'app_router.g.dart';
|
part 'app_router.g.dart';
|
||||||
|
|
||||||
|
/// No-animation page builder for instant transitions
|
||||||
|
Page<void> noTransitionPage(BuildContext context, GoRouterState state, Widget child) {
|
||||||
|
return NoTransitionPage<void>(
|
||||||
|
key: state.pageKey,
|
||||||
|
child: child,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/// Route paths as constants.
|
/// Route paths as constants.
|
||||||
abstract class AppRoutes {
|
abstract class AppRoutes {
|
||||||
static const frontHall = '/';
|
static const frontHall = '/';
|
||||||
static const parlor = '/parlor';
|
static const parlor = '/parlor';
|
||||||
static const settings = '/settings';
|
static const settings = '/settings';
|
||||||
static const callback = '/callback';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Provides the GoRouter instance.
|
/// Provides the GoRouter instance.
|
||||||
@@ -25,17 +30,6 @@ GoRouter appRouter(Ref ref) {
|
|||||||
initialLocation: AppRoutes.frontHall,
|
initialLocation: AppRoutes.frontHall,
|
||||||
debugLogDiagnostics: true,
|
debugLogDiagnostics: true,
|
||||||
routes: [
|
routes: [
|
||||||
// OIDC callback route (handles auth code exchange)
|
|
||||||
GoRoute(
|
|
||||||
path: AppRoutes.callback,
|
|
||||||
name: 'callback',
|
|
||||||
builder: (context, state) => _OidcCallbackPage(
|
|
||||||
code: state.uri.queryParameters['code'],
|
|
||||||
callbackState: state.uri.queryParameters['state'],
|
|
||||||
error: state.uri.queryParameters['error'],
|
|
||||||
errorDescription: state.uri.queryParameters['error_description'],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
// Main app routes (inside shell with app scaffold)
|
// Main app routes (inside shell with app scaffold)
|
||||||
ShellRoute(
|
ShellRoute(
|
||||||
builder: (context, state, child) => AppScaffold(child: child),
|
builder: (context, state, child) => AppScaffold(child: child),
|
||||||
@@ -43,21 +37,22 @@ GoRouter appRouter(Ref ref) {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: AppRoutes.frontHall,
|
path: AppRoutes.frontHall,
|
||||||
name: 'frontHall',
|
name: 'frontHall',
|
||||||
builder: (context, state) => const FrontHallPage(),
|
pageBuilder: (context, state) =>
|
||||||
|
noTransitionPage(context, state, const FrontHallPage()),
|
||||||
),
|
),
|
||||||
...controlRoomRoutes(),
|
...controlRoomRoutes(),
|
||||||
...securityRoutes(),
|
...securityRoutes(),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: AppRoutes.parlor,
|
path: AppRoutes.parlor,
|
||||||
name: 'parlor',
|
name: 'parlor',
|
||||||
builder: (context, state) =>
|
pageBuilder: (context, state) =>
|
||||||
const _PlaceholderPage(title: 'Parlor'),
|
noTransitionPage(context, state, const _PlaceholderPage(title: 'Parlor')),
|
||||||
),
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: AppRoutes.settings,
|
path: AppRoutes.settings,
|
||||||
name: 'settings',
|
name: 'settings',
|
||||||
builder: (context, state) =>
|
pageBuilder: (context, state) =>
|
||||||
const _PlaceholderPage(title: 'Settings'),
|
noTransitionPage(context, state, const _PlaceholderPage(title: 'Settings')),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -100,148 +95,3 @@ class _PlaceholderPage extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// OIDC callback page that handles the authorization code exchange.
|
|
||||||
class _OidcCallbackPage extends ConsumerStatefulWidget {
|
|
||||||
const _OidcCallbackPage({
|
|
||||||
this.code,
|
|
||||||
this.callbackState,
|
|
||||||
this.error,
|
|
||||||
this.errorDescription,
|
|
||||||
});
|
|
||||||
|
|
||||||
final String? code;
|
|
||||||
final String? callbackState;
|
|
||||||
final String? error;
|
|
||||||
final String? errorDescription;
|
|
||||||
|
|
||||||
@override
|
|
||||||
ConsumerState<_OidcCallbackPage> createState() => _OidcCallbackPageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _OidcCallbackPageState extends ConsumerState<_OidcCallbackPage> {
|
|
||||||
bool _isProcessing = true;
|
|
||||||
String? _error;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
// Defer callback processing to avoid Riverpod state modification during build
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
||||||
_processCallback();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _processCallback() async {
|
|
||||||
// Check mounted before any async work
|
|
||||||
if (!mounted) return;
|
|
||||||
|
|
||||||
// Check for error from Authentik
|
|
||||||
if (widget.error != null) {
|
|
||||||
// Silent OIDC (prompt=none) failed - no existing session
|
|
||||||
// Fall back to regular OIDC flow to show login UI
|
|
||||||
if (widget.error == 'login_required') {
|
|
||||||
ref.read(authProvider.notifier).signIn();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setState(() {
|
|
||||||
_isProcessing = false;
|
|
||||||
_error = widget.errorDescription ?? widget.error;
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check for required parameters
|
|
||||||
if (widget.code == null || widget.callbackState == null) {
|
|
||||||
setState(() {
|
|
||||||
_isProcessing = false;
|
|
||||||
_error = 'Invalid callback - missing code or state parameter';
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get notifier reference before async gap to avoid disposed ref errors
|
|
||||||
final authNotifier = ref.read(authProvider.notifier);
|
|
||||||
|
|
||||||
// Exchange code for tokens
|
|
||||||
try {
|
|
||||||
await authNotifier.handleOidcCallback(
|
|
||||||
widget.code!,
|
|
||||||
widget.callbackState!,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Navigate to home on success
|
|
||||||
if (mounted) {
|
|
||||||
context.go(AppRoutes.frontHall);
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
if (mounted) {
|
|
||||||
setState(() {
|
|
||||||
_isProcessing = false;
|
|
||||||
_error = e.toString();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
|
||||||
|
|
||||||
return Scaffold(
|
|
||||||
body: Center(
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: 400),
|
|
||||||
child: Card(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.all(32),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Icon(
|
|
||||||
_error != null ? Icons.error_outline : Icons.home_work_outlined,
|
|
||||||
size: 64,
|
|
||||||
color: _error != null ? colorScheme.error : colorScheme.primary,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
Text(
|
|
||||||
_error != null ? 'Authentication Failed' : 'Signing in...',
|
|
||||||
style: Theme.of(context).textTheme.headlineMedium?.copyWith(
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
if (_isProcessing)
|
|
||||||
const CircularProgressIndicator()
|
|
||||||
else if (_error != null) ...[
|
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.all(12),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: colorScheme.errorContainer,
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: Text(
|
|
||||||
_error!,
|
|
||||||
style: TextStyle(color: colorScheme.onErrorContainer),
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
OutlinedButton.icon(
|
|
||||||
onPressed: () => context.go(AppRoutes.frontHall),
|
|
||||||
icon: const Icon(Icons.refresh),
|
|
||||||
label: const Text('Try again'),
|
|
||||||
style: OutlinedButton.styleFrom(
|
|
||||||
minimumSize: const Size(double.infinity, 48),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
# Increase buffer size for large headers from Authentik
|
||||||
|
proxy_buffers 8 16k;
|
||||||
|
proxy_buffer_size 32k;
|
||||||
|
|
||||||
|
# Exclude static assets from forward auth
|
||||||
|
# These paths bypass auth_request but still proxy to upstream
|
||||||
|
location ~ ^/(manifest\.json|favicon\.(ico|png)|health|icons|assets) {
|
||||||
|
auth_request off;
|
||||||
|
proxy_pass $forward_scheme://$server:$port;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Forward authentication via standalone outpost
|
||||||
|
auth_request /outpost.goauthentik.io/auth/nginx;
|
||||||
|
error_page 401 = @goauthentik_proxy_signin;
|
||||||
|
|
||||||
|
# Capture auth response headers
|
||||||
|
auth_request_set $auth_cookie $upstream_http_set_cookie;
|
||||||
|
auth_request_set $authentik_username $upstream_http_x_authentik_username;
|
||||||
|
auth_request_set $authentik_groups $upstream_http_x_authentik_groups;
|
||||||
|
auth_request_set $authentik_email $upstream_http_x_authentik_email;
|
||||||
|
auth_request_set $authentik_name $upstream_http_x_authentik_name;
|
||||||
|
auth_request_set $authentik_uid $upstream_http_x_authentik_uid;
|
||||||
|
|
||||||
|
# Forward auth headers to application
|
||||||
|
add_header Set-Cookie $auth_cookie;
|
||||||
|
proxy_set_header X-authentik-username $authentik_username;
|
||||||
|
proxy_set_header X-authentik-groups $authentik_groups;
|
||||||
|
proxy_set_header X-authentik-email $authentik_email;
|
||||||
|
proxy_set_header X-authentik-name $authentik_name;
|
||||||
|
proxy_set_header X-authentik-uid $authentik_uid;
|
||||||
|
|
||||||
|
# Outpost proxy location
|
||||||
|
location /outpost.goauthentik.io {
|
||||||
|
proxy_pass https://localhost:9444/outpost.goauthentik.io;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Original-URL $scheme://$http_host$request_uri;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Forwarded-Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_pass_request_body off;
|
||||||
|
proxy_set_header Content-Length "";
|
||||||
|
|
||||||
|
# WebSocket support
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
}
|
||||||
|
|
||||||
|
# Signin redirect handler
|
||||||
|
location @goauthentik_proxy_signin {
|
||||||
|
internal;
|
||||||
|
return 302 /outpost.goauthentik.io/start?rd=$request_uri;
|
||||||
|
}
|
||||||
+1
-1
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 1.1.4+1
|
version: 1.1.11+1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.10.4
|
sdk: ^3.10.4
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env dart
|
#!/usr/bin/env dart
|
||||||
// Generates web/health.json from pubspec.yaml
|
// Generates web/health/health.json from pubspec.yaml
|
||||||
// Run: dart run tool/generate_health_json.dart
|
// Run: dart run tool/generate_health_json.dart
|
||||||
|
|
||||||
// ignore_for_file: avoid_print
|
// ignore_for_file: avoid_print
|
||||||
@@ -37,15 +37,15 @@ void main() {
|
|||||||
'fullVersion': '$version+$buildNumber',
|
'fullVersion': '$version+$buildNumber',
|
||||||
};
|
};
|
||||||
|
|
||||||
final webDir = Directory('web');
|
final healthDir = Directory('web/health');
|
||||||
if (!webDir.existsSync()) {
|
if (!healthDir.existsSync()) {
|
||||||
webDir.createSync(recursive: true);
|
healthDir.createSync(recursive: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
final healthFile = File('web/health.json');
|
final healthFile = File('web/health/health.json');
|
||||||
healthFile.writeAsStringSync(
|
healthFile.writeAsStringSync(
|
||||||
const JsonEncoder.withIndent(' ').convert(health),
|
const JsonEncoder.withIndent(' ').convert(health),
|
||||||
);
|
);
|
||||||
|
|
||||||
print('Generated web/health.json with version $version+$buildNumber');
|
print('Generated web/health/health.json with version $version+$buildNumber');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"status": "healthy",
|
||||||
|
"name": "tatlock_ui",
|
||||||
|
"title": "Tatlock - a Home Lab AI",
|
||||||
|
"version": "1.0.4",
|
||||||
|
"buildNumber": 1,
|
||||||
|
"fullVersion": "1.0.4+1"
|
||||||
|
}
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
<h1 id="status">Loading...</h1>
|
<h1 id="status">Loading...</h1>
|
||||||
<pre id="data"></pre>
|
<pre id="data"></pre>
|
||||||
<script>
|
<script>
|
||||||
fetch('/health.json')
|
fetch('./health.json')
|
||||||
.then(r => r.json())
|
.then(r => r.json())
|
||||||
.then(data => {
|
.then(data => {
|
||||||
document.getElementById('status').textContent = data.status?.toUpperCase() || 'OK';
|
document.getElementById('status').textContent = data.status?.toUpperCase() || 'OK';
|
||||||
@@ -32,6 +32,13 @@
|
|||||||
|
|
||||||
<title>Tatlock</title>
|
<title>Tatlock</title>
|
||||||
<link rel="manifest" href="manifest.json">
|
<link rel="manifest" href="manifest.json">
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
background-color: #1a1a2e;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<script src="flutter_bootstrap.js" async></script>
|
<script src="flutter_bootstrap.js" async></script>
|
||||||
|
|||||||
Reference in New Issue
Block a user