From 7416fd03c44b5a4d9e9ce6eb5bd4418d754adac0 Mon Sep 17 00:00:00 2001
From: Florian Dreschner <florian.dreschner@beekeeper.io>
Date: Sun, 25 Nov 2018 21:42:31 +0100
Subject: [PATCH] Add encrypt and decrypt to Pubnub types

---
 types/pubnub/index.d.ts      | 22 +++++++++++++++++++++-
 types/pubnub/pubnub-tests.ts | 12 ++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/types/pubnub/index.d.ts b/types/pubnub/index.d.ts
index 8337acfbe4..1fc38edabf 100644
--- a/types/pubnub/index.d.ts
+++ b/types/pubnub/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for pubnub 4.0
 // Project: https://github.com/pubnub/javascript
-// Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>, vitosamson <https://github.com/vitosamson>
+// Definitions by: bitbankinc <https://github.com/bitbankinc>, rollymaduk <https://github.com/rollymaduk>, vitosamson <https://github.com/vitosamson>, FlorianDr <https://github.com/FlorianDr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // @see https://www.pubnub.com/docs/web-javascript/api-reference-configuration
 
@@ -88,6 +88,18 @@ declare class Pubnub {
   setState(
     params: Pubnub.SetStateParameters
   ): Promise<Pubnub.SetStateResponse>;
+
+  encrypt(
+    data: string,
+    customCipherKey?: string,
+    options?: Pubnub.CryptoParameters,
+  ): object | string | null;
+
+  decrypt(
+    data: object,
+    customCipherKey?: string,
+    options?: Pubnub.CryptoParameters
+  ): object | string | null;
 }
 
 declare namespace Pubnub {
@@ -296,6 +308,14 @@ declare namespace Pubnub {
     };
   }
 
+  // encrypt
+  interface CryptoParameters {
+    encryptKey?: boolean;
+    keyEncoding?: string;
+    keyLength?: number;
+    mode?: string;
+  }
+
   interface Categories {
     PNNetworkUpCategory: string;
     PNNetworkDownCategory: string;
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
index 1d8b2bb1ca..50660bd942 100644
--- a/types/pubnub/pubnub-tests.ts
+++ b/types/pubnub/pubnub-tests.ts
@@ -86,3 +86,15 @@ pubnub.setState({ channels: [] }, (status, res) => {
 pubnub.setState({ channels: [] }).then(res => {
   console.log(res.state);
 });
+
+const cryptoOptions = {
+  encryptKey: true,
+  keyEncoding: 'utf8',
+  keyLength: 256,
+  mode: 'cbc'
+};
+const mySecret = {
+  message: 'Hi!',
+};
+pubnub.decrypt(mySecret, undefined, cryptoOptions);
+pubnub.encrypt('egrah5rwgrehwqh5eh3hwfwef', undefined, cryptoOptions);