Merge pull request #72 from SAMA-Communications/development

Release 0.11.0

Author: artem-yatchenko

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.11.0
+
+### Features:
+- Implemented the Draft feature to locally save unsent messages
+- Added support for Programmable Chat
+- Added support for verifying that a user belongs to a specific organization
+
+### Fixes:
+- Improved real-time updates for Online status to enhance compatibility with the web app
+
 ## 0.10.0
 
 ### Features:

lib/objectbox-model.json

@@ -213,7 +213,7 @@
     },
     {
       "id": "13:9106374520578572502",
-      "lastPropertyId": "15:8834178211781701775",
+      "lastPropertyId": "16:8214829155225431382",
       "name": "ConversationModel",
       "properties": [
         {
@@ -295,6 +295,14 @@
           "id": "15:8834178211781701775",
           "name": "isEncrypted",
           "type": 1
+        },
+        {
+          "id": "16:8214829155225431382",
+          "name": "draftMessageBindId",
+          "type": 11,
+          "flags": 520,
+          "indexId": "38:1718185030575189588",
+          "relationTarget": "MessageModel"
         }
       ],
       "relations": [
@@ -307,7 +315,7 @@
     }
   ],
   "lastEntityId": "13:9106374520578572502",
-  "lastIndexId": "37:873959491954871870",
+  "lastIndexId": "38:1718185030575189588",
   "lastRelationId": "5:7785256265115248397",
   "lastSequenceId": "0:0",
   "modelVersion": 5,

lib/objectbox.g.dart

@@ -1,6 +1,4 @@
-import '../connection/connection.dart';
-import '../conversations/models/models.dart';
-import 'realtime/models/models.dart';
+import '../api.dart';
 
 const String messageRequestName = 'message';
 const String messageEditRequestName = 'message_edit';
@@ -10,7 +8,7 @@ const String messagesDeleteRequestName = 'message_delete';
 
 const messageRequestTimeout = Duration(seconds: 5);
 
-Future<bool> sendMessage({
+Future<(bool, Message?)> sendMessage({
   required Message message,
 }) {
   var dataToSend = {
@@ -23,7 +21,7 @@ Future<bool> sendMessage({
 
   if (SamaConnectionService.instance.connectionState !=
       ConnectionState.connected) {
-    return Future.value(false);
+    return Future.value((false, null));
   }
 
   return SamaConnectionService.instance
@@ -32,11 +30,16 @@ Future<bool> sendMessage({
       .timeout(messageRequestTimeout)
       .then((response) {
     if (message.id == response['mid']) {
-      return true;
+      if (response['bot_message'] != null) {
+        return (true, Message.fromJson(response['bot_message']));
+      } else if (response['modified'] != null) {
+        var msg = message.copyWith(
+            body: response['modified']['body'], extension: {'modified': true});
+        return (true, msg);
+      }
+      return (true, null);
     }
-    return false;
-  }).catchError((onError) {
-    return false;
+    return (false, null);
   });
 }
 

lib/src/api/chats/messages_api.dart

@@ -33,18 +33,25 @@ class PendingMessageStatus implements MessageSendStatus {
 class SentMessageStatus implements MessageSendStatus {
   final String messageId; // mid
   final String serverMessageId; // server_mid
-  final DateTime time; // t
+  final int time; // t
 
   SentMessageStatus.fromJson(Map<String, dynamic> json)
       : messageId = json['mid'],
         serverMessageId = json['server_mid'],
-        time = DateTime.parse(json['t'].toString());
+        time = json['t'];
 }
 
 class ReadMessagesStatus extends MessageStatus implements MessageSendStatus {
   ReadMessagesStatus.fromJson(super.json) : super.fromJson();
 }
 
+class FailedMessagesStatus implements MessageSendStatus {
+  final String messageId;
+
+  FailedMessagesStatus.fromJson(Map<String, dynamic> json)
+      : messageId = json['mid'];
+}
+
 class EditMessageStatus {
   final String messageId; // id
   final String newBody; // body

lib/src/api/chats/realtime/models/message_statuses.dart

@@ -13,6 +13,8 @@ Future<Map<String, dynamic>> sendHTTPRequest(
     String requestName, dynamic requestData,
     [Map? requestHeaders]) async {
   final url = 'https://${await SecureStorage.instance.getEnvironmentUrl()}';
+  final orgId = await SecureStorage.instance.getEnvironmentOrgId();
+  requestData['organization_id'] = orgId;
   var urlQuery = buildQueryUrl(url, [requestName]);
   var body = jsonEncode(requestData);
   Map<String, String> headers = Map.of(_headers);

lib/src/api/connection/http_request.dart

@@ -49,10 +49,32 @@ class Message extends Equatable {
         't': createdAt,
       };
 
+  Message copyWith({
+    String? id,
+    String? from,
+    String? cid,
+    String? rawStatus,
+    String? body,
+    List<Attachment>? attachments,
+    int? t,
+    DateTime? createdAt,
+    Map<String, dynamic>? extension,
+  }) {
+    return Message(
+      id: id ?? this.id,
+      from: from ?? this.from,
+      cid: cid ?? this.cid,
+      rawStatus: rawStatus ?? this.rawStatus,
+      body: body ?? this.body,
+      attachments: attachments ?? this.attachments,
+      t: t ?? this.t,
+      createdAt: createdAt ?? this.createdAt,
+      extension: extension ?? this.extension,
+    );
+  }
+
   @override
-  List<Object?> get props => [
-        id, rawStatus, attachments, body
-      ];
+  List<Object?> get props => [id, rawStatus, attachments, body];
 
   static const empty = Message();
 }

lib/src/api/conversations/models/message.dart

@@ -15,23 +15,23 @@ class UsersManager {
 
   StreamSubscription<Map<String, dynamic>>? _dataListener;
 
-  final StreamController<Map<String, dynamic>> _lastActivityController =
+  final StreamController<Map<String, int>> _lastActivityController =
       StreamController.broadcast();
 
-  Stream<Map<String, dynamic>> get lastActivityControllerStream =>
+  Stream<Map<String, int>> get lastActivityControllerStream =>
       _lastActivityController.stream;
 
   _init() {
     if (_dataListener != null) return;
 
     _dataListener = SamaConnectionService.instance.dataStream.listen((data) {
       if (data['last_activity'] != null) {
-        _processLastActivity(data['last_activity'].cast<String, dynamic>());
+        _processLastActivity(data['last_activity'].cast<String, int>());
       }
     });
   }
 
-  void _processLastActivity(Map<String, dynamic> data) {
+  void _processLastActivity(Map<String, int> data) {
     _lastActivityController.add(data);
   }
 

lib/src/api/users/realtime/users_manager.dart

@@ -30,11 +30,12 @@ Future<User> createUser({
   String? lastName,
   String? email,
   String? phone,
-}) {
+}) async {
   return SamaConnectionService.instance.sendRequest(userCreateRequestName, {
     'login': login,
     'password': password,
     'device_id': deviceId,
+    'organization_id': await SecureStorage.instance.getEnvironmentOrgId(),
     if (email != null) 'email': email,
     if (phone != null) 'phone': phone,
     if (firstName != null) 'first_name': firstName,
@@ -188,7 +189,7 @@ Future<List<User>> searchUsersByKeyword(String keyword,
   });
 }
 
-Future<dynamic> subscribeUserLastActivity(String id) {
+Future<int> subscribeUserLastActivity(String id) {
   return SamaConnectionService.instance
       .sendRequest(userLastActivitySubscribe, {'id': id}).then((response) {
     var status = response['last_activity'][id];

lib/src/api/users/users_api.dart

@@ -1,15 +1,15 @@
-const String apiProdUrl = 'api.samacloud.io';
-const String apiDevUrl = 'api-dev.samacloud.io';
+const String _apiProdUrl = 'api.samacloud.io';
+const String _apiDevUrl = 'api-dev.samacloud.io';
+
+const String _organizationIdProd = '6821d147b2bb04e5fe564c73';
+const String _organizationIdDev = '6821d147b2bb04e5fe564c73';
 
 enum EnvType {
-  dev(apiDevUrl),
-  prod(apiProdUrl);
+  prod(_apiProdUrl, _organizationIdProd),
+  dev(_apiDevUrl, _organizationIdDev);
 
   final String url;
+  final String organizationId;
 
-  const EnvType(this.url);
-
-  factory EnvType.fromUrl(String url) {
-    return values.firstWhere((e) => e.url == url);
-  }
+  const EnvType(this.url, this.organizationId);
 }