Skip to content

chore(connection-form): use mongodb dep only with types VSCODE-488 #5197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2023
Merged

chore(connection-form): use mongodb dep only with types VSCODE-488 #5197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions packages/connection-form/src/components/advanced-options-tabs/advanced-tab/advanced-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
} from '@mongodb-js/compass-components';
import type ConnectionStringUrl from 'mongodb-connection-string-url';
import type { MongoClientOptions, ReadPreferenceMode } from 'mongodb';
import { ReadPreference as MongoReadPreference } from 'mongodb';

import type { UpdateConnectionFormField } from '../../../hooks/use-connect-form';

Expand All @@ -29,23 +28,23 @@ interface ReadPreference {
export const readPreferences: ReadPreference[] = [
{
title: 'Primary',
id: MongoReadPreference.PRIMARY,
id: 'primary',
},
{
title: 'Primary Preferred',
id: MongoReadPreference.PRIMARY_PREFERRED,
id: 'primaryPreferred',
},
{
title: 'Secondary',
id: MongoReadPreference.SECONDARY,
id: 'secondary',
},
{
title: 'Secondary Preferred',
id: MongoReadPreference.SECONDARY_PREFERRED,
id: 'secondaryPreferred',
},
{
title: 'Nearest',
id: MongoReadPreference.NEAREST,
id: 'nearest',
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💙

},
];

Expand Down
8 changes: 4 additions & 4 deletions ...n-form/src/components/advanced-options-tabs/authentication-tab/authentication-default.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
spacing,
} from '@mongodb-js/compass-components';
import type ConnectionStringUrl from 'mongodb-connection-string-url';
import { AuthMechanism } from 'mongodb';
import type { AuthMechanism } from 'mongodb';

import type { UpdateConnectionFormField } from '../../../hooks/use-connect-form';
import type { ConnectionFormError } from '../../../utils/validation';
Expand All @@ -30,15 +30,15 @@ const defaultAuthMechanismOptions: {
}[] = [
{
title: 'Default',
value: AuthMechanism.MONGODB_DEFAULT,
value: 'DEFAULT',
},
{
title: 'SCRAM-SHA-1',
value: AuthMechanism.MONGODB_SCRAM_SHA1,
value: 'SCRAM-SHA-1',
},
{
title: 'SCRAM-SHA-256',
value: AuthMechanism.MONGODB_SCRAM_SHA256,
value: 'SCRAM-SHA-256',
},
];

Expand Down
19 changes: 11 additions & 8 deletions ...-form/src/components/advanced-options-tabs/authentication-tab/authentication-tab.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { render, screen, fireEvent } from '@testing-library/react';
import { expect } from 'chai';
import sinon from 'sinon';
import ConnectionStringUrl from 'mongodb-connection-string-url';
import { AuthMechanism } from 'mongodb';
import type { AuthMechanism } from 'mongodb';

import AuthenticationTab from './authentication-tab';
import type { ConnectionFormError } from '../../../utils/validation';
Expand Down Expand Up @@ -40,30 +40,33 @@ function renderComponent({
);
}

const authMechanisms = [
const authMechanisms: {
title: string;
id: AuthMechanism;
}[] = [
{
title: 'Username/Password',
id: AuthMechanism.MONGODB_DEFAULT,
id: 'DEFAULT',
},
{
title: 'OIDC (Preview)',
id: AuthMechanism.MONGODB_OIDC,
id: 'MONGODB-OIDC',
},
{
title: 'X.509',
id: AuthMechanism.MONGODB_X509,
id: 'MONGODB-X509',
},
{
title: 'Kerberos',
id: AuthMechanism.MONGODB_GSSAPI,
id: 'GSSAPI',
},
{
title: 'LDAP',
id: AuthMechanism.MONGODB_PLAIN,
id: 'PLAIN',
},
{
title: 'AWS IAM',
id: AuthMechanism.MONGODB_AWS,
id: 'MONGODB-AWS',
},
];

Expand Down
30 changes: 11 additions & 19 deletions ...ction-form/src/components/advanced-options-tabs/authentication-tab/authentication-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
css,
} from '@mongodb-js/compass-components';
import type ConnectionStringUrl from 'mongodb-connection-string-url';
import { AuthMechanism } from 'mongodb';
import type { AuthMechanism } from 'mongodb';
import type { ConnectionOptions } from 'mongodb-data-service';

import type { UpdateConnectionFormField } from '../../../hooks/use-connect-form';
Expand All @@ -22,16 +22,8 @@ import AuthenticationAWS from './authentication-aws';
import AuthenticationOidc from './authentication-oidc';
import { useConnectionFormPreference } from '../../../hooks/use-connect-form-preferences';

type AUTH_TABS =
| 'DEFAULT' // Username/Password (SCRAM-SHA-1 + SCRAM-SHA-256 + DEFAULT)
| 'MONGODB-X509'
| 'GSSAPI' // Kerberos
| 'PLAIN' // LDAP
| 'MONGODB-OIDC'
| 'MONGODB-AWS'; // AWS IAM

interface TabOption {
id: AUTH_TABS;
id: AuthMechanism;
title: string;
component: React.FC<{
errors: ConnectionFormError[];
Expand All @@ -44,32 +36,32 @@ interface TabOption {
const options: TabOption[] = [
{
title: 'Username/Password',
id: AuthMechanism.MONGODB_DEFAULT,
id: 'DEFAULT',
component: AuthenticationDefault,
},
{
title: 'OIDC (Preview)',
id: AuthMechanism.MONGODB_OIDC,
id: 'MONGODB-OIDC',
component: AuthenticationOidc,
},
{
title: 'X.509',
id: AuthMechanism.MONGODB_X509,
id: 'MONGODB-X509',
component: AuthenticationX509,
},
{
title: 'Kerberos',
id: AuthMechanism.MONGODB_GSSAPI,
id: 'GSSAPI',
component: AuthenticationGSSAPI,
},
{
title: 'LDAP',
id: AuthMechanism.MONGODB_PLAIN,
id: 'PLAIN',
component: AuthenticationPlain,
},
{
title: 'AWS IAM',
id: AuthMechanism.MONGODB_AWS,
id: 'MONGODB-AWS',
component: AuthenticationAWS,
},
];
Expand All @@ -84,7 +76,7 @@ const contentStyles = css({

function getSelectedAuthTabForConnectionString(
connectionStringUrl: ConnectionStringUrl
): AUTH_TABS {
): AuthMechanism {
const authMechanismString = (
connectionStringUrl.searchParams.get('authMechanism') || ''
).toUpperCase();
Expand All @@ -94,7 +86,7 @@ function getSelectedAuthTabForConnectionString(
return matchingTab.id;
}

return AuthMechanism.MONGODB_DEFAULT;
return 'DEFAULT';
}

function AuthenticationTab({
Expand Down Expand Up @@ -138,7 +130,7 @@ function AuthenticationTab({
return updateConnectionFormField({
type: 'update-auth-mechanism',
authMechanism:
event.target.value === AuthMechanism.MONGODB_DEFAULT
event.target.value === 'DEFAULT'
? null
: (event.target.value as AuthMechanism),
});
Expand Down
3 changes: 1 addition & 2 deletions packages/connection-form/src/utils/authentication-handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type { AuthMechanism } from 'mongodb';
import type ConnectionStringUrl from 'mongodb-connection-string-url';
import type { ConnectionOptions } from 'mongodb-data-service';
import type { MongoClientOptions } from 'mongodb';
import type { AuthMechanism, MongoClientOptions } from 'mongodb';

import type { ConnectionFormError } from './validation';
import {
Expand Down