fix: encrypt

waterbustech · Feb 8, 2025 · 31f21ef · 31f21ef
1 parent 7a92a46
commit 31f21ef
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -17,7 +17,6 @@ analyzer:
     - "examples/**"
   plugins:
     - dart_code_metrics
-
 linter:
   # The lint rules applied to this project can be customized in the
   # section below to disable rules from the `package:flutter_lints/flutter.yaml`

diff --git a/lib/core/api/messages/datasources/message_remote_datasource.dart b/lib/core/api/messages/datasources/message_remote_datasource.dart
@@ -8,6 +8,7 @@ import 'package:waterbus_sdk/constants/http_status_code.dart';
 import 'package:waterbus_sdk/core/api/base/base_remote_data.dart';
 import 'package:waterbus_sdk/flutter_waterbus_sdk.dart';
 import 'package:waterbus_sdk/utils/encrypt/encrypt.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/api.dart';
 
 abstract class MessageRemoteDataSource {
   Future<List<MessageModel>> getMessageByRoom({
@@ -82,8 +83,8 @@ class MessageRemoteDataSourceImpl extends MessageRemoteDataSource {
     required int meetingId,
     required String data,
   }) async {
-    final String messageData =
-        await EncryptAES().encryptAES256(cleartext: data);
+    final String messageData = await encryptAes256(cleartext: data);
+    // await EncryptAES().encryptAES256(cleartext: data);
 
     final Response response = await _remoteData.postRoute(
       "${ApiEndpoints.chats}/$meetingId",
@@ -102,8 +103,8 @@ class MessageRemoteDataSourceImpl extends MessageRemoteDataSource {
     required int messageId,
     required String data,
   }) async {
-    final String messageData =
-        await EncryptAES().encryptAES256(cleartext: data);
+    final String messageData = await encryptAes256(cleartext: data);
+    // await EncryptAES().encryptAES256(cleartext: data);
     final Response response = await _remoteData.putRoute(
       "${ApiEndpoints.chats}/$messageId",
       {"data": messageData},

diff --git a/lib/utils/encrypt/rust_generate/api.dart → lib/utils/encrypt/frb/api.dart b/lib/utils/encrypt/rust_generate/api.dart → lib/utils/encrypt/frb/api.dart
@@ -5,7 +5,7 @@
 
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/frb_generated.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/frb_generated.dart';
 
 Future<String> encryptAes256({required String cleartext, Str? key}) =>
     RustLib.instance.api.crateApiEncryptAes256(cleartext: cleartext, key: key);

diff --git a/.../encrypt/rust_generate/frb_generated.dart → lib/utils/encrypt/frb/frb_generated.dart b/.../encrypt/rust_generate/frb_generated.dart → lib/utils/encrypt/frb/frb_generated.dart
@@ -8,10 +8,10 @@ import 'dart:convert';
 
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
 
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/api.dart';
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/frb_generated.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/api.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/frb_generated.dart';
 
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/frb_generated.io.dart'
+import 'package:waterbus_sdk/utils/encrypt/frb/frb_generated.io.dart'
     if (dart.library.js_interop) 'frb_generated.web.dart';
 
 /// Main entrypoint of the Rust API

diff --git a/...crypt/rust_generate/frb_generated.io.dart → lib/utils/encrypt/frb/frb_generated.io.dart b/...crypt/rust_generate/frb_generated.io.dart → lib/utils/encrypt/frb/frb_generated.io.dart
@@ -9,8 +9,8 @@ import 'dart:ffi' as ffi;
 
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_io.dart';
 
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/api.dart';
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/frb_generated.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/api.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/frb_generated.dart';
 
 abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   RustLibApiImplPlatform({

diff --git a/...rypt/rust_generate/frb_generated.web.dart → lib/utils/encrypt/frb/frb_generated.web.dart b/...rypt/rust_generate/frb_generated.web.dart → lib/utils/encrypt/frb/frb_generated.web.dart
@@ -11,8 +11,8 @@ import 'dart:convert';
 
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated_web.dart';
 
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/api.dart';
-import 'package:waterbus_sdk/utils/encrypt/rust_generate/frb_generated.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/api.dart';
+import 'package:waterbus_sdk/utils/encrypt/frb/frb_generated.dart';
 
 abstract class RustLibApiImplPlatform extends BaseApiImpl<RustLibWire> {
   RustLibApiImplPlatform({

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -39,9 +39,11 @@ dependencies:
   web: ^1.0.0
   cryptography: ^2.7.0
   convert: ^3.1.1
-  flutter_rust_bridge: ^2.7.0
+  # Rust Bridge
+  flutter_rust_bridge: 2.7.0
   ffi: ^2.1.3
   ffigen: ^16.0.0
+  js: ^0.6.7
 
   # WebRTC
   sdp_transform: ^0.3.2