move the PN server notify() to not use dot_net_api

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

js/modules/loki_push_notification_server_api.js

@@ -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;

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');

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?://)?');

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,
+  });
+}

ts/pushnotification/index.ts

@@ -0,0 +1,3 @@
+import * as PnServer from './PnServer';
+
+export { PnServer };

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) {
+        const result = await PnServer.notify(wrappedEnvelope, sentMessage.device);
-          window.LokiPushNotificationServer = new window.LokiPushNotificationServerApi();
+        debugger;
-        }
-
-        window.LokiPushNotificationServer.notify(wrappedEnvelope, sentMessage.device);
       }
     }
 

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;
   }
 }