From afc555e66ed68fc3055910a8f4314cf1e8843f6b Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 22 Jul 2025 13:51:10 -0400
Subject: [PATCH] Fix name

---
 lib/helpers/api_helper.dart  | 5 +++--
 lib/helpers/name_helper.dart | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 lib/helpers/name_helper.dart

diff --git a/lib/helpers/api_helper.dart b/lib/helpers/api_helper.dart
index bf4b4b5..b59d73b 100644
--- a/lib/helpers/api_helper.dart
+++ b/lib/helpers/api_helper.dart
@@ -3,6 +3,7 @@ import "dart:convert";
 import "package:dart_jsonwebtoken/dart_jsonwebtoken.dart";
 import "package:matrixoidc/controllers/auth_code_controller.dart";
 import "package:matrixoidc/controllers/settings_controller.dart";
+import "package:matrixoidc/helpers/name_helper.dart";
 import "package:shelf/shelf.dart";
 import "package:http/http.dart" as http;
 import "package:matrixoidc/models/matrix_user.dart";
@@ -111,7 +112,7 @@ class ApiHelper {
 
     final user = codes[code]!;
     ref.read(AuthCodeController.provider.notifier).remove(code);
-    final name = user.userId.split(":").first.replaceFirst("@", "");
+    final name = user.userId.getName();
 
     final jwt = JWT(
       {
@@ -193,7 +194,7 @@ class ApiHelper {
         ),
       );
 
-      final name = jwt.issuer!.split(":").first.replaceFirst("@", "");
+      final name = jwt.subject!.getName();
 
       return Response.ok(
         json.encode({
diff --git a/lib/helpers/name_helper.dart b/lib/helpers/name_helper.dart
new file mode 100644
index 0000000..79a70d2
--- /dev/null
+++ b/lib/helpers/name_helper.dart
@@ -0,0 +1,3 @@
+extension GetName on String {
+  String getName() => split(":")[1].replaceFirst("@", "");
+}