diff --git a/interfaces/auth/microsoft_entra_interface.dart b/interfaces/auth/microsoft_entra_interface.dart index e0a30e0..9235218 100644 --- a/interfaces/auth/microsoft_entra_interface.dart +++ b/interfaces/auth/microsoft_entra_interface.dart @@ -5,8 +5,7 @@ import 'package:flutter/material.dart'; class MicrosoftEntraInterface implements ArcaneAuthInterface { MicrosoftEntraInterface._internal(); - static final ArcaneAuthInterface _instance = - MicrosoftEntraInterface._internal(); + static final ArcaneAuthInterface _instance = MicrosoftEntraInterface._internal(); static ArcaneAuthInterface get I => _instance; static bool _mocked = false; @@ -28,16 +27,13 @@ class MicrosoftEntraInterface implements ArcaneAuthInterface { } @override - Future get accessToken async => - _oauth?.getAccessToken() ?? Future.value(null); + Future get accessToken async => _oauth?.getAccessToken() ?? Future.value(null); @override - Future get isSignedIn async => - _oauth?.hasCachedAccountInformation ?? Future.value(false); + Future get isSignedIn async => _oauth?.hasCachedAccountInformation ?? Future.value(false); @override Future init() async { - if (_mocked) return; if (_oauth != null) return; final String? tenant = AppEnv.valueOf(EnvVar.adSsoTenant); @@ -46,28 +42,24 @@ class MicrosoftEntraInterface implements ArcaneAuthInterface { final String? redirectUri = AppEnv.valueOf(EnvVar.adSsoRedirectUri); if (tenant == null) throw const FormatException('Tenant must not be null.'); - if (clientId == null) - throw const FormatException('Client ID must not be null.'); + if (clientId == null) throw const FormatException('Client ID must not be null.'); if (scope == null) throw const FormatException('Scope must not be null.'); - if (redirectUri == null) - throw const FormatException('Redirect URI must not be null.'); + if (redirectUri == null) throw const FormatException('Redirect URI must not be null.'); final Config config = Config( tenant: tenant, clientId: clientId, scope: scope, redirectUri: redirectUri, - navigatorKey: - navigatorKey, // Should be a GlobalKey() in the app's router + // Should be a GlobalKey() in the app's router + navigatorKey: navigatorKey, ); _oauth = AadOAuth(config); } @override - Future> login( - {T? input, Future Function()? onLoggedIn}) async { - if (_mocked) return Result.ok(null); + Future> login({T? input, Future Function()? onLoggedIn}) async { if (_oauth == null) await init(); if (await isSignedIn) return Result.ok(null); @@ -88,7 +80,6 @@ class MicrosoftEntraInterface implements ArcaneAuthInterface { @override Future> logout() async { - if (_mocked) return Result.ok(null); if (_oauth == null) await init(); if (!await isSignedIn) return Result.error('Not signed in'); @@ -97,9 +88,4 @@ class MicrosoftEntraInterface implements ArcaneAuthInterface { return Result.ok(null); } - - @visibleForTesting - static void setMocked() { - _mocked = true; - } }