Commit graph

302 commits

Author SHA1 Message Date
sony-mathew
8cf135f2db Merge branch 'hotfix/1.0.3' into develop
# Conflicts:
#	config/cable.yml
#	docs/development/environment-setup/docker.md
2020-01-26 22:51:39 +05:45
sony-mathew
2168f823a5 [#446] Redis authentication support
Previously we did not support authentication for redis anywhere. Also in the docker compose we were exposing redis port 6379 without any authentication. In the app side for the connections that app server (for storing keys as well as for socket connections made using action cable) and Sidekiq were making to redis server did not support authentication.

With this commit, we support authentication for redis connections from app side and Sidekiq. This is supported in docker-compose as well.

The changes include :
* Added support for new env variable REDIS_PASSWORD
* This redis password is now supported by action cable connections, Sidekiq connections and app side redis connections
* Since Sidekiq did not have an initializer, added an initializer to pass custom config to Sidekiq (for now it's options for redis)
* Changes in docker-compose to pickup a password set in .env file to protect the redis server running in docker
* Added necessary documentation changes in `docker.md` and `environment-variables.md`
2020-01-26 22:46:34 +05:45
Sony Mathew
1fd4127709
Removed agent dashboard link in conversation mail to user (#445) 2020-01-24 14:31:52 +05:45
Sony Mathew
04d347f0ee Chore: Changed from email and reply to email for conversation email (#444) 2020-01-24 14:10:52 +05:45
Sony Mathew
d4b3ba4baa [#139] Send conversation emails (#442)
* [#139] Delayed emails for conversations

* Added the setex and get methods to Redis wrapper
* Set the priorities for the sidekiq queues
* Was not able to use mailhog for testing email in local, switched back to letter opener and added comments on using the SMTP settings
* Added after create hood in messages to queue the sending of mail after 2 minutes using sidekiq worker and also set the redis key for the conversation to avoid the email sending for every message
* Added the sidekiq worker to send the email and delete the conversation redis key
* Added the mailer and mail template
* mailer sends the last 10 messages along with the new messages from the time it was queued

* Send email only in development or if smtp config is set

* Send email only in development or if smtp config is set
* Set the SMTP_PORT in production variable

* Adding redis to circle CI

* Specs for the conversation email changes

* Added specs for conversation email sidekiq worker
* Added specs for conversation mailer
* Added specs in message model for the after create hook for notify email

* Send emails only when there is a reply from agent

* set development to use mailhog

* Adding comments for using letter opener
2020-01-23 23:14:07 +05:45
Sojan Jose
1d3ed016be Chore: Documentation for configuring cloud storage (#439) 2020-01-21 22:28:18 +05:45
Pranav Raj S
95fb6893b4 Feature: API to list the agents for the inbox (#438)
Co-authored-by: Sojan Jose <sojan@pepalo.com>
2020-01-21 19:56:58 +05:45
Pranav Raj S
a2b025b548 Feature: View conversation labels on sidebar (#436) 2020-01-21 18:57:44 +05:45
Pranav Raj S
90e678743b Update contributing.md (#434) 2020-01-20 23:48:29 +05:45
Muhsin.K
9290893f9d
Style: Fix the last message style issue (#433) 2020-01-19 14:17:15 +05:30
Nithin David Thomas
f7f7a6b9c7 Feature: Widget design update (#426) 2020-01-17 13:36:05 +05:30
Subin T P
cc180b77ce Include only incoming/outgoing messages in reporting (#429)
* Skip activity messages from reporting

* Makes reportable? as access list for reporting
2020-01-14 00:50:18 +05:30
Pranav Raj S
18bf1a9e62 Ignore case from input email (#424) 2020-01-13 14:25:23 +05:30
Nithin David Thomas
7cf19e0b52 Feature: Update design for web widget (#408) 2020-01-13 12:10:40 +05:30
Pranav Raj S
655c585358 Feature: View a contact's previous conversation (#422)
* Add API to fetch conversations of a contact

* Add conversation list in sidebar
2020-01-13 11:17:03 +05:30
Pranav Raj S
fc6a8c2601
Bug: Fix Heroku deployment on develop branch(#421) 2020-01-12 19:31:32 +05:30
Sojan
63789e5916 Merge branch 'hotfix/1.0.2' into develop 2020-01-09 14:36:50 +05:30
Sojan
e04ff6441b Merge branch 'hotfix/1.0.2' 2020-01-09 14:36:35 +05:30
Sojan
6c0076665a Bugfix: Production autoload issue for bot.rb
- add app/bot to auto load path
2020-01-09 14:36:20 +05:30
Sojan Jose
722f540b03 [Feature] Email collect message hooks (#331)
- Add email collect hook on creating conversation
- Merge contact if it already exist
2020-01-09 13:06:40 +05:30
Sojan
59d4eaeca7 Merge branch 'hotfix/1.0.1' into develop 2020-01-09 12:01:07 +05:30
Sojan
9c2f37d0f9 Merge branch 'hotfix/1.0.1'
Bugfix: Sidekiq queues getting stuck [#411]
2020-01-09 11:59:56 +05:30
Sojan
8e6b735299 Bugfix: Sidekiq queues getting stuck [#411]
ref: https://github.com/rails/rails/issues/36810
closes: #411
2020-01-09 11:59:31 +05:30
Pranav Raj S
b00e13f9db Docs: Add brancing model (#410) 2020-01-08 23:10:46 +05:30
Sojan Jose
f875a09fb7 Chore: Switch from Carrierwave to ActiveStorage (#393) 2020-01-07 22:59:17 +05:30
mbronek7
f02d422b6a Move ActionCable Broadcast Calls to sidekiq #154 (#403)
* Move Pusher Calls to sidekiq

* CR changes

Co-authored-by: Sojan Jose <sojan@pepalo.com>
2020-01-06 22:32:41 +05:30
Sojan Jose
91ace96acd Chore: Sidekiq ActionCable fix for Development (#405)
- action cable works from sidekiq in development environments
- documentation updates for docker
2020-01-05 23:26:22 +05:30
Sojan
4f875dae4c Merge branch 'release/1.0.0' 2020-01-03 12:57:16 +05:30
Pranav Raj S
f178429df2 Docs: Update year in license file (#401) 2020-01-02 12:27:22 +05:30
Pranav Raj S
439e064d90 Feature: Contact Panel with conversation details (#397)
* Add Contact panel changes

* Fix parent iframe blocked

* Add Conversation Panel, Contact messages

* Update contact panel with conversation details

* Update designs in sidebar

* Fix specs

* Specs: Add specs for conversationMetadata and contact modules

* Fix currentUrl issues

* Fix spelling

* Set default to empty string
2020-01-01 22:30:43 +05:30
Cadu Ribeiro
434d6c2656 Reduce docker image size (#394)
Reduce docker image size based on:  https://cadu.dev/reduce-your-docker-images-an-example-with-ruby/
2019-12-31 18:23:18 +05:30
Pranav Raj S
7c4cc68561
Bug: Force fetch inbox settings on route change (#400) 2019-12-30 11:53:16 +05:30
Sojan Jose
bacc0b2f18 Enhancement: Use S3 for active storage (#398) 2019-12-29 11:13:28 +05:30
Pranav Raj S
e2aeeeca43 Specs: Add specs for Facebook::SendReplyService (#396) 2019-12-28 23:14:09 +05:30
Jonathan Alzetta
790877c056 Docs: Fix typo in website channel setup (#395) 2019-12-28 22:26:20 +05:30
Pranav Raj S
5ddc46c474 Refactor: Inbox store, remove inboxes from sidebar (#387)
* Refactor: Inbox store, remove inboxes from sidebar

* Add a new page for inbox settings

* Show inboxes on sidebar

* Add inbox_members API

* Disable similar-code check

* Fix codeclimate scss issues

* Add widget_color update API and actions

* Add specs for inbox store

* Fix Facebook auth flow

* Fix agent loading, inbox name
2019-12-28 21:56:42 +05:30
Mukesh Chaudhary
96f8070e79 Add specs for Policies (#392)
* Add specs for Policies

* Fix CI issues
2019-12-28 01:27:59 +05:30
Pranav Raj S
19b4311e8b Upgrade: Use postgres 11.6 in docker-compose (#391) 2019-12-26 22:04:52 +05:30
Pranav Raj S
005ca62c6e Bug: Fix signup 500 error (#389) 2019-12-26 11:52:14 +05:30
Pranav Raj S
f55c42d5a1 Bug: Fix copy when no inbox is added. (#386) 2019-12-25 20:06:43 +05:30
Pranav Raj S
3440230187 [Bug] Fix short_code param in update canned response API (#385) 2019-12-25 11:52:02 +05:30
Anto Dominic
4e9290ad76 Send emails via sidekiq (#380)
* add sidekiq web view if the user is an administrator

* add sidekiq setup configuration and support

* update devise to use delivery_later method and update test

* update conversation to use deliver_later instead of deliver

* Update Routes

* Add Procfile for Heroku One-Click Start

* updating docs

* update concurrency and Procfile for supporting Heroku Free Dyno

* update Procfile.dev
2019-12-25 03:03:02 +05:30
Anto Dominic
335e7487e6 Docs: Update docker guide to use website docs (#383) 2019-12-25 00:10:36 +05:30
Sojan Jose
f98cd83a29 Code-climate duplicate code fixes (#382)
* Code-climate duplicate code fixes

* Spec for accounts controller
2019-12-24 17:32:27 +05:30
Sojan
97ab82892d Chore: labels to Conversations [#245] 2019-12-24 16:42:18 +05:30
Sojan Jose
7d85f2e046 Feature: Contact Merge Action (#378) 2019-12-24 13:27:25 +05:30
Pranav Raj S
32efe8676f Fix formatting in docs (#379) 2019-12-23 13:00:22 +05:30
Pranav Raj S
1143893d9c [Bug] Fix conversation assignment mailer url (#374)
* Fix conversation assignment mailer url

* Remove mailer scope
2019-12-23 12:16:46 +05:30
Sojan Jose
9c7d8bb60d [Docs] Update docker documentation (#377) 2019-12-23 11:56:25 +05:30
Anto Dominic
1ee17cc826 [Enhancement] Docker support Debugging (byebug & pry) and receive emails to MailHog via smtp (#371)
* updated development docker setup

* turned on yarn integrity check

* create test docker compose and update development dockerfile

* create docker Readme.md file

* fix README.md file

* create docker-copmose and dockerfile for production/staging environment setup

* added mailhog to catch email

* remove yarn integrity check in development mode!

* Update Readme.md file to support mailhog inbox

* update link to docker development guide from mail README

* remove .env.development and use .env.example for docker as .env.development was mixing with circleci config

* make the dockerfile configurable like before

* update docker-compose as per suggesion in PR

* create docker setup docs

* Revert accidental deletion

* fix: typo for branding consistency

* fix typo

* update the code as per recommendation in PR

* remove package-lock and add gitignore

* fix vulnerability AND update env for tests to pass

* Fix yarn integrity check across different docker services

* update code based on rubocop and PR suggestions

* remove redundant test docker-compose and dockerfile

* update rails entrypoint, update docs and Gemfile

* [Rubocop] order Gemfile alphabetically

* Reordering Gemfile
2019-12-22 22:53:18 +05:30