Skip to content

Commit

Permalink
Azure AD -> Entra ID (#3513)
Browse files Browse the repository at this point in the history
  • Loading branch information
deepakprabhakara authored Jan 28, 2025
1 parent 497200b commit 29c2f06
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion e2e/support/data/dsync/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export * from './azure';
export * from './okta';

export enum DirectorySyncProviders {
'azure-scim-v2' = 'Azure SCIM v2.0',
'azure-scim-v2' = 'Entra ID SCIM v2.0',
'onelogin-scim-v2' = 'OneLogin SCIM v2.0',
'okta-scim-v2' = 'Okta SCIM v2.0',
'jumpcloud-scim-v2' = 'JumpCloud v2.0',
Expand Down
6 changes: 3 additions & 3 deletions e2e/ui/Enterprise SSO/setup_link.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ const setupLinkTestsData: {
testRunner: testOktaSaml,
},
{
testDescription: 'Admin Portal Enterprise SSO SetupLink using Azure SAML SSO',
testTitle: 'should be able to create setup link and sso connection Azure SAML SSO',
testDescription: 'Admin Portal Enterprise SSO SetupLink using Entra ID SAML SSO',
testTitle: 'should be able to create setup link and sso connection Entra ID SAML SSO',
testRunner: testAzureSaml,
},
];
Expand Down Expand Up @@ -293,7 +293,7 @@ async function testOktaSaml(setupLinkPage: Page) {

async function testAzureSaml(setupLinkPage: Page) {
// Create SSO connection using Okta SAML workflow
await setupLinkPage.getByRole('button', { name: 'Azure SAML SSO' }).click();
await setupLinkPage.getByRole('button', { name: 'Entra ID SAML SSO' }).click();

// check mdx generated content using remart-gfm plugin for step1
await expect(setupLinkPage.getByRole('heading', { name: 'Step 1: Create Application' })).toBeVisible();
Expand Down
2 changes: 1 addition & 1 deletion internal-ui/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface ApiError extends Error {

// eslint-disable-next-line @typescript-eslint/no-unused-vars
enum DirectorySyncProviders {
'azure-scim-v2' = 'Azure SCIM v2.0',
'azure-scim-v2' = 'Entra ID SCIM v2.0',
'onelogin-scim-v2' = 'OneLogin SCIM v2.0',
'okta-scim-v2' = 'Okta SCIM v2.0',
'jumpcloud-scim-v2' = 'JumpCloud v2.0',
Expand Down
2 changes: 1 addition & 1 deletion lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const identityProviders = [
stepCount: 3,
},
{
name: 'Azure SAML SSO',
name: 'Entra ID SAML SSO',
id: 'azure',
stepCount: 4,
},
Expand Down
2 changes: 1 addition & 1 deletion npm/src/directory-sync/scim/DirectoryConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ export class DirectoryConfig {

private transform(directory: Directory): Directory {
if (directory.scim.path) {
// Add the flag to ensure SCIM compliance when using Azure AD
// Add the flag to ensure SCIM compliance when using Entra ID
if (directory.type === 'azure-scim-v2') {
directory.scim.path = `${directory.scim.path}/?aadOptscim062020`;
}
Expand Down
2 changes: 1 addition & 1 deletion npm/src/directory-sync/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export type DirectorySyncEventType =
| 'group.user_removed';

export enum DirectorySyncProviders {
'azure-scim-v2' = 'Azure SCIM v2.0',
'azure-scim-v2' = 'Entra ID SCIM v2.0',
'onelogin-scim-v2' = 'OneLogin SCIM v2.0',
'okta-scim-v2' = 'Okta SCIM v2.0',
'jumpcloud-scim-v2' = 'JumpCloud v2.0',
Expand Down

0 comments on commit 29c2f06

Please sign in to comment.