fix: surface server errors in the ui [#122] (#135)

* fix: surface server errors in the ui [#122]

* fix: pr changes

* fix: cache authstate and localizations [#122]

---------

Co-authored-by: Simon Lightfoot <[email protected]>

Author: shinyford

packages/clerk_auth/lib/clerk_auth.dart

@@ -1,9 +1,12 @@
 /// Package that will allow you to authenticate and use Clerk from Dart code.
 library clerk_auth;
 
-export 'src/clerk_api/telemetry.dart';
 export 'src/clerk_api/api.dart' show ClerkLocalesLookup;
+export 'src/clerk_api/telemetry.dart';
 export 'src/clerk_auth/auth.dart';
+export 'src/clerk_auth/auth_error.dart';
+export 'src/clerk_auth/http_service.dart';
+export 'src/clerk_auth/persistor.dart';
 export 'src/clerk_constants.dart';
 export 'src/models/models.dart';
 export 'src/utils/extensions.dart';

packages/clerk_auth/lib/src/clerk_auth/auth.dart

@@ -10,10 +10,6 @@ import 'package:clerk_auth/src/clerk_constants.dart';
 import 'package:clerk_auth/src/models/api/api_response.dart';
 import 'package:clerk_auth/src/models/models.dart';
 
-export 'auth_error.dart';
-export 'http_service.dart';
-export 'persistor.dart';
-
 /// [Auth] provides more abstracted access to the Clerk API
 ///
 /// Requires a [publishableKey] found in the Clerk dashboard
@@ -75,6 +71,14 @@ class Auth {
 
   static const _codeLength = 6;
 
+  final _errors = StreamController<AuthError>.broadcast();
+
+  /// Stream of errors reported by the SDK of type [AuthError]
+  Stream<AuthError> get errorStream => _errors.stream;
+
+  /// Adds [error] to [errorStream]
+  void addError(AuthError error) => _errors.add(error);
+
   /// The [Environment] object
   ///
   /// configuration of the Clerk account - rarely changes
@@ -157,10 +161,11 @@ class Auth {
 
   ApiResponse _housekeeping(ApiResponse resp) {
     if (resp.isError) {
-      throw AuthError(
-        code: AuthErrorCode.serverErrorResponse,
-        message: '{arg}: ${resp.errorMessage}',
-        argument: resp.status.toString(),
+      addError(
+        AuthError(
+          code: AuthErrorCode.serverErrorResponse,
+          message: resp.errorMessage,
+        ),
       );
     } else if (resp.client case Client client) {
       this.client = client;

packages/clerk_auth/test/integration/clerk_auth/sign_in_test.dart

@@ -1,4 +1,5 @@
 import 'package:clerk_auth/src/clerk_auth/auth.dart';
+import 'package:clerk_auth/src/clerk_auth/persistor.dart';
 import 'package:clerk_auth/src/models/client/strategy.dart';
 import 'package:clerk_auth/src/models/client/user.dart';
 import 'package:clerk_auth/src/models/status.dart';

packages/clerk_auth/test/integration/clerk_auth/sign_up_test.dart

@@ -1,4 +1,5 @@
 import 'package:clerk_auth/src/clerk_auth/auth.dart';
+import 'package:clerk_auth/src/clerk_auth/persistor.dart';
 import 'package:clerk_auth/src/models/client/client.dart';
 import 'package:clerk_auth/src/models/client/field.dart';
 import 'package:clerk_auth/src/models/client/strategy.dart';

packages/clerk_flutter/lib/src/clerk_auth_state.dart

@@ -53,10 +53,6 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
     return provider;
   }
 
-  /// The [clerk.AuthError] stream
-  late final errorStream = _errors.stream;
-
-  final _errors = StreamController<clerk.AuthError>.broadcast();
   final OverlayEntry _loadingOverlay;
 
   static const _kRotatingTokenNonce = 'rotating_token_nonce';
@@ -195,7 +191,7 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
   }
 
   void _onError(clerk.AuthError error, ClerkErrorCallback? onError) {
-    _errors.add(error);
+    addError(error);
     onError?.call(error);
   }
 
@@ -268,9 +264,6 @@ class ClerkAuthState extends clerk.Auth with ChangeNotifier {
 
     return null;
   }
-
-  /// Add an [clerk.AuthError] for [message] to the [errorStream]
-  void addError(clerk.AuthError error) => _errors.add(error);
 }
 
 class _SsoWebViewOverlay extends StatefulWidget {

packages/clerk_flutter/lib/src/widgets/organization/clerk_organization_list.dart

@@ -39,6 +39,8 @@ class ClerkOrganizationList extends StatefulWidget {
 
 class _ClerkOrganizationListState extends State<ClerkOrganizationList>
     with ClerkTelemetryStateMixin {
+  ClerkAuthState? _authState;
+  ClerkSdkLocalizations? _localizations;
   late clerk.User _user = widget.initialUser;
   clerk.User? _nextUser;
 
@@ -53,13 +55,13 @@ class _ClerkOrganizationListState extends State<ClerkOrganizationList>
   }
 
   List<ClerkUserAction> _defaultActions() {
-    final authState = ClerkAuth.of(context);
-    final localizations = ClerkAuth.localizationsOf(context);
+    _authState ??= ClerkAuth.of(context);
+    _localizations ??= ClerkAuth.localizationsOf(context);
     return [
-      if (authState.user?.createOrganizationEnabled == true) //
+      if (_authState!.user?.createOrganizationEnabled == true) //
         ClerkUserAction(
           asset: ClerkAssets.addIcon,
-          label: localizations.createOrganization,
+          label: _localizations!.createOrganization,
           callback: _createOrganization,
         ),
     ];

packages/clerk_flutter/lib/src/widgets/user/clerk_user_button.dart

@@ -45,6 +45,8 @@ class ClerkUserButton extends StatefulWidget {
 
 class _ClerkUserButtonState extends State<ClerkUserButton>
     with ClerkTelemetryStateMixin {
+  ClerkAuthState? _authState;
+  ClerkSdkLocalizations? _localizations;
   final _sessions = <clerk.Session>[];
 
   @override
@@ -60,29 +62,29 @@ class _ClerkUserButtonState extends State<ClerkUserButton>
   }
 
   List<ClerkUserAction> _defaultSessionActions() {
-    final localizations = ClerkAuth.localizationsOf(context);
+    _localizations ??= ClerkAuth.localizationsOf(context);
     return [
       ClerkUserAction(
         asset: ClerkAssets.gearIcon,
-        label: localizations.profile,
+        label: _localizations!.profile,
         callback: _manageAccount,
       ),
       ClerkUserAction(
         asset: ClerkAssets.signOutIcon,
-        label: localizations.signOut,
+        label: _localizations!.signOut,
         callback: _signOut,
       ),
     ];
   }
 
   List<ClerkUserAction> _defaultAdditionalActions() {
-    final authState = ClerkAuth.of(context);
-    final localizations = ClerkAuth.localizationsOf(context);
+    _authState ??= ClerkAuth.of(context);
+    _localizations ??= ClerkAuth.localizationsOf(context);
     return [
-      if (authState.env.config.singleSessionMode == false)
+      if (_authState!.env.config.singleSessionMode == false)
         ClerkUserAction(
           asset: ClerkAssets.addIcon,
-          label: localizations.addAccount,
+          label: _localizations!.addAccount,
           callback: _addAccount,
         ),
     ];