Merge branch 'main' into main_android

TalaoDAO · Oct 3, 2023 · 257f3b2 · 257f3b2
2 parents a8948c1 + 7871e13
commit 257f3b2
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -501,9 +501,24 @@ Future<OIDC4VCType?> getOIDC4VCTypeForIssuance({
     client: client.dio,
   );
 
-  final subjectSyntaxTypesSupported =
-      openidConfigurationResponse['subject_syntax_types_supported']
-          as List<dynamic>;
+  final authorizationServer =
+      openidConfigurationResponse['authorization_server'];
+
+  List<dynamic> subjectSyntaxTypesSupported;
+
+  if (authorizationServer == null) {
+    subjectSyntaxTypesSupported =
+        openidConfigurationResponse['subject_syntax_types_supported']
+            as List<dynamic>;
+  } else {
+    final openidConfigurationResponse = await getOpenIdConfig(
+      baseUrl: authorizationServer.toString(),
+      client: client.dio,
+    );
+    subjectSyntaxTypesSupported =
+        openidConfigurationResponse['subject_syntax_types_supported']
+            as List<dynamic>;
+  }
 
   if (!subjectSyntaxTypesSupported.contains('did:key')) {
     throw Exception('Subject_Syntax_Type_Not_Supported');

diff --git a/pubspec.lock b/pubspec.lock
@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: d4dc11707abb32ef756ab95678c0d6df54003d98277f7c9aeda14c48e7a38c2f
+      sha256: "06a96f1249f38a00435b3b0c9a3246d934d7dbc8183fc7c9e56989860edb99d4"
       url: "https://pub.dev"
     source: hosted
-    version: "3.4.3"
+    version: "3.4.4"
   args:
     dependency: transitive
     description:
@@ -492,10 +492,10 @@ packages:
     dependency: "direct main"
     description:
       name: dart_jsonwebtoken
-      sha256: "1c36cca992d210230d2a4221adeb2c3131d897da1a92278f3bbd58a5e649e00a"
+      sha256: bb4203ac7a4d4b675facc1c569487cb5650648a4ee68da19b6b431d9e9221b3f
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
   dart_style:
     dependency: transitive
     description:
@@ -2553,10 +2553,10 @@ packages:
     dependency: "direct main"
     description:
       name: webview_flutter
-      sha256: "053d454c9475546b4382e9498601fb46293cdac9b3ca93f1a738375bc9a1eee4"
+      sha256: "5fde460534f252704feb9f787ab5501d333028a10f66e3132ae306ef09257321"
       url: "https://pub.dev"
     source: hosted
-    version: "4.3.0"
+    version: "4.4.0"
   webview_flutter_android:
     dependency: "direct main"
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: altme
 description: AltMe Flutter App
-version: 1.20.30+279
+version: 1.20.31+280
 publish_to: none
 
 environment: