Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
31e3306997 | ||
|
|
5f3ff7f31a | ||
|
|
f90b4a0963 | ||
|
|
a95296e1fc | ||
|
|
3fa97bb0b0 | ||
|
|
f0b32ff68b | ||
|
|
790ae41171 | ||
|
|
8625ac6574 | ||
|
|
16bad327f1 | ||
|
|
b35f495537 | ||
|
|
346ca75d68 | ||
|
|
0c27c10a2c | ||
|
|
ff5df30c53 |
+104
@@ -7,6 +7,110 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [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
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Silent OIDC fallback: when `prompt=none` fails with `login_required` (no Authentik session), automatically fall back to regular OIDC flow to show login UI
|
||||||
|
|
||||||
|
## [1.1.3] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Web auth uses silent OIDC with JWT Bearer tokens**
|
||||||
|
- Uses `prompt=none` to silently obtain JWT when Authentik session exists (via NPM forward auth)
|
||||||
|
- Flutter sends Bearer token to core-api instead of relying on forward auth cookies
|
||||||
|
- Fixes cross-subdomain cookie issues between home.schweitz.net and api.schweitz.net
|
||||||
|
- Callback now syncs with `/auth/sync` to get user profile and roles from core-api
|
||||||
|
- API interceptor now adds Bearer token on web (previously skipped)
|
||||||
|
|
||||||
|
## [1.1.2] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Web auth simplified**: Skip Flutter OIDC on web - NPM forward auth handles it
|
||||||
|
- NPM authenticates at proxy level before app loads
|
||||||
|
- No more redundant OIDC redirect after NPM auth completes
|
||||||
|
- Fixes "Cannot use Ref after disposed" error from conflicting auth flows
|
||||||
|
- Mobile still uses Flutter OIDC flow
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- Logout now redirects to Authentik to end SSO session
|
||||||
|
- Clears local tokens AND invalidates Authentik session
|
||||||
|
- Uses OIDC end_session_endpoint from discovery document
|
||||||
|
- Redirects back to app after Authentik logout completes
|
||||||
|
|
||||||
|
## [1.1.0] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- **Dockerfile rebuild fix**: Added `flutter clean` before build to prevent stale cached artifacts
|
||||||
|
- VERSION build arg added for explicit cache busting
|
||||||
|
- Reordered build steps: clean → pub get → build_runner → health.json → flutter build
|
||||||
|
- Ensures deployed app always matches the version in health.json
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Replaced deprecated `dart:html` with `package:web` in iframe_view_web.dart
|
||||||
|
- Uses `web.HTMLIFrameElement` instead of `html.IFrameElement`
|
||||||
|
- Fixes deprecation warnings for Flutter 3.x web builds
|
||||||
|
|
||||||
|
## [1.0.12] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Removed login page - auth now auto-initiates from AppScaffold
|
||||||
|
- No more redirect to /login, just auto-start OIDC if not authenticated
|
||||||
|
- Shows loading screen during auth, error screen on failure with retry
|
||||||
|
- Seamless experience when Authentik session exists
|
||||||
|
|
||||||
|
### Removed
|
||||||
|
- Removed /login route and _LoginPage widget
|
||||||
|
|
||||||
|
## [1.0.11] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Web auth now extracts user info directly from JWT instead of syncing with core-api
|
||||||
|
- Eliminates CORS preflight issues with /auth/sync endpoint
|
||||||
|
- Decodes JWT claims (name, email, groups) client-side
|
||||||
|
- Bearer token will be used for API authentication
|
||||||
|
|
||||||
|
## [1.0.10] - 2026-01-04
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed OIDC callback route being redirected to login before processing
|
||||||
|
- Moved callback route exception check BEFORE the auth redirect check in router
|
||||||
|
- This was preventing token exchange from ever happening
|
||||||
|
- Added favicon.ico to web root for proper browser tab icon display
|
||||||
|
|
||||||
|
## [1.0.9] - 2026-01-04
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Fixed OIDC callback Riverpod state modification error
|
||||||
|
- Deferred callback processing to `addPostFrameCallback` to avoid modifying state during widget build
|
||||||
|
|
||||||
|
## [1.0.8] - 2026-01-04
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- Switched from hash-based URLs (`/#/login`) to path-based URLs (`/login`)
|
||||||
|
- Required for OIDC callback to work correctly
|
||||||
|
- Uses conditional import to avoid breaking mobile/desktop builds
|
||||||
|
|
||||||
## [1.0.7] - 2026-01-04
|
## [1.0.7] - 2026-01-04
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|||||||
+12
-4
@@ -3,16 +3,24 @@ FROM ghcr.io/cirruslabs/flutter:stable AS builder
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Copy dependency files first for better caching
|
# VERSION arg busts cache when version changes in pubspec.yaml
|
||||||
COPY pubspec.yaml ./
|
# Extract version: docker build --build-arg VERSION=$(grep '^version:' pubspec.yaml | cut -d' ' -f2) .
|
||||||
|
ARG VERSION=0.0.0
|
||||||
|
RUN echo "Building version: $VERSION"
|
||||||
|
|
||||||
# Get dependencies (generates pubspec.lock)
|
# Copy dependency files first for better caching
|
||||||
|
COPY pubspec.yaml pubspec.lock* ./
|
||||||
|
|
||||||
|
# Get dependencies
|
||||||
RUN flutter pub get
|
RUN flutter pub get
|
||||||
|
|
||||||
# Copy the rest of the application
|
# Copy the rest of the application
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Generate code with build_runner
|
# Clean any cached build artifacts to ensure fresh build
|
||||||
|
RUN flutter clean && flutter pub get
|
||||||
|
|
||||||
|
# Generate code with build_runner (after clean for fresh generation)
|
||||||
RUN dart run build_runner build --delete-conflicting-outputs
|
RUN dart run build_runner build --delete-conflicting-outputs
|
||||||
|
|
||||||
# Generate health.json with version info
|
# Generate health.json with version info
|
||||||
|
|||||||
@@ -10,8 +10,7 @@ import 'package:tatlock_ui/core/error/app_exception.dart';
|
|||||||
/// Adds authentication token to requests.
|
/// Adds authentication token to requests.
|
||||||
///
|
///
|
||||||
/// - **LAN mode**: Skipped entirely (no auth required)
|
/// - **LAN mode**: Skipped entirely (no auth required)
|
||||||
/// - **Web**: Skipped (cookies handle auth via NPM forward auth)
|
/// - **Web + Mobile**: Adds Bearer token from OIDC authentication
|
||||||
/// - **Mobile**: Adds Bearer token from OIDC authentication
|
|
||||||
class AuthInterceptor extends Interceptor {
|
class AuthInterceptor extends Interceptor {
|
||||||
AuthInterceptor(this._ref);
|
AuthInterceptor(this._ref);
|
||||||
|
|
||||||
@@ -25,17 +24,11 @@ class AuthInterceptor extends Interceptor {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip Bearer token on web - cookies handle auth via NPM forward auth
|
// Add Bearer token for all platforms (web + mobile)
|
||||||
if (kIsWeb) {
|
|
||||||
handler.next(options);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Mobile: Add Bearer token from OIDC authentication
|
|
||||||
final authState = _ref.read(authProvider);
|
final authState = _ref.read(authProvider);
|
||||||
|
|
||||||
authState.whenData((auth) {
|
authState.whenData((auth) {
|
||||||
if (auth.isAuthenticated && auth.accessToken != null && auth.accessToken != 'web-session') {
|
if (auth.isAuthenticated && auth.accessToken != null) {
|
||||||
options.headers['Authorization'] = 'Bearer ${auth.accessToken}';
|
options.headers['Authorization'] = 'Bearer ${auth.accessToken}';
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert' show jsonDecode, jsonEncode;
|
||||||
import 'dart:developer' as developer;
|
import 'dart:developer' as developer;
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart' show kIsWeb;
|
import 'package:flutter/foundation.dart' show kIsWeb;
|
||||||
@@ -40,7 +40,9 @@ class AuthNotifier extends _$AuthNotifier {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Future<AuthState> build() async {
|
Future<AuthState> build() async {
|
||||||
// Load stored auth on all platforms
|
// AuthController.initialize() in main() handles OIDC flow before app starts.
|
||||||
|
// By the time we get here, tokens are already stored (or we're in LAN mode).
|
||||||
|
// Just load the stored auth state.
|
||||||
return _loadStoredAuth();
|
return _loadStoredAuth();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -270,7 +272,12 @@ class AuthNotifier extends _$AuthNotifier {
|
|||||||
final authDatasource = ref.read(authDatasourceProvider);
|
final authDatasource = ref.read(authDatasourceProvider);
|
||||||
final syncResponse = await authDatasource.syncUser(tokens.accessToken);
|
final syncResponse = await authDatasource.syncUser(tokens.accessToken);
|
||||||
|
|
||||||
// Step 3: Store credentials and user data
|
developer.log(
|
||||||
|
'Synced user: ${syncResponse.name} with ${syncResponse.roles.length} roles',
|
||||||
|
name: 'auth',
|
||||||
|
);
|
||||||
|
|
||||||
|
// Step 3: Store credentials and user data from sync response
|
||||||
await _storeAuth(
|
await _storeAuth(
|
||||||
accessToken: tokens.accessToken,
|
accessToken: tokens.accessToken,
|
||||||
refreshToken: tokens.refreshToken,
|
refreshToken: tokens.refreshToken,
|
||||||
@@ -298,10 +305,7 @@ class AuthNotifier extends _$AuthNotifier {
|
|||||||
preferences: syncResponse.preferences,
|
preferences: syncResponse.preferences,
|
||||||
));
|
));
|
||||||
|
|
||||||
developer.log(
|
developer.log('Authenticated as ${syncResponse.name}', name: 'auth');
|
||||||
'Authenticated as ${syncResponse.name} with ${syncResponse.roles.length} roles',
|
|
||||||
name: 'auth',
|
|
||||||
);
|
|
||||||
|
|
||||||
// Clean up the URL by removing the query parameters
|
// Clean up the URL by removing the query parameters
|
||||||
web_utils.replaceUrl('/');
|
web_utils.replaceUrl('/');
|
||||||
@@ -315,10 +319,27 @@ class AuthNotifier extends _$AuthNotifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Sign out and clear stored credentials.
|
/// Sign out and clear stored credentials.
|
||||||
|
///
|
||||||
|
/// On web, also redirects to Authentik's logout endpoint to end the SSO session.
|
||||||
Future<void> signOut() async {
|
Future<void> signOut() async {
|
||||||
|
// Clear local storage first
|
||||||
await _clearStoredAuth();
|
await _clearStoredAuth();
|
||||||
state = const AsyncData(AuthState());
|
state = const AsyncData(AuthState());
|
||||||
developer.log('Signed out', name: 'auth');
|
developer.log('Signed out locally', name: 'auth');
|
||||||
|
|
||||||
|
// On web, redirect to Authentik logout to end SSO session
|
||||||
|
if (kIsWeb && AppConfig.requiresAuth) {
|
||||||
|
try {
|
||||||
|
final oidcService = OidcServiceWeb();
|
||||||
|
final logoutUrl = await oidcService.getLogoutUrl();
|
||||||
|
developer.log('Redirecting to Authentik logout', name: 'auth');
|
||||||
|
web_utils.redirectTo(logoutUrl);
|
||||||
|
} catch (e) {
|
||||||
|
developer.log('Failed to get logout URL: $e', name: 'auth');
|
||||||
|
// Local logout already done, just reload to trigger re-auth
|
||||||
|
web_utils.redirectTo('/');
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Update user preferences.
|
/// Update user preferences.
|
||||||
|
|||||||
@@ -34,7 +34,12 @@ class OidcServiceWeb implements OidcService {
|
|||||||
///
|
///
|
||||||
/// Returns a URL that the browser should navigate to for authentication.
|
/// Returns a URL that the browser should navigate to for authentication.
|
||||||
/// The [codeVerifier] and [state] are stored for later verification.
|
/// The [codeVerifier] and [state] are stored for later verification.
|
||||||
Future<String> getAuthorizationUrl() async {
|
///
|
||||||
|
/// If [silent] is true, adds `prompt=none` to skip login UI.
|
||||||
|
/// This is used when the user already has an Authentik session (via NPM).
|
||||||
|
/// Authentik will instantly redirect back with a code, or return an error
|
||||||
|
/// if there's no valid session.
|
||||||
|
Future<String> getAuthorizationUrl({bool silent = false}) async {
|
||||||
// Fetch OIDC discovery document
|
// Fetch OIDC discovery document
|
||||||
final discovery = await _fetchDiscovery();
|
final discovery = await _fetchDiscovery();
|
||||||
final authEndpoint = discovery['authorization_endpoint'] as String;
|
final authEndpoint = discovery['authorization_endpoint'] as String;
|
||||||
@@ -59,10 +64,11 @@ class OidcServiceWeb implements OidcService {
|
|||||||
'code_challenge': codeChallenge,
|
'code_challenge': codeChallenge,
|
||||||
'code_challenge_method': 'S256',
|
'code_challenge_method': 'S256',
|
||||||
'state': state,
|
'state': state,
|
||||||
|
if (silent) 'prompt': 'none', // Silent auth - no UI, instant redirect
|
||||||
};
|
};
|
||||||
|
|
||||||
final uri = Uri.parse(authEndpoint).replace(queryParameters: params);
|
final uri = Uri.parse(authEndpoint).replace(queryParameters: params);
|
||||||
developer.log('Authorization URL: $uri', name: 'oidc_web');
|
developer.log('Authorization URL (silent=$silent): $uri', name: 'oidc_web');
|
||||||
return uri.toString();
|
return uri.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -209,4 +215,31 @@ class OidcServiceWeb implements OidcService {
|
|||||||
return List.generate(length, (_) => chars[random.nextInt(chars.length)])
|
return List.generate(length, (_) => chars[random.nextInt(chars.length)])
|
||||||
.join();
|
.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Get the logout URL to redirect the browser to for SSO logout.
|
||||||
|
///
|
||||||
|
/// [idToken] is optional but recommended for logout verification.
|
||||||
|
/// After logout, Authentik redirects back to [postLogoutRedirectUri].
|
||||||
|
Future<String> getLogoutUrl({String? idToken}) async {
|
||||||
|
final discovery = await _fetchDiscovery();
|
||||||
|
final endSessionEndpoint = discovery['end_session_endpoint'] as String?;
|
||||||
|
|
||||||
|
if (endSessionEndpoint == null) {
|
||||||
|
// Fallback: just redirect to home, local state already cleared
|
||||||
|
developer.log('No end_session_endpoint in discovery', name: 'oidc_web');
|
||||||
|
return AppConfig.webBaseUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
final params = <String, String>{
|
||||||
|
'post_logout_redirect_uri': AppConfig.webBaseUrl,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (idToken != null) {
|
||||||
|
params['id_token_hint'] = idToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
final uri = Uri.parse(endSessionEndpoint).replace(queryParameters: params);
|
||||||
|
developer.log('Logout URL: $uri', name: 'oidc_web');
|
||||||
|
return uri.toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,5 @@
|
|||||||
|
/// URL strategy with conditional imports for web/non-web platforms.
|
||||||
|
library;
|
||||||
|
|
||||||
|
export 'url_strategy_stub.dart'
|
||||||
|
if (dart.library.js_interop) 'url_strategy_web.dart';
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
/// Stub for non-web platforms - does nothing.
|
||||||
|
void configureUrlStrategy() {
|
||||||
|
// No-op on mobile/desktop
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
/// Web-specific URL strategy configuration.
|
||||||
|
library;
|
||||||
|
|
||||||
|
import 'package:flutter_web_plugins/url_strategy.dart';
|
||||||
|
|
||||||
|
void configureUrlStrategy() {
|
||||||
|
// Use path-based URLs instead of hash-based (e.g., /login instead of /#/login)
|
||||||
|
// Required for OIDC callback to work properly
|
||||||
|
usePathUrlStrategy();
|
||||||
|
}
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
import 'dart:html' as html;
|
|
||||||
import 'dart:ui_web' as ui_web;
|
import 'dart:ui_web' as ui_web;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:url_launcher/url_launcher.dart';
|
import 'package:url_launcher/url_launcher.dart';
|
||||||
|
import 'package:web/web.dart' as web;
|
||||||
|
|
||||||
/// Embedded iframe view for displaying external content (web only).
|
/// Embedded iframe view for displaying external content (web only).
|
||||||
///
|
///
|
||||||
@@ -31,7 +31,7 @@ class IframeView extends StatefulWidget {
|
|||||||
|
|
||||||
class _IframeViewState extends State<IframeView> {
|
class _IframeViewState extends State<IframeView> {
|
||||||
late final String _viewType;
|
late final String _viewType;
|
||||||
late html.IFrameElement _iframe;
|
late web.HTMLIFrameElement _iframe;
|
||||||
bool _isLoading = true;
|
bool _isLoading = true;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -42,17 +42,18 @@ class _IframeViewState extends State<IframeView> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _createIframe() {
|
void _createIframe() {
|
||||||
_iframe = html.IFrameElement()
|
_iframe = web.document.createElement('iframe') as web.HTMLIFrameElement
|
||||||
..src = widget.url
|
..src = widget.url
|
||||||
..style.border = 'none'
|
..style.border = 'none'
|
||||||
..style.width = '100%'
|
..style.width = '100%'
|
||||||
..style.height = '100%'
|
..style.height = '100%'
|
||||||
..allow = 'fullscreen'
|
..allow = 'fullscreen';
|
||||||
..onLoad.listen((_) {
|
|
||||||
if (mounted) {
|
_iframe.onLoad.listen((_) {
|
||||||
setState(() => _isLoading = false);
|
if (mounted) {
|
||||||
}
|
setState(() => _isLoading = false);
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
|
||||||
// Register the view factory
|
// Register the view factory
|
||||||
ui_web.platformViewRegistry.registerViewFactory(
|
ui_web.platformViewRegistry.registerViewFactory(
|
||||||
|
|||||||
+15
-1
@@ -4,15 +4,29 @@ 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 '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)
|
||||||
|
configureUrlStrategy();
|
||||||
|
|
||||||
developer.log(
|
developer.log(
|
||||||
'${AppVersion.name} v${AppVersion.fullVersion}',
|
'${AppVersion.name} v${AppVersion.fullVersion}',
|
||||||
name: 'tatlock_ui',
|
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()));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +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/core/config/app_config.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';
|
||||||
@@ -16,62 +13,15 @@ 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 login = '/login';
|
|
||||||
static const callback = '/callback';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Provides the GoRouter instance.
|
/// Provides the GoRouter instance.
|
||||||
@riverpod
|
@riverpod
|
||||||
GoRouter appRouter(Ref ref) {
|
GoRouter appRouter(Ref ref) {
|
||||||
final authState = ref.watch(authProvider);
|
|
||||||
|
|
||||||
return GoRouter(
|
return GoRouter(
|
||||||
initialLocation: AppRoutes.frontHall,
|
initialLocation: AppRoutes.frontHall,
|
||||||
debugLogDiagnostics: true,
|
debugLogDiagnostics: true,
|
||||||
redirect: (context, state) {
|
|
||||||
// No auth required in LAN mode
|
|
||||||
if (!AppConfig.requiresAuth) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
final isAuthenticated = authState.value?.isAuthenticated ?? false;
|
|
||||||
final isLoginRoute = state.matchedLocation == AppRoutes.login;
|
|
||||||
|
|
||||||
// If not authenticated, redirect to login (except if already on login)
|
|
||||||
if (!isAuthenticated && !isLoginRoute) {
|
|
||||||
return AppRoutes.login;
|
|
||||||
}
|
|
||||||
|
|
||||||
// If authenticated and on login page, redirect to home
|
|
||||||
if (isAuthenticated && isLoginRoute) {
|
|
||||||
return AppRoutes.frontHall;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow callback route through without auth check
|
|
||||||
if (state.matchedLocation == AppRoutes.callback) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
routes: [
|
routes: [
|
||||||
// Login route (outside shell - no app scaffold)
|
|
||||||
GoRoute(
|
|
||||||
path: AppRoutes.login,
|
|
||||||
name: 'login',
|
|
||||||
builder: (context, state) => const _LoginPage(),
|
|
||||||
),
|
|
||||||
// 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),
|
||||||
@@ -136,257 +86,3 @@ class _PlaceholderPage extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Login page displayed when user is not authenticated.
|
|
||||||
class _LoginPage extends ConsumerWidget {
|
|
||||||
const _LoginPage();
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
|
||||||
final authAsync = ref.watch(authProvider);
|
|
||||||
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(
|
|
||||||
Icons.home_work_outlined,
|
|
||||||
size: 64,
|
|
||||||
color: colorScheme.primary,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
Text(
|
|
||||||
'Tatlock Estate',
|
|
||||||
style: Theme.of(context).textTheme.headlineMedium?.copyWith(
|
|
||||||
fontWeight: FontWeight.w600,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Text(
|
|
||||||
'Sign in to access the estate management system',
|
|
||||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
|
||||||
color: colorScheme.onSurfaceVariant,
|
|
||||||
),
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 32),
|
|
||||||
authAsync.when(
|
|
||||||
data: (_) => _buildSignInContent(context, ref),
|
|
||||||
loading: () => const Column(
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
width: 24,
|
|
||||||
height: 24,
|
|
||||||
child: CircularProgressIndicator(strokeWidth: 2),
|
|
||||||
),
|
|
||||||
SizedBox(height: 16),
|
|
||||||
Text('Checking authentication...'),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
error: (error, _) => _buildErrorContent(context, ref, error),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildSignInContent(BuildContext context, WidgetRef ref) {
|
|
||||||
// Same sign in button for both web and mobile
|
|
||||||
return FilledButton.icon(
|
|
||||||
onPressed: () => ref.read(authProvider.notifier).signIn(),
|
|
||||||
icon: const Icon(Icons.login),
|
|
||||||
label: const Text('Sign in with Authentik'),
|
|
||||||
style: FilledButton.styleFrom(
|
|
||||||
minimumSize: const Size(double.infinity, 48),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildErrorContent(BuildContext context, WidgetRef ref, Object error) {
|
|
||||||
final colorScheme = Theme.of(context).colorScheme;
|
|
||||||
|
|
||||||
return Column(
|
|
||||||
children: [
|
|
||||||
Container(
|
|
||||||
padding: const EdgeInsets.all(12),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: colorScheme.errorContainer,
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Icon(Icons.error_outline, color: colorScheme.onErrorContainer),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
_formatError(error),
|
|
||||||
style: TextStyle(color: colorScheme.onErrorContainer),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
OutlinedButton.icon(
|
|
||||||
onPressed: () => ref.read(authProvider.notifier).signIn(),
|
|
||||||
icon: const Icon(Icons.refresh),
|
|
||||||
label: const Text('Try again'),
|
|
||||||
style: OutlinedButton.styleFrom(
|
|
||||||
minimumSize: const Size(double.infinity, 48),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
String _formatError(Object error) {
|
|
||||||
final message = error.toString();
|
|
||||||
if (message.contains('user_cancelled')) {
|
|
||||||
return 'Sign in was cancelled';
|
|
||||||
}
|
|
||||||
if (message.contains('network')) {
|
|
||||||
return 'Network error. Please check your connection.';
|
|
||||||
}
|
|
||||||
return 'Authentication failed. Please try again.';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 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();
|
|
||||||
_processCallback();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _processCallback() async {
|
|
||||||
// Check for error from Authentik
|
|
||||||
if (widget.error != null) {
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exchange code for tokens
|
|
||||||
try {
|
|
||||||
await ref.read(authProvider.notifier).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.login),
|
|
||||||
icon: const Icon(Icons.arrow_back),
|
|
||||||
label: const Text('Back to Login'),
|
|
||||||
style: OutlinedButton.styleFrom(
|
|
||||||
minimumSize: const Size(double.infinity, 48),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
|
import 'package:flutter/foundation.dart' show kIsWeb;
|
||||||
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:tatlock_ui/core/auth/auth_provider.dart';
|
||||||
|
import 'package:tatlock_ui/core/config/app_config.dart';
|
||||||
import 'package:tatlock_ui/features/control_room/router.dart';
|
import 'package:tatlock_ui/features/control_room/router.dart';
|
||||||
import 'package:tatlock_ui/features/security/router.dart';
|
import 'package:tatlock_ui/features/security/router.dart';
|
||||||
import 'package:tatlock_ui/routing/app_router.dart';
|
import 'package:tatlock_ui/routing/app_router.dart';
|
||||||
@@ -7,6 +11,11 @@ import 'package:tatlock_ui/shared/layouts/widgets/top_header_bar.dart';
|
|||||||
|
|
||||||
/// Main application scaffold with top header navigation.
|
/// Main application scaffold with top header navigation.
|
||||||
///
|
///
|
||||||
|
/// Handles authentication automatically:
|
||||||
|
/// - If not authenticated, auto-initiates OIDC flow
|
||||||
|
/// - Shows loading state during authentication
|
||||||
|
/// - Shows error state if auth fails (with retry)
|
||||||
|
///
|
||||||
/// Layout structure per UI_LAYOUT.md:
|
/// Layout structure per UI_LAYOUT.md:
|
||||||
/// ```
|
/// ```
|
||||||
/// ┌─────────────────────────────────────────────────────────────────┐
|
/// ┌─────────────────────────────────────────────────────────────────┐
|
||||||
@@ -15,16 +24,62 @@ import 'package:tatlock_ui/shared/layouts/widgets/top_header_bar.dart';
|
|||||||
/// │ BODY: Room page content (may include room-specific sidebar) │
|
/// │ BODY: Room page content (may include room-specific sidebar) │
|
||||||
/// └─────────────────────────────────────────────────────────────────┘
|
/// └─────────────────────────────────────────────────────────────────┘
|
||||||
/// ```
|
/// ```
|
||||||
class AppScaffold extends StatelessWidget {
|
class AppScaffold extends ConsumerStatefulWidget {
|
||||||
const AppScaffold({super.key, required this.child});
|
const AppScaffold({super.key, required this.child});
|
||||||
|
|
||||||
final Widget child;
|
final Widget child;
|
||||||
|
|
||||||
|
@override
|
||||||
|
ConsumerState<AppScaffold> createState() => _AppScaffoldState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AppScaffoldState extends ConsumerState<AppScaffold> {
|
||||||
// Header height must match TopHeaderBar._headerHeight
|
// Header height must match TopHeaderBar._headerHeight
|
||||||
static const double _headerHeight = 56.0;
|
static const double _headerHeight = 56.0;
|
||||||
|
|
||||||
|
bool _authInitiated = false;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
// No auth required in LAN mode - show content directly
|
||||||
|
if (!AppConfig.requiresAuth) {
|
||||||
|
return _buildScaffold(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Watch auth state (works for both web and mobile)
|
||||||
|
final authAsync = ref.watch(authProvider);
|
||||||
|
|
||||||
|
return authAsync.when(
|
||||||
|
data: (authState) {
|
||||||
|
if (authState.isAuthenticated) {
|
||||||
|
// Authenticated - show the app
|
||||||
|
_authInitiated = false; // Reset for next time
|
||||||
|
return _buildScaffold(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
// On web, NPM handles auth - if we're here without auth, something is wrong
|
||||||
|
// (NPM should have redirected to Authentik before we loaded)
|
||||||
|
if (kIsWeb) {
|
||||||
|
return _buildAuthErrorScreen(context, 'Authentication required');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mobile: Not authenticated - auto-initiate OIDC
|
||||||
|
if (!_authInitiated) {
|
||||||
|
_authInitiated = true;
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
ref.read(authProvider.notifier).signIn();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show loading while redirecting to Authentik
|
||||||
|
return _buildAuthLoadingScreen(context, 'Redirecting to sign in...');
|
||||||
|
},
|
||||||
|
loading: () => _buildAuthLoadingScreen(context, 'Loading user info...'),
|
||||||
|
error: (error, _) => _buildAuthErrorScreen(context, error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildScaffold(BuildContext context) {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
body: Stack(
|
body: Stack(
|
||||||
children: [
|
children: [
|
||||||
@@ -32,7 +87,7 @@ class AppScaffold extends StatelessWidget {
|
|||||||
Positioned.fill(
|
Positioned.fill(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.only(top: _headerHeight),
|
padding: const EdgeInsets.only(top: _headerHeight),
|
||||||
child: child,
|
child: widget.child,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
||||||
@@ -51,6 +106,115 @@ class AppScaffold extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget _buildAuthLoadingScreen(BuildContext context, String message) {
|
||||||
|
final colorScheme = Theme.of(context).colorScheme;
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
body: Center(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
Icons.home_work_outlined,
|
||||||
|
size: 64,
|
||||||
|
color: colorScheme.primary,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Text(
|
||||||
|
'Tatlock Estate',
|
||||||
|
style: Theme.of(context).textTheme.headlineMedium?.copyWith(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 32),
|
||||||
|
const SizedBox(
|
||||||
|
width: 24,
|
||||||
|
height: 24,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 2),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Text(
|
||||||
|
message,
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: colorScheme.onSurfaceVariant,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildAuthErrorScreen(BuildContext context, Object error) {
|
||||||
|
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(
|
||||||
|
Icons.error_outline,
|
||||||
|
size: 64,
|
||||||
|
color: colorScheme.error,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Text(
|
||||||
|
'Authentication Failed',
|
||||||
|
style: Theme.of(context).textTheme.headlineMedium?.copyWith(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: colorScheme.errorContainer,
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
_formatError(error),
|
||||||
|
style: TextStyle(color: colorScheme.onErrorContainer),
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
FilledButton.icon(
|
||||||
|
onPressed: () {
|
||||||
|
_authInitiated = false;
|
||||||
|
ref.read(authProvider.notifier).signIn();
|
||||||
|
},
|
||||||
|
icon: const Icon(Icons.refresh),
|
||||||
|
label: const Text('Try again'),
|
||||||
|
style: FilledButton.styleFrom(
|
||||||
|
minimumSize: const Size(double.infinity, 48),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _formatError(Object error) {
|
||||||
|
final message = error.toString();
|
||||||
|
if (message.contains('user_cancelled')) {
|
||||||
|
return 'Sign in was cancelled';
|
||||||
|
}
|
||||||
|
if (message.contains('network')) {
|
||||||
|
return 'Network error. Please check your connection.';
|
||||||
|
}
|
||||||
|
return 'Authentication failed. Please try again.';
|
||||||
|
}
|
||||||
|
|
||||||
int _selectedIndex(BuildContext context) {
|
int _selectedIndex(BuildContext context) {
|
||||||
final location = GoRouterState.of(context).matchedLocation;
|
final location = GoRouterState.of(context).matchedLocation;
|
||||||
|
|
||||||
|
|||||||
+3
-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.0.7+1
|
version: 1.1.7+1
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.10.4
|
sdk: ^3.10.4
|
||||||
@@ -30,6 +30,8 @@ environment:
|
|||||||
dependencies:
|
dependencies:
|
||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
flutter_web_plugins:
|
||||||
|
sdk: flutter
|
||||||
|
|
||||||
# State Management
|
# State Management
|
||||||
flutter_riverpod: ^3.0.0
|
flutter_riverpod: ^3.0.0
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
// Generates web/health.json from pubspec.yaml
|
// Generates web/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
|
||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 4.2 KiB |
@@ -27,6 +27,7 @@
|
|||||||
<link rel="apple-touch-icon" href="icons/Icon-192.png">
|
<link rel="apple-touch-icon" href="icons/Icon-192.png">
|
||||||
|
|
||||||
<!-- Favicon -->
|
<!-- Favicon -->
|
||||||
|
<link rel="icon" type="image/x-icon" href="favicon.ico"/>
|
||||||
<link rel="icon" type="image/png" href="favicon.png"/>
|
<link rel="icon" type="image/png" href="favicon.png"/>
|
||||||
|
|
||||||
<title>Tatlock</title>
|
<title>Tatlock</title>
|
||||||
|
|||||||
Reference in New Issue
Block a user