feat(rbac): removed owner role and changed member permissions

backend/src/controllers/v1/organizationController.ts

@@ -8,7 +8,7 @@ import {
 } from "../../models";
 import { createOrganization as create } from "../../helpers/organization";
 import { addMembershipsOrg } from "../../helpers/membershipOrg";
-import { ACCEPTED, OWNER } from "../../variables";
+import { ACCEPTED, ADMIN } from "../../variables";
 import { getLicenseServerUrl, getSiteURL } from "../../config";
 import { licenseServerKeyRequest } from "../../config/request";
 import { validateRequest } from "../../helpers/validation";
@@ -55,7 +55,7 @@ export const createOrganization = async (req: Request, res: Response) => {
   await addMembershipsOrg({
     userIds: [req.user._id.toString()],
     organizationId: organization._id.toString(),
-    roles: [OWNER],
+    roles: [ADMIN],
     statuses: [ACCEPTED]
   });
 

backend/src/ee/controllers/v1/roleController.ts

@@ -171,18 +171,6 @@ export const getRoles = async (req: Request, res: Response) => {
   const customRoles = await Role.find({ organization: orgId, isOrgRole, workspace: workspaceId });
   // as this is shared between org and workspace switch the rule set based on it
   const roles = [
-    // owner is only in org level role
-    ...(isOrgRole
-      ? [
-          {
-            _id: "owner",
-            name: "Owner",
-            slug: "owner",
-            description: "Complete administration access over the organization.",
-            permissions: adminPermissions.rules
-          }
-        ]
-      : []),
     {
       _id: "admin",
       name: "Admin",
@@ -192,7 +180,7 @@ export const getRoles = async (req: Request, res: Response) => {
     },
     {
       _id: "member",
-      name: "Member",
+      name: isOrgRole ? "Member" : "Developer",
       slug: "member",
       description: "Non-administrative role in an organization",
       permissions: isOrgRole ? memberPermissions.rules : memberProjectPermissions.rules

backend/src/ee/services/ProjectRoleService.ts

@@ -158,13 +158,39 @@ const buildMemberPermission = () => {
   can(ProjectPermissionActions.Create, ProjectPermissionSub.SecretRollback);
 
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Member);
-  can(ProjectPermissionActions.Read, ProjectPermissionSub.Role);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Member);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Integrations);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Integrations);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Integrations);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Integrations);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Webhooks);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Webhooks);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Webhooks);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Webhooks);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.ServiceTokens);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.ServiceTokens);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.ServiceTokens);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.ServiceTokens);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Settings);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Settings);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Settings);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Settings);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Environments);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Environments);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Environments);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Environments);
+
   can(ProjectPermissionActions.Read, ProjectPermissionSub.Tags);
+  can(ProjectPermissionActions.Create, ProjectPermissionSub.Tags);
+  can(ProjectPermissionActions.Edit, ProjectPermissionSub.Tags);
+  can(ProjectPermissionActions.Delete, ProjectPermissionSub.Tags);
+
+  can(ProjectPermissionActions.Read, ProjectPermissionSub.Role);
   can(ProjectPermissionActions.Read, ProjectPermissionSub.AuditLogs);
   can(ProjectPermissionActions.Read, ProjectPermissionSub.IpAllowList);
 

backend/src/ee/services/RoleService.ts

@@ -86,12 +86,17 @@ const buildMemberPermission = () => {
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Workspace);
   can(OrgPermissionActions.Create, OrgPermissionSubjects.Workspace);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Member);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.Member);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Role);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Settings);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Billing);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.Sso);
   can(OrgPermissionActions.Read, OrgPermissionSubjects.IncidentAccount);
+
   can(OrgPermissionActions.Read, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Create, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Edit, OrgPermissionSubjects.SecretScanning);
+  can(OrgPermissionActions.Delete, OrgPermissionSubjects.SecretScanning);
 
   return build({ conditionsMatcher });
 };
@@ -114,8 +119,7 @@ export const getUserOrgPermissions = async (userId: string, orgId: string) => {
     throw UnauthorizedRequestError({ message: "User doesn't belong to organization" });
   }
 
-  if (membership.role === "admin" || membership.role === "owner")
+  if (membership.role === "admin") return { permission: adminPermissions, membership };
-    return { permission: adminPermissions, membership };
 
   if (membership.role === "member") return { permission: memberPermissions, membership };
 

backend/src/helpers/signup.ts

@@ -1,7 +1,7 @@
 import { IUser } from "../models";
 import { createOrganization } from "./organization";
 import { addMembershipsOrg } from "./membershipOrg";
-import { ACCEPTED, OWNER } from "../variables";
+import { ACCEPTED, ADMIN } from "../variables";
 import { sendMail } from "../helpers/nodemailer";
 import { TokenService } from "../services";
 import { TOKEN_EMAIL_CONFIRMATION } from "../variables";
@@ -14,10 +14,10 @@ import { TOKEN_EMAIL_CONFIRMATION } from "../variables";
  * @returns {Boolean} success - whether or not operation was successful
  */
 export const sendEmailVerification = async ({ email }: { email: string }) => {
-	const token = await TokenService.createToken({
+  const token = await TokenService.createToken({
-		type: TOKEN_EMAIL_CONFIRMATION,
+    type: TOKEN_EMAIL_CONFIRMATION,
-		email,
+    email
-	});
+  });
 
   // send mail
   await sendMail({
@@ -25,8 +25,8 @@ export const sendEmailVerification = async ({ email }: { email: string }) => {
     subjectLine: "Infisical confirmation code",
     recipients: [email],
     substitutions: {
-      code: token,
+      code: token
-    },
+    }
   });
 };
 
@@ -36,17 +36,11 @@ export const sendEmailVerification = async ({ email }: { email: string }) => {
  * @param {String} obj.email - emai
  * @param {String} obj.code - code that was sent to [email]
  */
-export const checkEmailVerification = async ({
+export const checkEmailVerification = async ({ email, code }: { email: string; code: string }) => {
-	email,
-	code,
-}: {
-	email: string;
-	code: string;
-}) => {
   await TokenService.validateToken({
     type: TOKEN_EMAIL_CONFIRMATION,
     email,
-    token: code,
+    token: code
   });
 };
 
@@ -58,27 +52,27 @@ export const checkEmailVerification = async ({
  * @param {IUser} obj.user - user who we are initializing for
  */
 export const initializeDefaultOrg = async ({
-	organizationName,
+  organizationName,
-	user,
+  user
 }: {
-	organizationName: string;
+  organizationName: string;
-	user: IUser;
+  user: IUser;
 }) => {
-	try {
+  try {
-		// create organization with user as owner and initialize a free
+    // create organization with user as owner and initialize a free
-		// subscription
+    // subscription
-		const organization = await createOrganization({
+    const organization = await createOrganization({
-			email: user.email,
+      email: user.email,
-			name: organizationName,
+      name: organizationName
-		});
+    });
 
-		await addMembershipsOrg({
+    await addMembershipsOrg({
-			userIds: [user._id.toString()],
+      userIds: [user._id.toString()],
-			organizationId: organization._id.toString(),
+      organizationId: organization._id.toString(),
-			roles: [OWNER],
+      roles: [ADMIN],
-			statuses: [ACCEPTED],
+      statuses: [ACCEPTED]
-		});
+    });
-	} catch (err) {
+  } catch (err) {
-		throw new Error(`Failed to initialize default organization and workspace [err=${err}]`);
+    throw new Error(`Failed to initialize default organization and workspace [err=${err}]`);
-	}
+  }
-};
+};

backend/src/models/membershipOrg.ts

@@ -1,5 +1,5 @@
 import { Document, Schema, Types, model } from "mongoose";
-import { ACCEPTED, ADMIN, CUSTOM, INVITED, MEMBER, OWNER } from "../variables";
+import { ACCEPTED, ADMIN, CUSTOM, INVITED, MEMBER } from "../variables";
 
 export interface IMembershipOrg extends Document {
   _id: Types.ObjectId;
@@ -26,7 +26,7 @@ const membershipOrgSchema = new Schema(
     },
     role: {
       type: String,
-      enum: [OWNER, ADMIN, MEMBER, CUSTOM],
+      enum: [ADMIN, MEMBER, CUSTOM],
       required: true
     },
     status: {

backend/src/utils/setup/backfillData.ts

@@ -13,6 +13,7 @@ import {
   Integration,
   IntegrationAuth,
   Membership,
+  MembershipOrg,
   Organization,
   Secret,
   SecretBlindIndexData,
@@ -23,10 +24,12 @@ import {
 import { generateKeyPair } from "../../utils/crypto";
 import { client, getEncryptionKey, getRootEncryptionKey } from "../../config";
 import {
+  ADMIN,
   ALGORITHM_AES_256_GCM,
   ENCODING_SCHEME_BASE64,
   ENCODING_SCHEME_UTF8,
   MEMBER,
+  OWNER,
   VIEWER
 } from "../../variables";
 import { InternalServerError } from "../errors";
@@ -691,5 +694,16 @@ export const backfillPermission = async () => {
       }
     ]
   );
+
+  await MembershipOrg.updateMany(
+    {
+      role: OWNER
+    },
+    {
+      $set: {
+        role: ADMIN
+      }
+    }
+  );
   console.log("Backfill: Finishing converting old denied permission in workspace to viewers");
 };

frontend/src/styles/globals.css

@@ -1,6 +1,10 @@
 @tailwind base;
 @tailwind components;
 
+html {
+  @apply overflow-hidden;
+}
+
 .rdp-day,
 .rdp-nav_button {
   @apply rounded-md hover:text-mineshaft-500;

frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleModifySection/OrgRoleModifySection.tsx

@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { useForm } from "react-hook-form";
 import {
   faArrowLeft,
@@ -80,7 +79,6 @@ const SIMPLE_PERMISSION_OPTIONS = [
 ] as const;
 
 export const OrgRoleModifySection = ({ role, onGoBack }: Props) => {
-  const [searchPermission, setSearchPermission] = useState("");
   const { subscription } = useSubscription();
   const { popUp, handlePopUpToggle, handlePopUpOpen } = usePopUp(["upgradePlan"] as const);
 
@@ -196,14 +194,6 @@ export const OrgRoleModifySection = ({ role, onGoBack }: Props) => {
             <div>
               <h2 className="text-xl font-medium">Add Permission</h2>
             </div>
-            <div className="flex-1 max-w-md">
-              <Input
-                value={searchPermission}
-                onChange={(e) => setSearchPermission(e.target.value)}
-                leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                placeholder="Search permissions..."
-              />
-            </div>
           </div>
           <div className="">
             <WorkspacePermission

frontend/src/views/Project/MembersPage/components/MemberListTab/MemberListTab.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useState } from "react";
 import { Controller, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
+import Link from "next/link";
 import { faMagnifyingGlass, faPlus, faTrash, faUsers } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -359,48 +360,57 @@ export const MemberListTab = ({ roles = [], isRolesLoading }: Props) => {
           title={t("section.members.add-dialog.add-member-to-project") as string}
           subTitle={t("section.members.add-dialog.user-will-email")}
         >
-          <form onSubmit={handleSubmit(onAddMember)}>
+          {filteredOrgUsers.length ? (
-            <Controller
+            <form onSubmit={handleSubmit(onAddMember)}>
-              control={control}
+              <Controller
-              defaultValue={filteredOrgUsers?.[0]?.user?.email}
+                control={control}
-              name="email"
+                defaultValue={filteredOrgUsers?.[0]?.user?.email}
-              render={({ field, fieldState: { error } }) => (
+                name="email"
-                <FormControl label="Email" isError={Boolean(error)} errorText={error?.message}>
+                render={({ field, fieldState: { error } }) => (
-                  <Select
+                  <FormControl label="Email" isError={Boolean(error)} errorText={error?.message}>
-                    position="popper"
+                    <Select
-                    className="w-full"
+                      position="popper"
-                    defaultValue={filteredOrgUsers?.[0]?.user?.email}
+                      className="w-full"
-                    value={field.value}
+                      defaultValue={filteredOrgUsers?.[0]?.user?.email}
-                    onValueChange={field.onChange}
+                      value={field.value}
-                  >
+                      onValueChange={field.onChange}
-                    {filteredOrgUsers.map(({ _id: orgUserId, user: u }) => (
+                    >
-                      <SelectItem value={u?.email} key={`org-membership-join-${orgUserId}`}>
+                      {filteredOrgUsers.map(({ _id: orgUserId, user: u }) => (
-                        {u?.email}
+                        <SelectItem value={u?.email} key={`org-membership-join-${orgUserId}`}>
-                      </SelectItem>
+                          {u?.email}
-                    ))}
+                        </SelectItem>
-                  </Select>
+                      ))}
-                </FormControl>
+                    </Select>
-              )}
+                  </FormControl>
-            />
+                )}
-            <div className="mt-8 flex items-center">
+              />
-              <Button
+              <div className="mt-8 flex items-center">
-                className="mr-4"
+                <Button
-                size="sm"
+                  className="mr-4"
-                type="submit"
+                  size="sm"
-                isLoading={isSubmitting}
+                  type="submit"
-                isDisabled={isSubmitting}
+                  isLoading={isSubmitting}
-              >
+                  isDisabled={isSubmitting}
-                Add Member
+                >
-              </Button>
+                  Add Member
-              <Button
+                </Button>
-                colorSchema="secondary"
+                <Button
-                variant="plain"
+                  colorSchema="secondary"
-                onClick={() => handlePopUpClose("addMember")}
+                  variant="plain"
-              >
+                  onClick={() => handlePopUpClose("addMember")}
-                Cancel
+                >
-              </Button>
+                  Cancel
+                </Button>
+              </div>
+            </form>
+          ) : (
+            <div className="flex flex-col space-y-4">
+              <div>All the users in your organization are already invited.</div>
+              <Link href={`/org/${currentWorkspace?.organization}/members`}>
+                <Button variant="outline_bg">Add users to organization</Button>
+              </Link>
             </div>
-          </form>
+          )}
         </ModalContent>
       </Modal>
       <DeleteActionModal

frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/ProjectRoleModifySection.tsx

@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { useForm } from "react-hook-form";
 import { faElementor } from "@fortawesome/free-brands-svg-icons";
 import {
@@ -8,7 +7,6 @@ import {
   faCog,
   faKey,
   faLock,
-  faMagnifyingGlass,
   faNetworkWired,
   faPuzzlePiece,
   faTags,
@@ -105,8 +103,6 @@ type Props = {
 };
 
 export const ProjectRoleModifySection = ({ role, onGoBack }: Props) => {
-  const [searchPermission, setSearchPermission] = useState("");
-
   const { popUp, handlePopUpToggle, handlePopUpOpen } = usePopUp(["upgradePlan"] as const);
 
   const isNonEditable = ["admin", "member", "viewer"].includes(role?.slug || "");
@@ -226,14 +222,6 @@ export const ProjectRoleModifySection = ({ role, onGoBack }: Props) => {
             <div>
               <h2 className="text-xl font-medium">Add Permission</h2>
             </div>
-            <div className="flex-1 max-w-md">
-              <Input
-                value={searchPermission}
-                onChange={(e) => setSearchPermission(e.target.value)}
-                leftIcon={<FontAwesomeIcon icon={faMagnifyingGlass} />}
-                placeholder="Search permissions..."
-              />
-            </div>
           </div>
           <div>
             <MultiEnvProjectPermission

frontend/src/views/Project/MembersPage/components/ProjectRoleListTab/components/ProjectRoleModifySection/SingleProjectPermission.tsx

@@ -44,6 +44,22 @@ const PERMISSIONS = [
   { action: "delete", label: "Remove" }
 ] as const;
 
+const MEMBERS_PERMISSIONS = [
+  { action: "read", label: "View all members" },
+  { action: "create", label: "Invite members" },
+  { action: "edit", label: "Edit members" },
+  { action: "delete", label: "Remove members" }
+] as const;
+
+const getPermissionList = (option: Props["formName"]) => {
+  switch (option) {
+    case "member":
+      return MEMBERS_PERMISSIONS;
+    default:
+      return PERMISSIONS;
+  }
+};
+
 export const SingleProjectPermission = ({
   isNonEditable,
   setValue,
@@ -148,7 +164,7 @@ export const SingleProjectPermission = ({
         className="overflow-hidden grid gap-8 grid-flow-col auto-cols-min"
       >
         {isCustom &&
-          PERMISSIONS.map(({ action, label }) => (
+          getPermissionList(formName).map(({ action, label }) => (
             <Controller
               name={`permissions.${formName}.${action}`}
               key={`permissions.${formName}.${action}`}