Merge branch 'develop' into fix/set-user

app/controllers/api/v1/widget/contacts_controller.rb

@@ -1,6 +1,6 @@
 class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
-  before_action :process_hmac, only: [:update]
+  before_action :process_hmac, only: [:set_user]
-
+  before_action :validate_contact, only: [:set_user]
   def show; end
 
   def update
@@ -18,8 +18,40 @@ class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
     render json: @contact
   end
 
+  def set_user
+    contact = @is_a_different_contact ? build_contact : @contact
+
+    contact_identify_action = ContactIdentifyAction.new(
+      contact: contact,
+      params: permitted_params.to_h.deep_symbolize_keys
+    )
+    @contact = contact_identify_action.perform
+  end
+
   private
 
+  def build_contact
+    contact_inbox = @web_widget.create_contact_inbox
+    contact = contact_inbox.contact
+
+    payload = { source_id: contact_inbox.source_id, inbox_id: @web_widget.inbox.id }
+    @widget_auth_token = ::Widget::TokenService.new(payload: payload).generate_token
+
+    contact
+  end
+
+  def validate_contact
+    @is_a_different_contact = false
+
+    return unless @contact.resolved?
+
+    identifier_mismatch = @contact.identifier.present? && @contact.identifier != permitted_params[:identifier]
+    email_mismatch = @contact.email.present? && @contact.email != permitted_params[:email]
+    phone_mismatch = @contact.phone_number.present? && @contact.phone_number != permitted_params[:phone_number]
+
+    @is_a_different_contact = identifier_mismatch || email_mismatch || phone_mismatch
+  end
+
   def process_hmac
     return unless should_verify_hmac?
 

app/javascript/sdk/IFrameHelper.js

@@ -33,6 +33,12 @@ import {
 import { isFlatWidgetStyle } from './settingsHelper';
 import { popoutChatWindow } from '../widget/helpers/popoutHelper';
 
+const updateAuthCookie = cookieContent =>
+  Cookies.set('cw_conversation', cookieContent, {
+    expires: 365,
+    sameSite: 'Lax',
+  });
+
 export const IFrameHelper = {
   getUrl({ baseUrl, websiteToken }) {
     return `${baseUrl}/widget?website_token=${websiteToken}`;
@@ -134,10 +140,7 @@ export const IFrameHelper = {
 
   events: {
     loaded: message => {
-      Cookies.set('cw_conversation', message.config.authToken, {
+      updateAuthCookie(message.config.authToken);
-        expires: 365,
-        sameSite: 'Lax',
-      });
       window.$chatwoot.hasLoaded = true;
       IFrameHelper.sendMessage('config-set', {
         locale: window.$chatwoot.locale,
@@ -178,6 +181,10 @@ export const IFrameHelper = {
       setBubbleText(window.$chatwoot.launcherTitle || message.label);
     },
 
+    setAuthCookie({ data: { authToken } }) {
+      updateAuthCookie(authToken);
+    },
+
     toggleBubble: state => {
       let bubbleState = {};
       if (state === 'open') {

app/javascript/widget/App.vue

@@ -253,7 +253,7 @@ export default {
         } else if (message.event === 'remove-label') {
           this.$store.dispatch('conversationLabels/destroy', message.label);
         } else if (message.event === 'set-user') {
-          this.$store.dispatch('contacts/update', message);
+          this.$store.dispatch('contacts/setUser', message);
         } else if (message.event === 'set-custom-attributes') {
           this.$store.dispatch(
             'contacts/setCustomAttributes',

app/javascript/widget/api/contacts.js

@@ -12,6 +12,12 @@ export default {
       ...userObject,
     });
   },
+  setUser(identifier, userObject) {
+    return API.patch(buildUrl('widget/contact/set_user'), {
+      identifier,
+      ...userObject,
+    });
+  },
   setCustomAttributes(customAttributes = {}) {
     return API.patch(buildUrl('widget/contact'), {
       custom_attributes: customAttributes,

app/javascript/widget/store/modules/contacts.js

@@ -1,3 +1,4 @@
+import { setHeader } from 'widget/helpers/axios';
 import { IFrameHelper } from 'widget/helpers/utils';
 import ContactsAPI from '../../api/contacts';
 import { SET_USER_ERROR } from '../../constants/errorTypes';
@@ -72,6 +73,63 @@ export const actions = {
       });
     }
   },
+  setUser: async ({ dispatch }, { identifier, user: userObject }) => {
+    try {
+      const {
+        email,
+        name,
+        avatar_url,
+        identifier_hash,
+        phone_number,
+        company_name,
+        city,
+        country_code,
+        description,
+        custom_attributes,
+        social_profiles,
+      } = userObject;
+      const user = {
+        email,
+        name,
+        avatar_url,
+        identifier_hash,
+        phone_number,
+        additional_attributes: {
+          company_name,
+          city,
+          description,
+          country_code,
+          social_profiles,
+        },
+        custom_attributes,
+      };
+      const response = await ContactsAPI.setUser(identifier, user);
+      const { data = {} } = response;
+      dispatch('get');
+      if (data.widget_auth_token) {
+        setHeader('X-Auth-Token', data.widget_auth_token);
+        IFrameHelper.sendMessage({
+          event: 'setAuthCookie',
+          data: { authToken: data.widget_auth_token },
+        });
+      }
+      if (identifier_hash || data.widget_auth_token) {
+        dispatch('conversation/clearConversations', {}, { root: true });
+        dispatch('conversation/fetchOldConversations', {}, { root: true });
+        dispatch('conversationAttributes/getAttributes', {}, { root: true });
+      }
+    } catch (error) {
+      const data =
+        error && error.response && error.response.data
+          ? error.response.data
+          : error;
+      IFrameHelper.sendMessage({
+        event: 'error',
+        errorType: SET_USER_ERROR,
+        data,
+      });
+    }
+  },
   setCustomAttributes: async (_, customAttributes = {}) => {
     try {
       await ContactsAPI.setCustomAttributes(customAttributes);

app/models/contact.rb

@@ -134,6 +134,10 @@ class Contact < ApplicationRecord
     ).or(Current.account.contacts.where.not(identifier: [nil, '']))
   end
 
+  def resolved?
+    identifier.present? || email.present? || phone_number.present?
+  end
+
   private
 
   def ip_lookup

app/views/api/v1/widget/contacts/set_user.json.jbuilder

@@ -0,0 +1,8 @@
+json.contact do
+  json.id @contact.id
+  json.name @contact.name
+  json.email @contact.email
+  json.phone_number @contact.phone_number
+end if @contact
+
+json.widget_auth_token @widget_auth_token if @widget_auth_token

config/routes.rb

@@ -199,6 +199,7 @@ Rails.application.routes.draw do
         resource :contact, only: [:show, :update] do
           collection do
             post :destroy_custom_attributes
+            patch :set_user
           end
         end
         resources :inbox_members, only: [:index]