Skip to content

Commit de9019c

Browse files
chore: update semver and a few other dependencies, removes unused code - VSCODE-436, VSCODE-437 (#556)
Co-authored-by: Himanshu Singh <[email protected]>
1 parent 94871c8 commit de9019c

File tree

20 files changed

+11253
-17035
lines changed

20 files changed

+11253
-17035
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ syntaxes
1313
CHANGELOG.md
1414
README.md
1515
constants.json
16+
.sbom

.snyk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
2+
version: v1.25.0
3+
# ignores vulnerabilities until expiry date; change duration by modifying expiry date
4+
ignore:
5+
SNYK-JS-SEMVER-3247795:
6+
- '*':
7+
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."
8+
expires: 2023-08-11T09:00:55.553Z
9+
created: 2023-07-12T09:00:55.557Z
10+
patch: {}

package-lock.json

Lines changed: 11234 additions & 16711 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,8 +971,7 @@
971971
"@fortawesome/react-fontawesome": "^0.2.0",
972972
"@iconify-icons/codicon": "^1.2.25",
973973
"@iconify/react": "^1.1.4",
974-
"@leafygreen-ui/logo": "^6.3.0",
975-
"@leafygreen-ui/toggle": "^7.0.5",
974+
"@leafygreen-ui/logo": "^8.0.4",
976975
"@mongodb-js/mongodb-constants": "^0.6.5",
977976
"@mongosh/browser-runtime-electron": "^1.10.1",
978977
"@mongosh/i18n": "^1.10.1",

src/test/suite/utils/links.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ const expectedLinks = {
2222
'https://www.mongodb.com/docs/mongodb-shell/reference/data-types/?utm_source=vscode&utm_medium=product#hi',
2323
systemVariableDocs:
2424
'https://www.mongodb.com/docs/manual/reference/aggregation-variables/?utm_source=vscode&utm_medium=product#mongodb-variable-variable.hi',
25-
kerberosPrincipalDocs:
26-
'https://docs.mongodb.com/manual/core/kerberos/?utm_source=vscode&utm_medium=product#principals',
2725
ldapDocs:
2826
'https://docs.mongodb.com/manual/core/security-ldap/?utm_source=vscode&utm_medium=product',
2927
authDatabaseDocs:

src/test/suite/views/webview-app/components/connect-form/general-tab/authentication/authentication.test.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ describe('Authentication Component Test Suite', () => {
1414
<Authentication
1515
authStrategy={AUTH_STRATEGIES.NONE}
1616
isValid
17-
kerberosCanonicalizeHostname
1817
onAuthStrategyChanged={(): void => {}}
1918
/>
2019
);
@@ -28,7 +27,6 @@ describe('Authentication Component Test Suite', () => {
2827
<Authentication
2928
authStrategy={AUTH_STRATEGIES.MONGODB}
3029
isValid
31-
kerberosCanonicalizeHostname
3230
onAuthStrategyChanged={(): void => {}}
3331
/>
3432
);
@@ -40,7 +38,6 @@ describe('Authentication Component Test Suite', () => {
4038
<Authentication
4139
authStrategy={AUTH_STRATEGIES['SCRAM-SHA-256']}
4240
isValid
43-
kerberosCanonicalizeHostname
4441
onAuthStrategyChanged={(): void => {}}
4542
/>
4643
);

src/utils/links.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ const LINKS = {
3737
systemVariableDocs: (name: string) => {
3838
return `https://www.mongodb.com/docs/manual/reference/aggregation-variables/#mongodb-variable-variable.${name}`;
3939
},
40-
kerberosPrincipalDocs:
41-
'https://docs.mongodb.com/manual/core/kerberos/#principals',
4240
ldapDocs: 'https://docs.mongodb.com/manual/core/security-ldap/',
4341
authDatabaseDocs:
4442
'https://docs.mongodb.com/manual/core/security-users/#user-authentication-database',

src/views/webview-app/components/connect-form/general-tab/authentication/authentication.tsx

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import AUTH_STRATEGIES, {
99
AuthStrategies,
1010
} from '../../../../connection-model/constants/auth-strategies';
1111
import FormGroup from '../../../form/form-group';
12-
import Kerberos from './kerberos';
1312
import LDAP from './ldap';
1413
import MongoDBAuth from './mongodb-authentication';
1514
import ScramSha256 from './scram-sha-256';
@@ -20,10 +19,6 @@ import RadioBoxGroup from '../../../form/radio-box-group/radio-box-group';
2019
type StateProps = {
2120
authStrategy: AUTH_STRATEGIES;
2221
isValid: boolean;
23-
kerberosCanonicalizeHostname: boolean;
24-
kerberosPassword?: string;
25-
kerberosPrincipal?: string;
26-
kerberosServiceName?: string;
2722
ldapPassword?: string;
2823
ldapUsername?: string;
2924
mongodbDatabaseName?: string;
@@ -56,24 +51,6 @@ export class Authentication extends React.Component<
5651
renderAuthStrategy(): React.ReactNode {
5752
const { authStrategy, isValid } = this.props;
5853

59-
if (authStrategy === AUTH_STRATEGIES.KERBEROS) {
60-
const {
61-
kerberosCanonicalizeHostname,
62-
kerberosPassword,
63-
kerberosPrincipal,
64-
kerberosServiceName,
65-
} = this.props;
66-
67-
return (
68-
<Kerberos
69-
isValid={isValid}
70-
kerberosCanonicalizeHostname={kerberosCanonicalizeHostname}
71-
kerberosPassword={kerberosPassword}
72-
kerberosPrincipal={kerberosPrincipal}
73-
kerberosServiceName={kerberosServiceName}
74-
/>
75-
);
76-
}
7754
if (authStrategy === AUTH_STRATEGIES.LDAP) {
7855
const { ldapPassword, ldapUsername } = this.props;
7956

@@ -142,11 +119,6 @@ const mapStateToProps = (state: AppState): StateProps => {
142119
return {
143120
authStrategy: state.currentConnection.authStrategy,
144121
isValid: state.isValid,
145-
kerberosCanonicalizeHostname:
146-
state.currentConnection.kerberosCanonicalizeHostname,
147-
kerberosPassword: state.currentConnection.kerberosPassword,
148-
kerberosPrincipal: state.currentConnection.kerberosPrincipal,
149-
kerberosServiceName: state.currentConnection.kerberosServiceName,
150122
ldapPassword: state.currentConnection.ldapPassword,
151123
ldapUsername: state.currentConnection.ldapUsername,
152124
mongodbDatabaseName: state.currentConnection.mongodbDatabaseName,

src/views/webview-app/components/connect-form/general-tab/authentication/kerberos.tsx

Lines changed: 0 additions & 176 deletions
This file was deleted.

src/views/webview-app/components/connect-form/general-tab/authentication/ldap.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ class LDAP extends React.Component<props> {
4242
this.props.onLDAPUsernameChanged(evt.target.value.trim());
4343
};
4444

45-
/**
46-
* Render the kerberos component.
47-
*
48-
* @returns {React.Component} The component.
49-
*/
5045
render(): React.ReactNode {
5146
const { isValid, ldapPassword, ldapUsername } = this.props;
5247

0 commit comments

Comments
 (0)