diff --git a/backend/src/ee/services/ldap-config/ldap-config-service.ts b/backend/src/ee/services/ldap-config/ldap-config-service.ts index c8b49d5d8..7caaa5596 100644 --- a/backend/src/ee/services/ldap-config/ldap-config-service.ts +++ b/backend/src/ee/services/ldap-config/ldap-config-service.ts @@ -21,7 +21,7 @@ import { TokenType } from "@app/services/auth-token/auth-token-types"; import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal"; import { TOrgBotDALFactory } from "@app/services/org/org-bot-dal"; import { TOrgDALFactory } from "@app/services/org/org-dal"; -import { getDefaultOrgMembershipRoleDto } from "@app/services/org/org-role-fns"; +import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns"; import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal"; import { TProjectDALFactory } from "@app/services/project/project-dal"; import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal"; @@ -438,7 +438,7 @@ export const ldapConfigServiceFactory = ({ { tx } ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgDAL.createMembership( { @@ -526,7 +526,7 @@ export const ldapConfigServiceFactory = ({ ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgMembershipDAL.create( { diff --git a/backend/src/ee/services/oidc/oidc-config-service.ts b/backend/src/ee/services/oidc/oidc-config-service.ts index 74c640733..b68d5497f 100644 --- a/backend/src/ee/services/oidc/oidc-config-service.ts +++ b/backend/src/ee/services/oidc/oidc-config-service.ts @@ -23,7 +23,7 @@ import { TAuthTokenServiceFactory } from "@app/services/auth-token/auth-token-se import { TokenType } from "@app/services/auth-token/auth-token-types"; import { TOrgBotDALFactory } from "@app/services/org/org-bot-dal"; import { TOrgDALFactory } from "@app/services/org/org-dal"; -import { getDefaultOrgMembershipRoleDto } from "@app/services/org/org-role-fns"; +import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns"; import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal"; import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service"; import { getServerCfg } from "@app/services/super-admin/super-admin-service"; @@ -188,7 +188,7 @@ export const oidcConfigServiceFactory = ({ { tx } ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgMembershipDAL.create( { @@ -265,7 +265,7 @@ export const oidcConfigServiceFactory = ({ ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgMembershipDAL.create( { diff --git a/backend/src/ee/services/saml-config/saml-config-service.ts b/backend/src/ee/services/saml-config/saml-config-service.ts index 76de6aef5..69d3626f0 100644 --- a/backend/src/ee/services/saml-config/saml-config-service.ts +++ b/backend/src/ee/services/saml-config/saml-config-service.ts @@ -25,7 +25,7 @@ import { TokenType } from "@app/services/auth-token/auth-token-types"; import { TIdentityMetadataDALFactory } from "@app/services/identity/identity-metadata-dal"; import { TOrgBotDALFactory } from "@app/services/org/org-bot-dal"; import { TOrgDALFactory } from "@app/services/org/org-dal"; -import { getDefaultOrgMembershipRoleDto } from "@app/services/org/org-role-fns"; +import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns"; import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal"; import { SmtpTemplates, TSmtpService } from "@app/services/smtp/smtp-service"; import { getServerCfg } from "@app/services/super-admin/super-admin-service"; @@ -369,7 +369,7 @@ export const samlConfigServiceFactory = ({ { tx } ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgMembershipDAL.create( { @@ -475,7 +475,7 @@ export const samlConfigServiceFactory = ({ ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(organization.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(organization.defaultMembershipRole); await orgMembershipDAL.create( { diff --git a/backend/src/ee/services/scim/scim-service.ts b/backend/src/ee/services/scim/scim-service.ts index 4795d14d4..8b94d5b93 100644 --- a/backend/src/ee/services/scim/scim-service.ts +++ b/backend/src/ee/services/scim/scim-service.ts @@ -16,7 +16,7 @@ import { AuthTokenType } from "@app/services/auth/auth-type"; import { TGroupProjectDALFactory } from "@app/services/group-project/group-project-dal"; import { TOrgDALFactory } from "@app/services/org/org-dal"; import { deleteOrgMembershipFn } from "@app/services/org/org-fns"; -import { getDefaultOrgMembershipRoleDto } from "@app/services/org/org-role-fns"; +import { getDefaultOrgMembershipRole } from "@app/services/org/org-role-fns"; import { TOrgMembershipDALFactory } from "@app/services/org-membership/org-membership-dal"; import { TProjectDALFactory } from "@app/services/project/project-dal"; import { TProjectBotDALFactory } from "@app/services/project-bot/project-bot-dal"; @@ -319,7 +319,7 @@ export const scimServiceFactory = ({ ); if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(org.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(org.defaultMembershipRole); orgMembership = await orgMembershipDAL.create( { @@ -395,7 +395,7 @@ export const scimServiceFactory = ({ orgMembership = foundOrgMembership; if (!orgMembership) { - const { role, roleId } = await getDefaultOrgMembershipRoleDto(org.defaultMembershipRole); + const { role, roleId } = await getDefaultOrgMembershipRole(org.defaultMembershipRole); orgMembership = await orgMembershipDAL.create( { diff --git a/backend/src/services/org/org-role-fns.ts b/backend/src/services/org/org-role-fns.ts index 5e6739518..cccf255c6 100644 --- a/backend/src/services/org/org-role-fns.ts +++ b/backend/src/services/org/org-role-fns.ts @@ -38,7 +38,7 @@ export const getDefaultOrgMembershipRoleForUpdateOrg = async ({ }; // this is only for creating an org membership -export const getDefaultOrgMembershipRoleDto = async ( +export const getDefaultOrgMembershipRole = async ( defaultOrgMembershipRole: string // can either be ID or reserved slug ) => { const isCustomRole = !RESERVED_ORG_ROLE_SLUGS.includes(defaultOrgMembershipRole as OrgMembershipRole); diff --git a/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTable.tsx index 81268d5c9..577f72755 100644 --- a/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTable.tsx +++ b/frontend/src/views/Org/MembersPage/components/OrgRoleTabSection/OrgRoleTable.tsx @@ -81,7 +81,7 @@ export const OrgRoleTable = () => { if (isCustomRole && subscription && !subscription?.rbac) { handlePopUpOpen("upgradePlan", { description: - "You can set the default org role to a custom value if you upgrade your Infisical plan." + "You can set the default org role to a custom role if you upgrade your Infisical plan." }); return; }