From d3ecf77ec7576aca47217a794590ac1c067c3ae4 Mon Sep 17 00:00:00 2001
From: Shubham Saxena <136057998+shubham7saxena7@users.noreply.github.com>
Date: Mon, 18 Sep 2023 23:28:49 +0530
Subject: [PATCH] fix: fix invite flow while inviting via admin settings
 (#27383)

> Pull Request Template
>
> Use this template to quickly create a well written pull request.
Delete all quotes before creating the pull request.
>
## Description
the logic for handling user invitation on admin settings page was
causing double emails on admin settings page. turns out, we cannot use
isEnabled flag because that flag can also be set by other serviecs for
an existing user.

#### PR fixes following issue(s)
Fixes # (issue number)
no issue - it is for a fix for existing buggy code in release
>
>

#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [x] Manual
- [x] JUnit
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 .../server/solutions/ce/EnvManagerCEImpl.java | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
index dc3f25e740..aaf8bde2aa 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
@@ -49,6 +49,8 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+import reactor.util.function.Tuples;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -591,20 +593,22 @@ public class EnvManagerCEImpl implements EnvManagerCE {
                 .collectList()
                 .flatMap(userUtils::removeSuperUser);
 
-        Flux<User> usersFlux = Flux.fromIterable(newUsers)
-                .flatMap(email -> userService.findByEmail(email).map(existingUser -> {
-                    if (existingUser == null) {
-                        User newUser = new User();
-                        newUser.setEmail(email);
-                        newUser.setIsEnabled(false);
-                        return newUser;
-                    }
-                    return existingUser;
-                }))
+        Flux<Tuple2<User, Boolean>> usersFlux = Flux.fromIterable(newUsers)
+                .flatMap(email -> userService
+                        .findByEmail(email)
+                        .flatMap(user -> {
+                            return Mono.just(Tuples.of(user, false));
+                        })
+                        .switchIfEmpty(Mono.defer(() -> {
+                            User newUser = new User();
+                            newUser.setEmail(email);
+                            newUser.setIsEnabled(false);
+                            return Mono.just(Tuples.of(newUser, true));
+                        })))
                 .cache();
 
-        Flux<User> newUsersFlux = usersFlux.filter(user -> !user.isEnabled());
-        Flux<User> existingUsersFlux = usersFlux.filter(User::isEnabled);
+        Flux<User> newUsersFlux = usersFlux.filter(Tuple2::getT2).map(Tuple2::getT1);
+        Flux<User> existingUsersFlux = usersFlux.filter(tuple -> !tuple.getT2()).map(Tuple2::getT1);
 
         // we are sending email to existing users who are not already super-users
         Mono<List<User>> existingUsersWhichAreNotAlreadySuperUsersMono = existingUsersFlux