From 744be229b7fc800a2030e1e4d8a07e420975706d Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 31 May 2021 12:05:01 +1000 Subject: [PATCH] move the PN server notify() to not use dot_net_api --- FSV1 TO CLEAN.txt | 7 ++--- .../loki_push_notification_server_api.js | 27 ------------------- preload.js | 1 - ts/opengroup/utils/OpenGroupUtils.ts | 3 --- ts/pushnotification/PnServer.ts | 20 ++++++++++++++ ts/pushnotification/index.ts | 3 +++ ts/session/sending/MessageSentHandler.ts | 8 +++--- ts/window.d.ts | 2 -- 8 files changed, 28 insertions(+), 43 deletions(-) delete mode 100644 js/modules/loki_push_notification_server_api.js create mode 100644 ts/pushnotification/PnServer.ts create mode 100644 ts/pushnotification/index.ts diff --git a/FSV1 TO CLEAN.txt b/FSV1 TO CLEAN.txt index ec744947f..38da7a0d4 100644 --- a/FSV1 TO CLEAN.txt +++ b/FSV1 TO CLEAN.txt @@ -11,14 +11,10 @@ lokiPublicChatAPI dot_net_api -loki_public_chat_api - -OpenGroupUtils - -OpenGroup +LokiPushNotificationServerApi @@ -32,6 +28,7 @@ getAllOpenGroupV1Conversations => migration to remove opengroupsv1 matching url DELETED +loki_public_chat_api tokenlessFileServerAdnAPI channelId publicChat with only a cahnnel of 1 diff --git a/js/modules/loki_push_notification_server_api.js b/js/modules/loki_push_notification_server_api.js deleted file mode 100644 index 092a142f1..000000000 --- a/js/modules/loki_push_notification_server_api.js +++ /dev/null @@ -1,27 +0,0 @@ -/* global dcodeIO */ - -const LokiAppDotNetAPI = require('./loki_app_dot_net_api'); - -class LokiPushNotificationServerApi { - constructor() { - this.ourKey = '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049'; - this.serverUrl = 'https://live.apns.getsession.org'; - this._server = new LokiAppDotNetAPI(this.ourKey, this.serverUrl); - - // make sure pubKey & pubKeyHex are set in _server - this.pubKey = this._server.getPubKeyForUrl(); - } - - async notify(plainTextBuffer, sentTo) { - const options = { - method: 'post', - objBody: { - data: dcodeIO.ByteBuffer.wrap(plainTextBuffer).toString('base64'), - send_to: sentTo, - }, - }; - return this._server.serverRequest('notify', options); - } -} - -module.exports = LokiPushNotificationServerApi; diff --git a/preload.js b/preload.js index f89978937..713733355 100644 --- a/preload.js +++ b/preload.js @@ -313,7 +313,6 @@ window.Signal = Signal.setup({ logger: window.log, }); -window.LokiPushNotificationServerApi = require('./js/modules/loki_push_notification_server_api'); window.SwarmPolling = require('./ts/session/snode_api/swarmPolling').SwarmPolling.getInstance(); const WorkerInterface = require('./js/modules/util_worker_interface'); diff --git a/ts/opengroup/utils/OpenGroupUtils.ts b/ts/opengroup/utils/OpenGroupUtils.ts index 5a99020a4..a71cf8256 100644 --- a/ts/opengroup/utils/OpenGroupUtils.ts +++ b/ts/opengroup/utils/OpenGroupUtils.ts @@ -1,7 +1,4 @@ -import { default as insecureNodeFetch } from 'node-fetch'; import { OpenGroupV2Room } from '../../data/opengroups'; -import { sendViaOnion } from '../../session/onions/onionSend'; -import { toHex } from '../../session/utils/String'; import { OpenGroupRequestCommonType } from '../opengroupV2/ApiUtil'; const protocolRegex = new RegExp('(https?://)?'); diff --git a/ts/pushnotification/PnServer.ts b/ts/pushnotification/PnServer.ts new file mode 100644 index 000000000..c7357f962 --- /dev/null +++ b/ts/pushnotification/PnServer.ts @@ -0,0 +1,20 @@ +import { serverRequest } from '../session/onions/onionSend'; +import { fromArrayBufferToBase64 } from '../session/utils/String'; + +const pnServerPubkeyHex = '642a6585919742e5a2d4dc51244964fbcd8bcab2b75612407de58b810740d049'; +const pnServerUrl = 'https://live.apns.getsession.org'; + +export async function notify(plainTextBuffer: ArrayBuffer, sentTo: string) { + const options = { + method: 'post', + objBody: { + data: fromArrayBufferToBase64(plainTextBuffer), + send_to: sentTo, + }, + }; + const endpoint = 'notify'; + return serverRequest(`${pnServerUrl}/${endpoint}`, { + ...options, + srvPubKey: pnServerPubkeyHex, + }); +} diff --git a/ts/pushnotification/index.ts b/ts/pushnotification/index.ts new file mode 100644 index 000000000..3c33137e6 --- /dev/null +++ b/ts/pushnotification/index.ts @@ -0,0 +1,3 @@ +import * as PnServer from './PnServer'; + +export { PnServer }; diff --git a/ts/session/sending/MessageSentHandler.ts b/ts/session/sending/MessageSentHandler.ts index f5ed8c538..ebe40fee2 100644 --- a/ts/session/sending/MessageSentHandler.ts +++ b/ts/session/sending/MessageSentHandler.ts @@ -1,6 +1,7 @@ import _ from 'lodash'; import { getMessageById } from '../../data/data'; import { SignalService } from '../../protobuf'; +import { PnServer } from '../../pushnotification'; import { MessageController } from '../messages'; import { OpenGroupVisibleMessage } from '../messages/outgoing/visibleMessage/OpenGroupVisibleMessage'; import { EncryptionType, RawMessage } from '../types'; @@ -92,11 +93,8 @@ export class MessageSentHandler { if (!wrappedEnvelope) { window?.log?.warn('Should send PN notify but no wrapped envelope set.'); } else { - if (!window.LokiPushNotificationServer) { - window.LokiPushNotificationServer = new window.LokiPushNotificationServerApi(); - } - - window.LokiPushNotificationServer.notify(wrappedEnvelope, sentMessage.device); + const result = await PnServer.notify(wrappedEnvelope, sentMessage.device); + debugger; } } diff --git a/ts/window.d.ts b/ts/window.d.ts index 13c3b31d0..dbf2c4947 100644 --- a/ts/window.d.ts +++ b/ts/window.d.ts @@ -2,7 +2,6 @@ import { LocalizerType } from '../types/Util'; import { LibsignalProtocol } from '../../libtextsecure/libsignal-protocol'; import { SignalInterface } from '../../js/modules/signal'; import { Libloki } from '../libloki'; -import { LokiPublicChatFactoryInterface } from '../js/modules/loki_public_chat_api'; import { LibTextsecure } from '../libtextsecure'; import { ConfirmationDialogParams } from '../background'; @@ -91,6 +90,5 @@ declare global { lightTheme: DefaultTheme; darkTheme: DefaultTheme; LokiPushNotificationServer: any; - LokiPushNotificationServerApi: any; } }