Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .changeset/fair-dryers-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/rest-typings': major
'@rocket.chat/meteor': major
---

Removes ecdh functionality and related settings
1 change: 0 additions & 1 deletion apps/meteor/.meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.

rocketchat:ddp
rocketchat:mongo-config
rocketchat:livechat
rocketchat:streamer
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/.meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ reactive-dict@1.3.2
reactive-var@1.0.13
reload@1.3.2
retry@1.1.1
rocketchat:ddp@0.0.1
rocketchat:livechat@0.0.1
rocketchat:mongo-config@0.0.1
rocketchat:streamer@1.1.0
Expand Down
16 changes: 0 additions & 16 deletions apps/meteor/app/api/server/default/info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,3 @@ API.default.addRoute(
},
},
);

API.default.addRoute(
'ecdh_proxy/initEncryptedSession',
{ authRequired: false },
{
post() {
return {
statusCode: 200,
body: {
success: false,
error: 'Not Acceptable',
},
};
},
},
);
69 changes: 0 additions & 69 deletions apps/meteor/app/ecdh/Session.ts

This file was deleted.

26 changes: 0 additions & 26 deletions apps/meteor/app/ecdh/client/ClientSession.ts

This file was deleted.

9 changes: 1 addition & 8 deletions apps/meteor/app/ui-master/server/scripts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ window.addEventListener('load', function() {

${process.env.DISABLE_ANIMATION ? 'window.DISABLE_ANIMATION = true;\n' : ''}

${settings.get('ECDH_Enabled') ? 'window.ECDH_Enabled = true;\n' : ''}
// Custom_Script_Logged_Out
window.addEventListener('Custom_Script_Logged_Out', function() {
${settings.get('Custom_Script_Logged_Out')}
Expand Down Expand Up @@ -52,13 +51,7 @@ window.addEventListener('load', function() {
}`;

settings.watchMultiple(
[
'Custom_Script_Logged_Out',
'Custom_Script_Logged_In',
'Custom_Script_On_Logout',
'Accounts_ForgetUserSessionOnWindowClose',
'ECDH_Enabled',
],
['Custom_Script_Logged_Out', 'Custom_Script_Logged_In', 'Custom_Script_On_Logout', 'Accounts_ForgetUserSessionOnWindowClose'],
() => {
const content = getContent();
addScript('scripts', content);
Expand Down
78 changes: 0 additions & 78 deletions apps/meteor/client/ecdh.ts

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/client/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import './meteor/startup';
import './serviceWorker';

import('./meteor/login')
.then(() => import('./ecdh'))
.then(() => import('./importPackages'))
.then(() => import('./startup'))
.then(() =>
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/definition/externals/global.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ declare global {
lastMessageWindow?: Record<string, unknown>;
lastMessageWindowHistory?: Record<string, unknown>;
favico?: any;
ECDH_Enabled?: boolean;
__meteor_runtime_config__: {
ROOT_URL_PATH_PREFIX: string;
ROOT_URL: string;
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/definition/externals/meteor/meteor.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ declare module 'meteor/meteor' {
send: (data: string) => void;
};
_launchConnectionAsync: () => void;
allowConnection: () => void;
on: (key: 'message', callback: (data: string) => void) => void;
};

Expand Down
27 changes: 0 additions & 27 deletions apps/meteor/ee/app/ecdh/server/ServerSession.ts

This file was deleted.

7 changes: 0 additions & 7 deletions apps/meteor/ee/server/services/ecdh-proxy/ECDHProxy.ts

This file was deleted.

12 changes: 0 additions & 12 deletions apps/meteor/ee/server/services/ecdh-proxy/README.md

This file was deleted.

Loading
Loading