@textback/notification-widget 2.0.0 → 2.0.1-102913

package/src/sdk/channels/vk.js

@@ -1,184 +1,195 @@
-import UUID from 'uuid-js';
-
-import loadScript from '../utils/loadScript.js';
-import apiErrorHandler from '../utils/apiErrorHandler.js';
-
-import Channel from './channel.js';
-import VKModal from './vk-modal/vk-modal.js';
-import constants from "../utils/constants";
-
-const VK_API_VERSION = '5.73';
-const LOGIN_TIMEOUT = 4096;
-
-function loadVkLib(){
-    return new Promise((resolve, reject) => {
-        if (window.VK && window.VK.Auth) {
-            resolve('vk cache')
-        }
-        else {
-            loadScript('//vk.com/js/api/openapi.js')
-                .then(function () {
-                    resolve('vk load')
-                }, function (err) {
-                    reject(err)
-                })
-        }
-    });
-}
-
-function initVK(apiId) {
-    return new Promise((resolve, reject) => {
-        if (apiId) {
-            if (!window.VK._apiId) {
-                window.VK.init({apiId});
-            }
-            window.VK.Auth.getLoginStatus(resolve)
-        } else {
-            reject('noVKApiId')
-        }
-    })
-}
-
-function handleVKLoadingError(error) {
-    console.error('Failed to load VK openapi.js. VK channel will be unavailable');
-    return null;
-}
-
-// isVkAppUsed :: Object -> Boolean
-const isVkAppUsed = config => {
-    return config.useVkApp
-        ? config.useVkApp
-        : false;
-};
-
-export default class VKChannel extends Channel {
-    constructor(channelData = {}, deeplink, widget) {
-        super(channelData, deeplink, widget);
-
-        this.vkApiId = this.widget.config.vkApiId;
-        this.initPromise = null;
-        this.vkPluginContainerId = null;
-        this.authorized = false;
-
-        if (this.enabled) {
-            if (!this.widget.useVKApi) {
-                this.vkPluginContainerId = UUID.create(4).hex;
-                this.initPromise = loadVkLib()
-                    .catch(err => this.__handleVKLoadingError(err));
-            } else {
-                this.initPromise = loadVkLib()
-                    .then(() => initVK(this.vkApiId))
-                    .then(() => {
-                        this.authorized = !!(window.VK.Auth.getSession());
-                    })
-                    .catch(err => this.__handleVKLoadingError(err));
-            }
-        }
-    }
-
-    subscribe() {
-        super.subscribe();
-        return isVkAppUsed(this.widget.config)
-            ? window.open(`https://vk.com/app${this.widget.config.vkApiId}_-${this.config.id}#r=subscribe_${this.deeplink}&accountId=${this.widget.config.accountId}&channelId=${this.channelId}`, 'vk',constants.SUBSCRIPTION_WINDOW_PROPS)
-            : this.subscribeViaPlugin();
-    }
-
-    subscribeViaApi() {
-        let promise = null;
-        if (!this.authorized) {
-            promise = this.__login().then( res => this.__allowMessagesFromGroup() );
-        } else {
-            promise = this.__allowMessagesFromGroup();
-        }
-        return promise;
-    }
-
-    __allowMessagesFromGroup () {
-        window.VK.Api.call(
-            'messages.allowMessagesFromGroup',
-            {
-                group_id: this.id,
-                v: VK_API_VERSION,
-            },
-            res => {
-                const vkSession = window.VK.Auth.getSession();
-                const vkUserId = vkSession.mid;
-
-                if (res.response === 1) {
-                    this.__textbackSubscribe(vkUserId);
-                } else {
-                    console.log('VK res error:', res)
-                }
-            }
-        );
-    }
-
-
-    __login () {
-        return new Promise(resolve => {
-            window.VK.Auth.login(res => {
-                resolve(res)
-            }, LOGIN_TIMEOUT)
-        })
-    }
-
-    __textbackSubscribe (vkUserId) {
-        return fetch(`${this.widget.initialConfig.apiPath}/endUserNotifications/subscriptions`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-                'accountId': this.widget.config.accountId,
-                'insecureContext': this.widget.insecureContext,
-                'secureContextToken': this.widget.secureContextToken,
-                'address': {
-                    'channel': 'vk',
-                    'channelId': this.config.channelId,
-                    'accountId': this.widget.config.accountId,
-                    'remoteAddress': vkUserId,
-                    'chatId': vkUserId
-                },
-                widgetId: this.widget.id,
-                'user': {
-                    'id': this.widget.widgetUserId
-                }
-            })
-        }).then(apiErrorHandler);
-    }
-
-    __handleVKLoadingError(err) {
-        super.reportError('Failed to load VK openapi.js. VK channel will be unavailable.', err);
-        return null;
-    }
-
-    subscribeViaPlugin() {
-        const modal = new VKModal(this.vkPluginContainerId);
-        this.renderVKSubscriptionButton();
-
-        modal.onClose = () => {
-            if (this.vkSubscribeHandler) {
-                window.VK.Observer.unsubscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
-                this.vkSubscribeHandler = null;
-            }
-        };
-    }
-
-    renderVKSubscriptionButton(height = 30, containerId = this.vkPluginContainerId) {
-        if (this.vkSubscribeHandler) {
-            window.VK.Observer.unsubscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
-            this.vkSubscribeHandler = null;
-        }
-
-        const options = {
-            height,
-            key: this.deeplink
-        };
-
-        window.VK.Widgets.AllowMessagesFromCommunity(containerId, options, this.id);
-        if (!this.config.disableAllowMessageEvents) {
-            this.vkSubscribeHandler = this.__textbackSubscribe.bind(this);
-            window.VK.Observer.subscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
-        }
-    }
-}
+import UUID from 'uuid-js';
+
+import loadScript from '../utils/loadScript.js';
+import apiErrorHandler from '../utils/apiErrorHandler.js';
+
+import Channel from './channel.js';
+import VKModal from './vk-modal/vk-modal.js';
+import constants from "../utils/constants";
+
+const VK_API_VERSION = '5.131';
+const LOGIN_TIMEOUT = 4096;
+
+function loadVkLib(){
+  return new Promise((resolve, reject) => {
+    if (window.VK && window.VK.Auth) {
+      resolve('vk cache');
+    }
+    else {
+      loadScript('//vk.com/js/api/openapi.js')
+        .then(function () {
+          resolve('vk load');
+        }, function (err) {
+          reject(err);
+        });
+    }
+  });
+}
+
+function initVK(apiId) {
+  return new Promise((resolve, reject) => {
+    if (apiId) {
+      if (!window.VK._apiId) {
+        window.VK.init({apiId});
+      }
+      window.VK.Auth.getLoginStatus(resolve);
+    } else {
+      reject('noVKApiId');
+    }
+  });
+}
+
+function handleVKLoadingError(error) {
+  console.error('Failed to load VK openapi.js. VK channel will be unavailable');
+  return null;
+}
+
+// isVkAppUsed :: Object -> Boolean
+const isVkAppUsed = config => {
+  return config.useVkApp
+    ? config.useVkApp
+    : false;
+};
+
+export default class VKChannel extends Channel {
+  constructor(channelData = {}, deeplink, widget) {
+    super(channelData, deeplink, widget);
+
+    this.isDoubleCheck = widget.config.isDoubleCheck;
+    this.vkApiId = this.widget.config.vkApiId;
+    this.initPromise = null;
+    this.vkPluginContainerId = null;
+    this.authorized = false;
+    this.landingUrl = this.config.additionalProperties ? this.config.additionalProperties.landingUrl : undefined;
+
+    if (this.enabled) {
+      this.vkPluginContainerId = UUID.create(4).hex;
+
+      if (!this.widget.useVKApi) {
+        this.initPromise = loadVkLib()
+          .catch(err => this.__handleVKLoadingError(err));
+      } else {
+        this.initPromise = loadVkLib()
+          .then(() => initVK(this.vkApiId))
+          .then(() => {
+            this.authorized = !!(window.VK.Auth.getSession());
+          })
+          .catch(err => this.__handleVKLoadingError(err));
+      }
+    }
+  }
+
+  subscribe() {
+    super.subscribe();
+    return this.landingUrl ?
+      window.open(this.landingUrl, '_blank')
+      :
+      (isVkAppUsed(this.widget.config)
+       ? window.open(`https://vk.com/app${this.widget.config.vkApiId}_-${this.config.id}#r=subscribe_${this.deeplink}&accountId=${this.widget.config.accountId}&channelId=${this.channelId}`, 'vk')
+       : this.subscribeViaPlugin());
+  }
+
+  subscribeViaApi() {
+    let promise = null;
+
+    if (!this.authorized) {
+      promise = this.__login().then( res => this.__allowMessagesFromGroup() );
+    } else {
+      promise = this.__allowMessagesFromGroup();
+    }
+    return promise;
+  }
+
+  __allowMessagesFromGroup () {
+    window.VK.Api.call(
+      'messages.allowMessagesFromGroup',
+      {
+        group_id: this.id,
+        v: VK_API_VERSION,
+      },
+      res => {
+        const vkSession = window.VK.Auth.getSession();
+        const vkUserId = vkSession.mid;
+
+        if (res.response === 1) {
+          this.__textbackSubscribe(vkUserId);
+        } else {
+          console.log('VK res error:', res);
+        }
+      }
+    );
+  }
+
+
+  __login () {
+    return new Promise(resolve => {
+      window.VK.Auth.login(res => {
+        resolve(res);
+      }, LOGIN_TIMEOUT);
+    });
+  }
+
+  __textbackSubscribe (vkUserId, channelWidgetIdx) {
+    //we shall parse deeplink from server webhook. This method looks like artifact from age without webhhoks.
+    if(!this.isDoubleCheck) return null;
+
+    return fetch(`${this.widget.initialConfig.apiPath}/endUserNotifications/subscriptions`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify({
+        'accountId': this.widget.config.accountId,
+        'insecureContext': this.widget.insecureContext,
+        'secureContextToken': this.widget.secureContextToken,
+        'address': {
+          'channel': 'vk',
+          'channelId': this.config.channelId,
+          'accountId': this.widget.config.accountId,
+          'remoteAddress': vkUserId,
+          'chatId': vkUserId
+        },
+        deepLinkId: this.deeplink.replace('subscribe_',''),
+        widgetId: this.widget.id,
+        'user': {
+          'id': this.widget.widgetUserId
+        }
+      })
+    }).then(apiErrorHandler);
+  }
+
+  __handleVKLoadingError(err) {
+    super.reportError('Failed to load VK openapi.js. VK channel will be unavailable.', err);
+    return null;
+  }
+
+  subscribeViaPlugin() {
+    const modal = new VKModal(this.vkPluginContainerId);
+    this.renderVKSubscriptionButton();
+
+    modal.onClose = () => {
+      if (this.vkSubscribeHandler) {
+        window.VK.Observer.unsubscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
+        this.vkSubscribeHandler = null;
+      }
+    };
+  }
+
+  renderVKSubscriptionButton(height = 30, containerId = this.vkPluginContainerId) {
+    if (this.vkSubscribeHandler) {
+      window.VK.Observer.unsubscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
+      this.vkSubscribeHandler = null;
+    }
+
+    const options = {
+      height,
+      key: this.deeplink
+    };
+
+    window.VK.Widgets.AllowMessagesFromCommunity(containerId, options, this.id);
+    if (!this.config.disableAllowMessageEvents) {
+      this.vkSubscribeHandler = this.__textbackSubscribe.bind(this);
+      window.VK.Observer.subscribe('widgets.allowMessagesFromCommunity.allowed', this.vkSubscribeHandler);
+    }
+  }
+}

package/src/sdk/channels/whatsapp.js

@@ -1,21 +1,27 @@
 import Channel from './channel.js';
 import browserInfo from '../utils/browserInfo.js';
-import constants from '../utils/constants.js';
 import getLocale from '../../libraries/localization/getLocale.js';
 import text from '../../libraries/localization/text.js';
 
 export default class WhatsappChannel extends Channel {
-    constructor(channelData = {}, deeplink, widget) {
-        super(channelData, deeplink, widget);
+  constructor(channelData = {}, deeplink, widget) {
+    super(channelData, deeplink, widget);
 
-        this.domainPrefix = browserInfo.isMobile() ? 'api' : 'web';
+    this.domainPrefix = browserInfo.isMobile() ? 'api' : 'web';
+
+    if(channelData.hasOwnProperty('additionalProperties') && channelData.additionalProperties.hasOwnProperty('customDeeplinkValue')) {
+      this.customText = channelData.additionalProperties.customDeeplinkValue;
+    } else {
+      this.customText = null;
     }
+  }
 
-    subscribe() {
-        super.subscribe();
+  subscribe() {
+    super.subscribe();
 
-        let prefixText = encodeURIComponent(text('whatsapp_prefixtext', getLocale()));
-        
-        window.open(`https://${this.domainPrefix}.whatsapp.com/send?phone=${this.id}&text=${prefixText} ${this.deeplink}`, 'whatsapp', constants.SUBSCRIPTION_WINDOW_PROPS);
-    }
+    let prefixText = text('whatsapp_prefixtext', getLocale());
+    let deeplink = this.customText ? this.customText : `${prefixText} ${this.deeplink}`;
+
+    window.open(`https://api.whatsapp.com/send/?phone=+${this.id}&text=${encodeURIComponent(deeplink)}&app_absent=0`, 'whatsapp');
+  }
 }

package/src/sdk/channels/whatsappb.js

@@ -0,0 +1,27 @@
+import Channel from './channel.js';
+import browserInfo from '../utils/browserInfo.js';
+import getLocale from '../../libraries/localization/getLocale.js';
+import text from '../../libraries/localization/text.js';
+
+export default class WhatsappbChannel extends Channel {
+  constructor(channelData = {}, deeplink, widget) {
+    super(channelData, deeplink, widget);
+
+    this.domainPrefix = browserInfo.isMobile() ? 'api' : 'web';
+
+    if(channelData.hasOwnProperty('additionalProperties') && channelData.additionalProperties.hasOwnProperty('customDeeplinkValue')) {
+      this.customText = channelData.additionalProperties.customDeeplinkValue;
+    } else {
+      this.customText = null;
+    }
+  }
+
+  subscribe() {
+    super.subscribe();
+
+    let prefixText = text('whatsapp_prefixtext', getLocale());
+    let deeplink = this.customText ? this.customText : `${prefixText} ${this.deeplink}`;
+
+    window.open(`https://api.whatsapp.com/send/?phone=+${this.id}&text=${encodeURIComponent(deeplink)}&app_absent=0`, 'whatsappb');
+  }
+}

package/src/sdk/events/observer.js

@@ -1,46 +1,46 @@
-import assign from 'lodash/assign';
-
-const EVENTS = {
-    WIDGET_INIT: 'widget.init',
-    SUBSCRIBE_START: 'subscribe.start',
-};
-
-const _handlers = {};
-
-window.TextBack = window.TextBack || {};
-window.TextBack.Observer = window.TextBack.Observer || {
-    on(eventName, fn) {
-        if (!_handlers[eventName]) {
-            _handlers[eventName] = [ fn ];
-        } else {
-            _handlers[eventName].push(fn);
-        }
-
-        return () => {
-            const fnIndex = _handlers[eventName].indexOf(fn);
-            if (fnIndex !== -1) {
-                _handlers[eventName].splice(fnIndex, 1);
-            }
-        };
-    },
-
-    trigger(eventName, data) {
-        if (_handlers[eventName]) {
-            const eventData = assign({}, data, { type: eventName });
-            setTimeout(() => {
-                _handlers[eventName].forEach(handler => {
-                    try {
-                        handler(eventData)
-                    } catch (err) {
-                        console.error(`Error occuired while executing event handler on event ${eventName}`, err);
-                    }
-                });
-            }, 0);
-            
-        }
-    }
-};
-
-const Observer = window.TextBack.Observer;
-
-export { Observer, EVENTS };
+import assign from 'lodash/assign';
+
+const EVENTS = {
+    WIDGET_INIT: 'widget.init',
+    SUBSCRIBE_START: 'subscribe.start',
+};
+
+const _handlers = {};
+
+window.TextBack = window.TextBack || {};
+window.TextBack.Observer = window.TextBack.Observer || {
+    on(eventName, fn) {
+        if (!_handlers[eventName]) {
+            _handlers[eventName] = [ fn ];
+        } else {
+            _handlers[eventName].push(fn);
+        }
+
+        return () => {
+            const fnIndex = _handlers[eventName].indexOf(fn);
+            if (fnIndex !== -1) {
+                _handlers[eventName].splice(fnIndex, 1);
+            }
+        };
+    },
+
+    trigger(eventName, data) {
+        if (_handlers[eventName]) {
+            const eventData = assign({}, data, { type: eventName });
+            setTimeout(() => {
+                _handlers[eventName].forEach(handler => {
+                    try {
+                        handler(eventData)
+                    } catch (err) {
+                        console.error(`Error occuired while executing event handler on event ${eventName}`, err);
+                    }
+                });
+            }, 0);
+            
+        }
+    }
+};
+
+const Observer = window.TextBack.Observer;
+
+export { Observer, EVENTS };

package/src/sdk/index.js

@@ -1,6 +1,6 @@
-import SDK from './sdk.js';
-
-window.TextBack = window.TextBack || {};
-window.TextBack.SDK = window.TextBack.SDK || new SDK();
-
+import SDK from './sdk.js';
+
+window.TextBack = window.TextBack || {};
+window.TextBack.SDK = window.TextBack.SDK || new SDK();
+
 export default window.TextBack.SDK;

package/src/sdk/sdk.js

@@ -1,30 +1,67 @@
-require('es6-promise').polyfill();
-import 'whatwg-fetch';
-
-import Widget from './widget/widget.js';
-import { Observer, EVENTS } from './events/observer.js';
-
-export default class SDK {
-    constructor() {
-        this.widgets = {};
-    }
-
-    initWidget(config) {
-        if (config && config.widgetId) {
-            const widget = new Widget(config, this);
-            this.widgets[config.widgetId] = widget.initialize();
-            this.widgets[config.widgetId].then(widget => Observer.trigger(EVENTS.WIDGET_INIT, { widgetId: config.widgetId }), err => console.error(err));
-            return this.widgets[config.widgetId];
-        } else {
-            throw new Error('Widget id is not defined');
-        }
-    }
-
-    getWidget(widgetId) {
-        return this.widgets[widgetId] ? this.widgets[widgetId] : null;
-    }
-
-    on(eventName, fn) {
-        return Observer.on(eventName, fn);
-    }
-}
+import apiErrorHandler from "./utils/apiErrorHandler";
+import 'whatwg-fetch';
+
+import Widget from './widget/widget.js';
+import {EVENTS, Observer} from './events/observer.js';
+import {deeplinkUpdater} from './utils/loadDeepLink.js';
+
+require('es6-promise').polyfill();
+
+export default class SDK {
+    constructor() {
+        this.widgets = {};
+        this._deeplinkUpdater = deeplinkUpdater;
+    }
+
+    initWidget(config, preventViewCounting = false) {
+        if (config && config.widgetId) {
+            const widget = new Widget(config, this);
+            this.widgets[config.widgetId] = widget.initialize();
+            this.widgets[config.widgetId].then(widget => {
+              Observer.trigger(EVENTS.WIDGET_INIT, {widgetId: config.widgetId});
+
+              // First of all, this is a restriction on the count of views for textback settings page ( = for widget preview)
+              if (preventViewCounting) return;
+
+              this.countWidgetView(widget);
+            }, err => console.error(err));
+            return this.widgets[config.widgetId];
+        } else {
+            throw new Error('Widget id is not defined');
+        }
+    }
+
+    countWidgetView(widget) {
+        return fetch(`${widget.initialConfig.apiPath}/endUserNotifications/subscriptions/notificationWidget/views`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({
+                'accountId': widget.config.accountId,
+                'widgetId': widget.id
+            })
+        }).then(apiErrorHandler);
+    }
+
+    getWidget(widgetId) {
+        return this.widgets[widgetId] ? this.widgets[widgetId] : null;
+    }
+
+    on(eventName, fn) {
+        return Observer.on(eventName, fn);
+    }
+
+    getDeeplinkUpdater(widgetId) {
+        let _getWidget = this.widgets[widgetId];
+
+        if (!_getWidget) return null;
+
+        return _getWidget.then(x => {
+            return this._deeplinkUpdater(
+                x.initialConfig.apiPath,
+                x.deeplink.split('_')[1]
+            );
+        });
+    }
+}