Merge branch 'main' into feat/cip509-metadata-indexing

.github/workflows/ci.yml

@@ -10,13 +10,6 @@ permissions:
 
 jobs:
   ci:
-    uses: input-output-hk/catalyst-ci/.github/workflows/ci.yml@master
+    uses: input-output-hk/catalyst-forge/.github/workflows/ci.yml@master
     with:
-      aws_ecr_registry: 332405224602.dkr.ecr.eu-central-1.amazonaws.com
-      aws_role_arn: arn:aws:iam::332405224602:role/ci
-      aws_region: eu-central-1
-    secrets:
-      dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-      dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
-      earthly_runner_address: ${{ secrets.EARTHLY_SATELLITE_ADDRESS }}
-      earthly_runner_secret: ${{ secrets.EARTHLY_RUNNER_SECRET }}
+      forge_version: latest

blueprint.cue

@@ -0,0 +1,51 @@
+version: "1.0"
+global: {
+	ci: {
+		local: [
+			"^check(-.*)?$",
+			"^build(-.*)?$",
+			"^package(-.*)?$",
+			"^test(-.*)?$",
+			"^release(-.*)?$",
+			"^publish(-.*)?$",
+		]
+		registries: [
+			ci.providers.aws.registry,
+		]
+		providers: {
+			aws: {
+				region:   "eu-central-1"
+				registry: "332405224602.dkr.ecr.eu-central-1.amazonaws.com"
+				role:     "arn:aws:iam::332405224602:role/ci"
+			}
+
+			docker: credentials: {
+				provider: "aws"
+				path:     "global/ci/docker"
+			}
+
+			earthly: {
+				credentials: {
+					provider: "aws"
+					path:     "global/ci/earthly"
+				}
+				org:       "Catalyst"
+				satellite: "ci"
+				version:   "0.8.15"
+			}
+
+			github: registry: "ghcr.io"
+		}
+		secrets: [
+			{
+				name:     "GITHUB_TOKEN"
+				optional: true
+				provider: "env"
+				path:     "GITHUB_TOKEN"
+			},
+		]
+		tagging: {
+			strategy: "commit"
+		}
+	}
+}

catalyst-gateway/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "gateway"

catalyst-gateway/event-db/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "gateway-event-db"

catalyst-gateway/tests/api_tests/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "gateway-api-tests"

catalyst-gateway/tests/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "catalyst-gateway-tests"

catalyst-gateway/tests/schemathesis_tests/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "gateway-schema-tests"

catalyst_voices/Earthfile

@@ -83,6 +83,8 @@ package:
 
 publish:
    FROM +package
-   ARG tag='latest'
 
-   SAVE IMAGE voices-frontend:$tag
+   ARG container="voices"
+   ARG tag="latest"
+
+   SAVE IMAGE ${container}:${tag}

catalyst_voices/blueprint.cue

@@ -0,0 +1,2 @@
+version: "1.0.0"
+project: name: "voices"

catalyst_voices/lib/dependency/dependencies.dart

@@ -33,16 +33,16 @@ final class Dependencies extends DependencyProvider {
   void _registerRepositories() {
     this
       ..registerSingleton<CredentialsStorageRepository>(
-        CredentialsStorageRepository(secureStorageService: get()),
+        CredentialsStorageRepository(storage: get()),
       )
       ..registerSingleton<AuthenticationRepository>(
         AuthenticationRepository(credentialsStorageRepository: get()),
       );
   }
 
   void _registerServices() {
-    registerSingleton<SecureStorageService>(
-      SecureStorageService(),
-    );
+    registerSingleton<Storage>(const SecureStorage());
+    registerSingleton<Vault>(const SecureStorageVault());
+    registerSingleton<DummyAuthStorage>(const SecureDummyAuthStorage());
   }
 }

catalyst_voices/lib/pages/discovery/discovery_page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:catalyst_voices/pages/discovery/current_status_text.dart';
 import 'package:catalyst_voices/pages/discovery/toggle_state_text.dart';
 import 'package:catalyst_voices/widgets/widgets.dart';
@@ -84,7 +86,16 @@ class _Segment extends StatelessWidget {
             const Spacer(),
             VoicesFilledButton(
               child: const Text('CTA to Model'),
-              onTap: () {},
+              onTap: () {
+                unawaited(
+                  VoicesDialog.show<void>(
+                    context: context,
+                    builder: (context) {
+                      return const VoicesDesktopInfoDialog(title: Text(''));
+                    },
+                  ),
+                );
+              },
             ),
           ],
         ),

catalyst_voices/lib/routes/guards/milestone_guard.dart

@@ -12,13 +12,20 @@ final class MilestoneGuard implements RouteGuard {
 
   @override
   FutureOr<String?> redirect(BuildContext context, GoRouterState state) {
+    final location = state.uri.toString();
+
+    // redirects /m4 page to /m4/discovery
+    if (location == '/${Routes.currentMilestone}') {
+      return const DiscoveryRoute().location;
+    }
+
     // allow milestone sub pages
-    if (state.uri.toString().startsWith('/${Routes.currentMilestone}')) {
+    if (location.startsWith('/${Routes.currentMilestone}')) {
       return null;
     }
 
     // if already at destination skip redirect
-    if (state.uri.toString() == const ComingSoonRoute().location) {
+    if (location == const ComingSoonRoute().location) {
       return null;
     }
 

catalyst_voices/lib/routes/routing/routes.dart

@@ -11,14 +11,14 @@ import 'package:go_router/go_router.dart';
 abstract final class Routes {
   static const currentMilestone = 'm4';
 
+  static final List<RouteBase> routes = [
+    ...coming_soon.$appRoutes,
+    ...login.$appRoutes,
+    ...spaces.$appRoutes,
+    ...overall_spaces.$appRoutes,
+  ];
+
   static String get initialLocation {
     return const coming_soon.ComingSoonRoute().location;
   }
-
-  static List<RouteBase> get routes => [
-        ...coming_soon.$appRoutes,
-        ...login.$appRoutes,
-        ...spaces.$appRoutes,
-        ...overall_spaces.$appRoutes,
-      ];
 }

catalyst_voices/packages/catalyst_voices_blocs/lib/src/session/session_bloc.dart

@@ -5,7 +5,12 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 
 /// Manages the user session.
 final class SessionBloc extends Bloc<SessionEvent, SessionState> {
-  SessionBloc() : super(const VisitorSessionState()) {
+  SessionBloc()
+      : super(
+          const ActiveUserSessionState(
+            user: User(name: 'Account'),
+          ),
+        ) {
     on<SessionEvent>(_handleSessionEvent);
   }
 

catalyst_voices/packages/catalyst_voices_brands/lib/src/themes/catalyst.dart

@@ -310,9 +310,8 @@ ThemeData _buildThemeData(
       backgroundColor: voicesColorScheme.onSurfaceNeutralOpaqueLv0,
     ),
     dialogTheme: DialogTheme(
-      // TODO(damian-molinski): themed value needed.
-      // We don't have it defined yet.
-      barrierColor: const Color(0x612A3D61),
+      // N10-38
+      barrierColor: const Color(0x212A3D61),
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
       clipBehavior: Clip.hardEdge,
       backgroundColor: voicesColorScheme.elevationsOnSurfaceNeutralLv1White,

catalyst_voices/packages/catalyst_voices_repositories/lib/src/credentials_storage_repository.dart

@@ -9,21 +9,18 @@ import 'package:result_type/result_type.dart';
 /// It will be replaced by a proper implementation as soon as authentication
 /// flow will be defined.
 final class CredentialsStorageRepository {
-  final SecureStorageService secureStorageService;
+  final DummyAuthStorage _storage;
 
-  const CredentialsStorageRepository({required this.secureStorageService});
+  const CredentialsStorageRepository({
+    required DummyAuthStorage storage,
+  }) : _storage = storage;
 
-  void get clearSessionData => secureStorageService.deleteAll;
+  Future<void> get clearSessionData async => _storage.clear();
 
   Future<Result<SessionData?, SecureStorageError>> getSessionData() async {
     try {
-      final email = await secureStorageService.get(
-        SecureStorageKeysConst.dummyEmail,
-      );
-
-      final password = await secureStorageService.get(
-        SecureStorageKeysConst.dummyPassword,
-      );
+      final email = await _storage.readEmail();
+      final password = await _storage.readPassword();
 
       if (email == null || password == null) {
         return Success(null);
@@ -44,15 +41,8 @@ final class CredentialsStorageRepository {
     SessionData sessionData,
   ) async {
     try {
-      await secureStorageService.set(
-        SecureStorageKeysConst.dummyEmail,
-        sessionData.email,
-      );
-
-      await secureStorageService.set(
-        SecureStorageKeysConst.dummyPassword,
-        sessionData.password,
-      );
+      await _storage.writeEmail(sessionData.email);
+      await _storage.writePassword(sessionData.password);
       return Success(null);
     } on SecureStorageError catch (_) {
       return Failure(SecureStorageError.canNotSaveData);

catalyst_voices/packages/catalyst_voices_services/lib/src/catalyst_voices_services.dart

@@ -1 +1,7 @@
-export 'secure_storage/secure_storage.dart';
+export 'storage/dummy_auth_storage.dart';
+export 'storage/secure_storage.dart';
+export 'storage/storage.dart';
+export 'storage/vault/lock_factor.dart';
+export 'storage/vault/lock_factor_codec.dart' show LockFactorCodec;
+export 'storage/vault/secure_storage_vault.dart';
+export 'storage/vault/vault.dart';

catalyst_voices/packages/catalyst_voices_services/lib/src/storage/dummy_auth_storage.dart

@@ -0,0 +1,47 @@
+import 'dart:async';
+
+import 'package:catalyst_voices_services/src/storage/secure_storage.dart';
+
+abstract interface class DummyAuthStorage {
+  FutureOr<String?> readEmail();
+
+  FutureOr<void> writeEmail(String? value);
+
+  FutureOr<String?> readPassword();
+
+  FutureOr<void> writePassword(String? value);
+
+  Future<void> clear();
+}
+
+final class SecureDummyAuthStorage extends SecureStorage
+    implements DummyAuthStorage {
+  static const _emailKey = 'email';
+  static const _passwordKey = 'password';
+
+  const SecureDummyAuthStorage({
+    super.secureStorage,
+  });
+
+  @override
+  FutureOr<String?> readEmail() => readString(key: _emailKey);
+
+  @override
+  FutureOr<void> writeEmail(String? value) {
+    return writeString(value, key: _emailKey);
+  }
+
+  @override
+  FutureOr<String?> readPassword() => readString(key: _passwordKey);
+
+  @override
+  FutureOr<void> writePassword(String? value) {
+    return writeString(value, key: _passwordKey);
+  }
+
+  @override
+  Future<void> clear() async {
+    await writeEmail(null);
+    await writePassword(null);
+  }
+}