From 74dddd470104ecc089702d7e9526b4113bc43fa9 Mon Sep 17 00:00:00 2001
From: Trisha Anand <trisha@appsmith.com>
Date: Fri, 2 Dec 2022 13:40:57 +0530
Subject: [PATCH] fix: Add user permission in the response for update
 datasource api (#18629)

---
 .../server/services/ce/DatasourceServiceCEImpl.java       | 3 ++-
 .../appsmith/server/services/DatasourceServiceTest.java   | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
index 43335df2fb..4eef7c30b5 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/DatasourceServiceCEImpl.java
@@ -333,7 +333,8 @@ public class DatasourceServiceCEImpl extends BaseService<DatasourceRepository, D
                                 savedDatasource.setPluginName(unsavedDatasource.getPluginName());
                                 return savedDatasource;
                             });
-                });
+                })
+                .flatMap(repository::setUserPermissionsInObject);
     }
 
     /**
diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
index 5d0794acab..5088621d0d 100644
--- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
+++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/DatasourceServiceTest.java
@@ -392,7 +392,13 @@ public class DatasourceServiceTest {
                     assertThat(createdDatasource.getPluginId()).isEqualTo(datasource.getPluginId());
                     assertThat(createdDatasource.getName()).isEqualTo(datasource.getName());
                     assertThat(createdDatasource.getDatasourceConfiguration().getConnection().getSsl().getKeyFile().getName()).isEqualTo("ssl_key_file_id2");
-
+                    assertThat(createdDatasource.getUserPermissions()).isNotEmpty();
+                    assertThat(createdDatasource.getUserPermissions()).containsAll(
+                            Set.of(
+                                    READ_DATASOURCES.getValue(), EXECUTE_DATASOURCES.getValue(),
+                                    MANAGE_DATASOURCES.getValue(), DELETE_DATASOURCES.getValue()
+                            )
+                    );
                 })
                 .verifyComplete();
     }