customer_service_im 0.4.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b62334882d10088f01bb2905fe1ccb060147f8445a939a9d1c97e23baf93532
-  data.tar.gz: 61529a00574b46082d46ad0c0f3bb4deba95ccbb2afd6554f8c59552de4902fe
+  metadata.gz: e66af9540fef1eb464557fde36fbda5f24661842f657a52f7bb44e4315d8f594
+  data.tar.gz: 0a71a2bfffd470a0ea9a0e01610cb9162e5d2d625a6529b99dbfeca2e1980291
 SHA512:
-  metadata.gz: a8fe6e4350df1281c308f923375fdecccae72e58c950b301c179a43f367403af05a1ff8bce8c0502172410f22e32324c9393ddddfdb0cd965cdbbb204939edc7
-  data.tar.gz: fd52763d4cb2754d3c3100b6822c4954e762eca8a68656e507cd906cfde977fd83d020d3f8c89fadbb25b5e92031ca583f4241fc1adeff412a92464a695eb316
+  metadata.gz: be4b5f529789ff41c3cb65649ffdf2d09060cc6818062982ef6a258f9cfbd1c87a83f8248bfb786892a6b79b695edbcd42a549396103b465f839abcad99e9fc4
+  data.tar.gz: f00c05ba7be0a33add96a4e7f2868a1cbc242259276730872bad0ed3019090678811e834eca53728572d480c0646780a2df820bde7efb55fcd3c666243853202

data/app/controllers/customer_service_im/application_controller.rb

@@ -10,6 +10,10 @@ module CustomerServiceIm
       render json: { errors: errors }, status: :unprocessable_entity
     end
 
+    def render_401(errors: nil)
+      render json: { errors: errors }, status: :unauthorized
+    end
+
     def render_200(data)
       render json: data
     end
@@ -17,7 +21,7 @@ module CustomerServiceIm
     private
 
     def token_user(user)
-      payload = { user_type: user.class.name, user_id: user.id }
+      payload = { data: { user_type: user.class.name, user_id: user.id } }
       JWT.encode(payload, hmac_secret, 'HS256')
     end
 
@@ -34,9 +38,10 @@ module CustomerServiceIm
         token = request.headers[:token]
         payload, = JWT.decode(token, hmac_secret, true, { algorithm: 'HS256' })
       rescue JWT::DecodeError => e
+        # binding.pry
         logger = Logger.new Rails.root.join("log/jwt.log")
         logger.error("JWT Decode Error: #{e}")
-        raise e
+        return false
       end
 
       payload["data"]["user_type"].classify.constantize.find(payload["data"]["user_id"])

data/app/controllers/customer_service_im/conversations_controller.rb

@@ -1,6 +1,7 @@
 
 module CustomerServiceIm
   class ConversationsController < ApplicationController
+    before_action :authenticate_user!
     before_action :set_conversation, only: [:messages, :all_messages_read]
 
     def index
@@ -8,6 +9,18 @@ module CustomerServiceIm
       @total_count = @conversations.size
     end
 
+    def show; end
+
+    def create
+      @conversation = Conversation.new(user: logged_user)
+
+      if @conversation.save
+        render :show
+      else
+        render_500 errors: @conversation.errors
+      end
+    end
+
     def messages
       @messages = @conversation.messages
                                .order('created_at desc')

data/app/controllers/customer_service_im/messages_controller.rb

@@ -1,5 +1,6 @@
 module CustomerServiceIm
   class MessagesController < ApplicationController
+    before_action :authenticate_user!
     before_action :set_conversation, only: [ :index ]
     before_action :set_message, only: [ :receive ]
 

data/app/controllers/customer_service_im/staffs_controller.rb

@@ -0,0 +1,13 @@
+
+module CustomerServiceIm
+  class StaffsController < CustomerServiceIm::ApplicationController
+    def login
+      staff = Staff.find_by!(email: params[:email])
+      if staff.authenticate(params[:password])
+        render_200 staff.as_json.merge({ token: token_user(staff) })
+      else
+        render_401(errors: "邮箱或密码错误")
+      end
+    end
+  end
+end

data/app/controllers/customer_service_im/users_controller.rb

@@ -0,0 +1,34 @@
+
+module CustomerServiceIm
+  class UsersController < ApplicationController
+    def login
+      mp = MiniProgram::Client.new(appid: CustomerServiceIm.appid, app_secret: CustomerServiceIm.app_secret )
+      result = mp.login(params.require(:code))
+
+      if result.failure?
+        render_500 errors: result.errors
+      end
+
+      open_id = result.data[:openid]
+
+      user = User.find_or_create_mp_user(open_id)
+
+      render_200 user.as_json.merge({ token: token_user(user), conversation_id: user.conversation_ids.first })
+    end
+
+    def update
+      user = logged_user
+      if user.update(user_params)
+        render_200  result: :ok
+      else
+        render_500 errors: user.errors
+      end
+    end
+
+    private
+
+    def user_params
+      params.require(:user).permit(:nickname, :avatar)
+    end
+  end
+end

data/app/models/customer_service_im/concerns/customer.rb

@@ -71,5 +71,14 @@ module CustomerServiceIm::Concerns::Customer
     def online_customer_list_in_redis
       redis.smembers online_customers_redis_key
     end
+
+    def find_or_create_mp_user(open_id)
+      return if open_id.blank?
+
+      User.create_with(
+        email: "#{SecureRandom.uuid}@mp.com",
+        password: Digest::MD5.hexdigest(open_id)
+      ).find_or_create_by(open_id: open_id)
+    end
   end
 end

data/app/models/customer_service_im/staff.rb

@@ -5,6 +5,8 @@ module CustomerServiceIm
 
     validates_presence_of :name
 
+    has_secure_password
+
     def join_conversation(conversation)
       conversation.update(staff: self)
 

data/app/views/customer_service_im/conversations/show.json.jbuilder

@@ -0,0 +1,2 @@
+
+json.partial! "conversation", conversation: @conversation

data/config/initializers/mini_program.rb

@@ -0,0 +1,5 @@
+
+MiniProgram.setup do |config|
+  config.appid = CustomerServiceIm.appid
+  config.app_secret = CustomerServiceIm.app_secret
+end

data/config/routes.rb

@@ -1,6 +1,12 @@
 CustomerServiceIm::Engine.routes.draw do
   mount ActionCable.server => "/cable"
 
+  resources :users, defaults: { format: :json } do
+    collection do
+      post :login
+    end
+  end
+
   resources :conversations, defaults: { format: :json } do
     member do
       get :messages
@@ -20,4 +26,10 @@ CustomerServiceIm::Engine.routes.draw do
       post :reply
     end
   end
+
+  resources :staffs do
+    collection do
+      post :login
+    end
+  end
 end

data/db/migrate/20211026062727_add_password_digest_to_customer_service_im_staffs.rb

@@ -0,0 +1,5 @@
+class AddPasswordDigestToCustomerServiceImStaffs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :customer_service_im_staffs, :password_digest, :string
+  end
+end

data/db/migrate/20211026062951_add_email_to_customer_service_im_staffs.rb

@@ -0,0 +1,5 @@
+class AddEmailToCustomerServiceImStaffs < ActiveRecord::Migration[6.1]
+  def change
+    add_column :customer_service_im_staffs, :email, :string
+  end
+end

data/lib/customer_service_im/version.rb

@@ -1,3 +1,3 @@
 module CustomerServiceIm
-  VERSION = '0.4.0'
+  VERSION = '0.8.0'
 end

data/lib/customer_service_im.rb

@@ -1,12 +1,12 @@
 require "customer_service_im/version"
 require "customer_service_im/engine"
 require "customer_service_im/core_ext"
-require 'shoulda'
+# require 'shoulda'
 require "jwt"
 require 'jbuilder'
 require "tx_asr"
 require "redis"
-
+require 'mini_program'
 
 module CustomerServiceIm
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: customer_service_im
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.8.0
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,19 +31,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.1.4.1
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_program
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of CustomerServiceIm.
 email:
 - ianlynxk@gmail.com
@@ -132,6 +160,8 @@ files:
 - app/controllers/customer_service_im/application_controller.rb
 - app/controllers/customer_service_im/conversations_controller.rb
 - app/controllers/customer_service_im/messages_controller.rb
+- app/controllers/customer_service_im/staffs_controller.rb
+- app/controllers/customer_service_im/users_controller.rb
 - app/jobs/customer_service_im/application_job.rb
 - app/mailers/customer_service_im/application_mailer.rb
 - app/models/customer_service_im/application_record.rb
@@ -143,9 +173,11 @@ files:
 - app/views/customer_service_im/conversations/_message.json.jbuilder
 - app/views/customer_service_im/conversations/index.json.jbuilder
 - app/views/customer_service_im/conversations/messages.json.jbuilder
+- app/views/customer_service_im/conversations/show.json.jbuilder
 - app/views/customer_service_im/messages/_message.json.jbuilder
 - app/views/customer_service_im/messages/index.json.jbuilder
 - config/cable.yml
+- config/initializers/mini_program.rb
 - config/initializers/tx_asr.rb
 - config/routes.rb
 - db/migrate/20210927065745_create_customer_service_im_staffs.rb
@@ -154,6 +186,8 @@ files:
 - db/migrate/20210928084420_add_state_to_customer_service_im_messages.rb
 - db/migrate/20210928085514_add_last_messaged_on_to_customer_service_im_conversations.rb
 - db/migrate/20210930025215_add_unread_message_count_to_customer_service_im_conversations.rb
+- db/migrate/20211026062727_add_password_digest_to_customer_service_im_staffs.rb
+- db/migrate/20211026062951_add_email_to_customer_service_im_staffs.rb
 - lib/customer_service_im.rb
 - lib/customer_service_im/core_ext.rb
 - lib/customer_service_im/engine.rb