chore: update semver and a few other dependencies, removes unused cod…

…e - VSCODE-436, VSCODE-437 (#556) Co-authored-by: Himanshu Singh <[email protected]>
mongodb-js · Jul 12, 2023 · de9019c · de9019c
1 parent 94871c8
commit de9019c
Show file tree

Hide file tree

Showing 20 changed files with 11,253 additions and 17,035 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -13,3 +13,4 @@ syntaxes
 CHANGELOG.md
 README.md
 constants.json
+.sbom
diff --git a/.snyk b/.snyk
@@ -0,0 +1,10 @@
+# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
+version: v1.25.0
+# ignores vulnerabilities until expiry date; change duration by modifying expiry date
+ignore:
+  SNYK-JS-SEMVER-3247795:
+    - '*':
+        reason: "Security patches released for semver 5.x (5.7.2) and 6.x (6.3.1) are not yet known to Snyk which is why we would like to ignore this vulnerability until the mentioned expiry."
+        expires: 2023-08-11T09:00:55.553Z
+        created: 2023-07-12T09:00:55.557Z
+patch: {}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -971,8 +971,7 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@iconify-icons/codicon": "^1.2.25",
     "@iconify/react": "^1.1.4",
-    "@leafygreen-ui/logo": "^6.3.0",
-    "@leafygreen-ui/toggle": "^7.0.5",
+    "@leafygreen-ui/logo": "^8.0.4",
     "@mongodb-js/mongodb-constants": "^0.6.5",
     "@mongosh/browser-runtime-electron": "^1.10.1",
     "@mongosh/i18n": "^1.10.1",

diff --git a/src/test/suite/utils/links.test.ts b/src/test/suite/utils/links.test.ts
@@ -22,8 +22,6 @@ const expectedLinks = {
     'https://www.mongodb.com/docs/mongodb-shell/reference/data-types/?utm_source=vscode&utm_medium=product#hi',
   systemVariableDocs:
     'https://www.mongodb.com/docs/manual/reference/aggregation-variables/?utm_source=vscode&utm_medium=product#mongodb-variable-variable.hi',
-  kerberosPrincipalDocs:
-    'https://docs.mongodb.com/manual/core/kerberos/?utm_source=vscode&utm_medium=product#principals',
   ldapDocs:
     'https://docs.mongodb.com/manual/core/security-ldap/?utm_source=vscode&utm_medium=product',
   authDatabaseDocs:

diff --git a/...ws/webview-app/components/connect-form/general-tab/authentication/authentication.test.tsx b/...ws/webview-app/components/connect-form/general-tab/authentication/authentication.test.tsx
@@ -14,7 +14,6 @@ describe('Authentication Component Test Suite', () => {
       <Authentication
         authStrategy={AUTH_STRATEGIES.NONE}
         isValid
-        kerberosCanonicalizeHostname
         onAuthStrategyChanged={(): void => {}}
       />
     );
@@ -28,7 +27,6 @@ describe('Authentication Component Test Suite', () => {
       <Authentication
         authStrategy={AUTH_STRATEGIES.MONGODB}
         isValid
-        kerberosCanonicalizeHostname
         onAuthStrategyChanged={(): void => {}}
       />
     );
@@ -40,7 +38,6 @@ describe('Authentication Component Test Suite', () => {
       <Authentication
         authStrategy={AUTH_STRATEGIES['SCRAM-SHA-256']}
         isValid
-        kerberosCanonicalizeHostname
         onAuthStrategyChanged={(): void => {}}
       />
     );

diff --git a/src/utils/links.ts b/src/utils/links.ts
@@ -37,8 +37,6 @@ const LINKS = {
   systemVariableDocs: (name: string) => {
     return `https://www.mongodb.com/docs/manual/reference/aggregation-variables/#mongodb-variable-variable.${name}`;
   },
-  kerberosPrincipalDocs:
-    'https://docs.mongodb.com/manual/core/kerberos/#principals',
   ldapDocs: 'https://docs.mongodb.com/manual/core/security-ldap/',
   authDatabaseDocs:
     'https://docs.mongodb.com/manual/core/security-users/#user-authentication-database',

diff --git a/src/views/webview-app/components/connect-form/general-tab/authentication/authentication.tsx b/src/views/webview-app/components/connect-form/general-tab/authentication/authentication.tsx
@@ -9,7 +9,6 @@ import AUTH_STRATEGIES, {
   AuthStrategies,
 } from '../../../../connection-model/constants/auth-strategies';
 import FormGroup from '../../../form/form-group';
-import Kerberos from './kerberos';
 import LDAP from './ldap';
 import MongoDBAuth from './mongodb-authentication';
 import ScramSha256 from './scram-sha-256';
@@ -20,10 +19,6 @@ import RadioBoxGroup from '../../../form/radio-box-group/radio-box-group';
 type StateProps = {
   authStrategy: AUTH_STRATEGIES;
   isValid: boolean;
-  kerberosCanonicalizeHostname: boolean;
-  kerberosPassword?: string;
-  kerberosPrincipal?: string;
-  kerberosServiceName?: string;
   ldapPassword?: string;
   ldapUsername?: string;
   mongodbDatabaseName?: string;
@@ -56,24 +51,6 @@ export class Authentication extends React.Component<
   renderAuthStrategy(): React.ReactNode {
     const { authStrategy, isValid } = this.props;
 
-    if (authStrategy === AUTH_STRATEGIES.KERBEROS) {
-      const {
-        kerberosCanonicalizeHostname,
-        kerberosPassword,
-        kerberosPrincipal,
-        kerberosServiceName,
-      } = this.props;
-
-      return (
-        <Kerberos
-          isValid={isValid}
-          kerberosCanonicalizeHostname={kerberosCanonicalizeHostname}
-          kerberosPassword={kerberosPassword}
-          kerberosPrincipal={kerberosPrincipal}
-          kerberosServiceName={kerberosServiceName}
-        />
-      );
-    }
     if (authStrategy === AUTH_STRATEGIES.LDAP) {
       const { ldapPassword, ldapUsername } = this.props;
 
@@ -142,11 +119,6 @@ const mapStateToProps = (state: AppState): StateProps => {
   return {
     authStrategy: state.currentConnection.authStrategy,
     isValid: state.isValid,
-    kerberosCanonicalizeHostname:
-      state.currentConnection.kerberosCanonicalizeHostname,
-    kerberosPassword: state.currentConnection.kerberosPassword,
-    kerberosPrincipal: state.currentConnection.kerberosPrincipal,
-    kerberosServiceName: state.currentConnection.kerberosServiceName,
     ldapPassword: state.currentConnection.ldapPassword,
     ldapUsername: state.currentConnection.ldapUsername,
     mongodbDatabaseName: state.currentConnection.mongodbDatabaseName,

diff --git a/src/views/webview-app/components/connect-form/general-tab/authentication/kerberos.tsx b/src/views/webview-app/components/connect-form/general-tab/authentication/kerberos.tsx
diff --git a/src/views/webview-app/components/connect-form/general-tab/authentication/ldap.tsx b/src/views/webview-app/components/connect-form/general-tab/authentication/ldap.tsx
@@ -42,11 +42,6 @@ class LDAP extends React.Component<props> {
     this.props.onLDAPUsernameChanged(evt.target.value.trim());
   };
 
-  /**
-   * Render the kerberos component.
-   *
-   * @returns {React.Component} The component.
-   */
   render(): React.ReactNode {
     const { isValid, ldapPassword, ldapUsername } = this.props;
 

diff --git a/src/views/webview-app/components/connect-form/general-tab/authentication/x509.tsx b/src/views/webview-app/components/connect-form/general-tab/authentication/x509.tsx
@@ -15,24 +15,11 @@ type props = {
   x509Username?: string;
 } & DispatchProps;
 
-/**
- * The kerberos auth role component.
- */
 class X509 extends React.Component<props> {
-  /**
-   * Handle the username change.
-   *
-   * @param {Event} evt - The event.
-   */
   onUsernameChanged = (evt): void => {
     this.props.onX509UsernameChanged(evt.target.value.trim());
   };
 
-  /**
-   * Render the kerberos component.
-   *
-   * @returns {React.Component} The component.
-   */
   render(): React.ReactNode {
     const { x509Username } = this.props;
 

diff --git a/src/views/webview-app/components/mongodb-logo/mongodb-logo.less b/src/views/webview-app/components/mongodb-logo/mongodb-logo.less
@@ -1,8 +1,4 @@
-.mdb-logo-svg {
+.mdb-logo-container {
   margin-top: 19px;
   margin-bottom: 4px;
-
-  path {
-    fill: var(--mongodb-green);
-  }
 }
diff --git a/src/views/webview-app/components/mongodb-logo/mongodb-logo.tsx b/src/views/webview-app/components/mongodb-logo/mongodb-logo.tsx
@@ -4,10 +4,12 @@ import { MongoDBLogo as LeafyGreenMongoDBLogo } from '@leafygreen-ui/logo';
 
 import styles from './mongodb-logo.less';
 
-class MongoDBLogo extends React.PureComponent {
-  render(): React.ReactNode {
-    return <LeafyGreenMongoDBLogo className={styles['mdb-logo-svg']} />;
-  }
+function MongoDBLogo() {
+  return (
+    <div className={styles['mdb-logo-container']}>
+      <LeafyGreenMongoDBLogo color="green-base" />
+    </div>
+  );
 }
 
 export default MongoDBLogo;
diff --git a/src/views/webview-app/connection-model/constants/auth-mechanism-to-auth-strategy.ts b/src/views/webview-app/connection-model/constants/auth-mechanism-to-auth-strategy.ts
@@ -5,8 +5,6 @@ export default {
   'SCRAM-SHA-256': 'SCRAM-SHA-256',
   'MONGODB-CR': 'MONGODB',
   'MONGODB-X509': 'X509',
-  GSSAPI: 'KERBEROS',
-  SSPI: 'KERBEROS',
   PLAIN: 'LDAP',
   LDAP: 'LDAP',
 };
diff --git a/src/views/webview-app/connection-model/constants/auth-strategies.ts b/src/views/webview-app/connection-model/constants/auth-strategies.ts
@@ -14,11 +14,6 @@ export enum AUTH_STRATEGY_VALUES {
    * @see http://bit.ly/mongodb-node-driver-x509
    */
   X509 = 'X509',
-  /**
-   * @enterprise
-   * @see http://bit.ly/mongodb-node-driver-kerberos
-   */
-  KERBEROS = 'KERBEROS',
   /**
    * @enterprise
    * @see http://bit.ly/mongodb-node-driver-ldap
@@ -45,11 +40,6 @@ export const AuthStrategies: AuthStrategy[] = [
     id: AUTH_STRATEGY_VALUES['SCRAM-SHA-256'],
     title: 'SCRAM-SHA-256',
   },
-  // Currently disabled.
-  // {
-  //   id: AUTH_STRATEGY_VALUES.KERBEROS,
-  //   title: 'Kerberos'
-  // },
   {
     id: AUTH_STRATEGY_VALUES.LDAP,
     title: 'LDAP',