fix react UI and set user when creating cluster

cluster/cluster_acl.go

@@ -26,7 +26,7 @@ type APIUser struct {
 	Grants   map[string]bool `json:"grants"`
 }
 
-func (cluster *Cluster) SetUserGrants(u *APIUser, grant string) {
+func (cluster *Cluster) SetNewUserGrants(u *APIUser, grant string) {
 	acls := strings.Split(grant, " ")
 	for key, value := range cluster.Grants {
 		found := false
@@ -40,7 +40,7 @@ func (cluster *Cluster) SetUserGrants(u *APIUser, grant string) {
 	}
 }
 
-func (cluster *Cluster) SetUserRoles(u *APIUser, roles string) {
+func (cluster *Cluster) SetNewUserRoles(u *APIUser, roles string) {
 	list := strings.Split(roles, " ")
 
 	if u.Grants[config.GrantGlobalGrant] && roles == "" {
@@ -156,8 +156,8 @@ func (cluster *Cluster) LoadAPIUsers() error {
 
 			// For compatibility allow empty cluster list ACL
 			if useracl == newapiuser.User && (listcluster == "" || slices.Contains(cluster_acls, cluster.Name)) {
-				cluster.SetUserGrants(&newapiuser, listacls)
-				cluster.SetUserRoles(&newapiuser, listroles)
+				cluster.SetNewUserGrants(&newapiuser, listacls)
+				cluster.SetNewUserRoles(&newapiuser, listroles)
 			}
 		}
 

server/api.go

@@ -39,6 +39,7 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/signal18/replication-manager/cert"
 	"github.com/signal18/replication-manager/cluster"
+	"github.com/signal18/replication-manager/config"
 	"github.com/signal18/replication-manager/regtest"
 	"github.com/signal18/replication-manager/share"
 	"github.com/signal18/replication-manager/utils/githelper"
@@ -360,6 +361,31 @@ func (repman *ReplicationManager) IsValidClusterACL(r *http.Request, cluster *cl
 	return false, ""
 }
 
+func (repman *ReplicationManager) GetUserFromRequest(r *http.Request) string {
+
+	token, err := request.ParseFromRequest(r, request.AuthorizationHeaderExtractor, func(token *jwt.Token) (interface{}, error) {
+		vk, _ := jwt.ParseRSAPublicKeyFromPEM(verificationKey)
+		return vk, nil
+	})
+
+	if err == nil {
+		claims := token.Claims.(jwt.MapClaims)
+		userinfo := claims["CustomUserInfo"]
+		mycutinfo := userinfo.(map[string]interface{})
+		meuser := mycutinfo["Name"].(string)
+		_, ok := mycutinfo["profile"]
+
+		if ok {
+			if strings.Contains(mycutinfo["profile"].(string), repman.Conf.OAuthProvider) /*&& strings.Contains(mycutinfo["email_verified"]*/ {
+				return mycutinfo["email"].(string)
+			}
+		}
+		return meuser
+	}
+
+	return ""
+}
+
 func (repman *ReplicationManager) loginHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	var user userCredentials
@@ -753,8 +779,33 @@ func (repman *ReplicationManager) jsonResponse(apiresponse interface{}, w http.R
 func (repman *ReplicationManager) handlerMuxClusterAdd(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Allow-Origin", "*")
 	vars := mux.Vars(r)
+
+	username := repman.GetUserFromRequest(r)
+	if username == "" {
+		http.Error(w, "User is not valid", http.StatusInternalServerError)
+		return
+	}
+
 	repman.AddCluster(vars["clusterName"], "")
+	// Create user and grant for new cluster
+	cl := repman.getClusterByName(vars["clusterName"])
+	if cl != nil {
+		if u, ok := cl.APIUsers[username]; !ok {
+			// Create user and grant for new cluster
+			userform := cluster.UserForm{
+				Username: username,
+				Roles:    strings.Join(([]string{config.RoleSponsor, config.RoleDBOps, config.RoleSysOps}), " "),
+				Grants:   "cluster db proxy prov",
+			}
 
+			cl.AddUser(userform)
+		} else {
+			// Update grant for new cluster
+			cl.SetNewUserGrants(&u, "cluster db proxy prov")
+			cl.SetNewUserRoles(&u, strings.Join(([]string{config.RoleSponsor, config.RoleDBOps, config.RoleSysOps}), " "))
+			cl.APIUsers[u.User] = u
+		}
+	}
 }
 
 func (repman *ReplicationManager) handlerMuxClusterDelete(w http.ResponseWriter, r *http.Request) {

share/dashboard_react/src/components/Modals/AddUserModal.jsx

@@ -142,7 +142,6 @@ function AddUserModal({ clusterName, isOpen, closeModal }) {
       return
     }
 
-
     const selectedRoles = roles.filter((x) => x.selected).map((x) => x.role)
     if (selectedRoles.length === 0) {
       setRolesError('Please select atleast one role')
@@ -155,7 +154,7 @@ function AddUserModal({ clusterName, isOpen, closeModal }) {
       return
     }
 
-    dispatch(addUser({ clusterName, username: userName, password, grants: selectedGrants.join(' '), roles: selectedRoles.join(' ') }))
+    dispatch(addUser({ clusterName, username: userName, grants: selectedGrants.join(' '), roles: selectedRoles.join(' ') }))
     closeModal()
   }
   return (
@@ -184,7 +183,7 @@ function AddUserModal({ clusterName, isOpen, closeModal }) {
             </FormControl> */}
             <Message message={rolesError} />
             <VStack className={parentStyles.roleContainer}>
-              <Input id='search' type='search' onChange={handleSearchRoles} placeholder='Search ROLE' />
+              <Input id='searchRole' type='search' onChange={handleSearchRoles} placeholder='Search ROLE' />
               <List className={parentStyles.roleList}>
                 {roles.length > 0 &&
                   roles.map((role) => (
@@ -201,7 +200,7 @@ function AddUserModal({ clusterName, isOpen, closeModal }) {
             </VStack>
             <Message message={grantsError} />
             <VStack className={parentStyles.aclContainer}>
-              <Input id='search' type='search' onChange={handleSearch} placeholder='Search ACL' />
+              <Input id='searchAcl' type='search' onChange={handleSearch} placeholder='Search ACL' />
               <List className={parentStyles.aclList}>
                 {acls.length > 0 &&
                   acls.map((acl) => (

share/dashboard_react/src/redux/clusterSlice.js

@@ -895,9 +895,9 @@ export const toggleDatabaseActions = createAsyncThunk(
 
 export const addUser = createAsyncThunk(
   'cluster/addUser',
-  async ({ clusterName, username, password, grants }, thunkAPI) => {
+  async ({ clusterName, username, grants, roles }, thunkAPI) => {
     try {
-      const { data, status } = await clusterService.addUser(clusterName, username, password, grants)
+      const { data, status } = await clusterService.addUser(clusterName, username, grants, roles)
       showSuccessBanner(`User is added successful!`, status, thunkAPI)
       return { data, status }
     } catch (error) {

share/dashboard_react/src/services/clusterService.js

@@ -383,8 +383,8 @@ function runRegressionTests(clusterName, testName) {
 //#endregion cluster>run tests
 
 //#region cluster> add user
-function addUser(clusterName, username, password, grants, roles) {
-  return postRequest(`clusters/${clusterName}/users/add`, { username, password, grants, roles })
+function addUser(clusterName, username, grants, roles) {
+  return postRequest(`clusters/${clusterName}/users/add`, { username, grants, roles })
 }
 
 //#endregion cluster>add user