lifen 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f915f68d0f6d3185d5830ffb7d35519516a306
-  data.tar.gz: bccbde30e8be900129a9752f9735024a73335707
+  metadata.gz: a67207628744fa9170010479e696b05545a73568
+  data.tar.gz: c88fc831f27439acd3df13d6eca873b159cf8d5d
 SHA512:
-  metadata.gz: 22b519b174c804ec29e6670be2b0dc48b595d4166af8df4537b831cef28e898f6fd1e1d5f3b9843e1ae2e8892555018262130d6112bc7c39d4debd73ea9313cb
-  data.tar.gz: 2416769de82ff4d2cdc68ab766e35ce6f171d6c4c41826b061efe189b70640f07ed79daa235ec418e7f37af954acbe419617e45eebf9b9f79d95a6b66780f4fd
+  metadata.gz: 7fbd97528d92d51504930198d3eee85e50b06c2ed530a7597458770a7fe874373d7359af64d032d72d386a983dde4632521a0ae642d7d1bf32813724f1f2c0b0
+  data.tar.gz: d4430833c1e7849de2446b6b38f14d99a33d5a0a27130a43676f9f8a05c2504e2690908f4bd86ed5d7df3ee0e1e4cdf19548cd2091458412c56f5ba7a7c9e923

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    lifen (0.2.1)
+    lifen (1.0.0)
       faraday (>= 0.9)
+      inflecto
       virtus (>= 1.0)
 
 GEM
@@ -27,6 +28,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     hashdiff (0.3.0)
     ice_nine (0.11.2)
+    inflecto (0.0.2)
     multipart-post (2.0.0)
     public_suffix (2.0.4)
     rake (10.5.0)

data/README.md

@@ -23,31 +23,31 @@ Or install it yourself as:
 Lifen can be configured (ideally inside an initializer) like so:
 
     Lifen.configure do |config|
-      config.site = "https://develop.lifen.fr/"
-      config.secret_key = "secret_key"
-      config.proxy_url = "http://my.proxy.fr/"
+      config.site                      = "https://develop.lifen.fr/"
+      config.application_access_token  = "application_access_token"
+      config.proxy_url                 = "http://my.proxy.fr/"
     end
 
-`site` and `secret_key` are mandatory attributes.
+`site` and `application_access_token` are mandatory attributes.
 
 ### Managing users
 
     user = Lifen::User.new(email: "email@domain.tld", first_name: "Jean", last_name: "Dupont")
-    user.create!
-    user.refresh_token
-    user.refresh_unread_messages
+    user.create
+    user.token.refresh
+    user.status.refresh
 
 ### Managing flows
 
-    user = Lifen::User.new(token: "valid_token", uuid: "valid_uuid")
+    user = Lifen::User.new(uuid: "valid_uuid")
     user.flows
 
     flow = Lifen::Flow.new(user: user, title: "honestica Rocks !")
     flow.create
-    flow.attach_users!(user)
-    flow.detach_users!(user)
+    flow.attach_users(user)
+    flow.detach_users(user)
 
-    flow = Lifen::Flow.new(user: user, title: "honestica Rocks !", active_users: [user_1, user_2])
+    flow = Lifen::Flow.new(user: user, title: "honestica Rocks !", users: [user_1, user_2])
     flow.create
 
 ### Managing messages

data/lib/lifen.rb

@@ -2,20 +2,23 @@ module Lifen
 
   require 'virtus'
   require 'faraday'
+  require 'inflecto'
 
   require "lifen/version"
 
-  require "lifen/error"
+  require 'lifen/error'
   require 'lifen/client'
   require 'lifen/user_authenticated_client'
   require 'lifen/app_authenticated_client'
   require 'lifen/configuration'
-  require "lifen/base"
+  require 'lifen/base'
+  require 'lifen/token'
+  require 'lifen/status'
   require 'lifen/user'
   require 'lifen/flow'
   require 'lifen/flows'
-  require 'lifen/authentication'
-  require 'lifen/status'
   require 'lifen/message'
 
+  Virtus.finalize
+
 end

data/lib/lifen/app_authenticated_client.rb

@@ -1,38 +1,26 @@
 module Lifen
   class AppAuthenticatedClient < Client
 
-    def post(url, params = {})
+    private
 
-      response = faraday_client.post do |req|
-        req.url url
+      def handle_status!(response)
+        super(response)
 
-        req.headers['secret_key']     = secret_key
-        req.headers['Content-Type']     = "application/json"
+        case response.status
+        when 400
+          raise Error, "Error 400"
+        when 401
+          raise InvalidSecretTokenError
+        when 403
+          raise UserAlreadyExistingError
+        when 404
+          raise Error, "Error 404, Page not found"
+        end
 
-        req.body = JSON.generate(params)
       end
 
-      if response.status == 500
-        json = JSON.parse response.body
-
-        trace_id = json.fetch("X-B3-TraceId", "unknown")
-        raise Error, "Error 500, Internal server error (trace ID: #{trace_id})"
-      end
-
-      raise Error, "Error 400" if response.status == 400
-      raise Error, "Error 404, Page not found" if response.status == 404
-      raise InvalidSecretTokenError if response.status == 401
-      raise UserAlreadyExistingError if response.status == 403
-
-      json = JSON.parse response.body
-
-      json
-    end
-
-    private
-
-      def secret_key
-        Lifen.configuration.secret_key
+      def bearer
+        Lifen.configuration.application_access_token
       end
 
   end

data/lib/lifen/client.rb

@@ -1,8 +1,45 @@
 module Lifen
   class Client
 
+    def request(mode, url, params = {})
+      before_request
+
+      response = faraday_client.send(mode) do |req|
+        req.url url
+
+        req.headers['Authorization']      = "Bearer #{bearer}"
+        req.headers['Content-Type']       = "application/json"
+        req.headers['Accept']             = "application/json"
+
+        req.body = JSON.generate(params)
+      end
+
+      handle_status!(response)
+
+      json = JSON.parse response.body
+
+      json
+    end
+
+    def post(url, params = {})
+      request(:post, url, params)
+    end
+
+    def get(url, params = {})
+      request(:get, url, params)
+    end
+
     private
 
+      def handle_status!(response)
+        if response.status == 500
+          json = JSON.parse response.body
+
+          trace_id = json.fetch("X-B3-TraceId", "unknown")
+          raise Error, "Error 500, Internal server error (trace ID: #{trace_id})"
+        end
+      end
+
       def faraday_client
         @faraday_client ||= Faraday.new(faraday_options) do |faraday|
           faraday.request  :url_encoded             # form-encode POST params
@@ -26,5 +63,12 @@ module Lifen
         Lifen.configuration.proxy_url
       end
 
+      def before_request
+      end
+
+      def bearer
+        raise "A bearer method must be defined"
+      end
+
   end
 end

data/lib/lifen/configuration.rb

@@ -1,6 +1,6 @@
 module Lifen
   class Configuration
-    attr_accessor :site, :secret_key, :proxy_url
+    attr_accessor :site, :application_access_token, :proxy_url
   end
 
   def self.configuration

data/lib/lifen/error.rb

@@ -1,4 +1,5 @@
 module Lifen
+
   class Error < StandardError
   end
 

data/lib/lifen/flow.rb

@@ -4,16 +4,12 @@ module Lifen
     attribute :uuid, String
     attribute :title, String
     attribute :user, Lifen::User
-    attribute :active_users, Array[Lifen::User]
+    attribute :users, Array[Lifen::User]
 
     def create
-      params = {title: title}
+      users_to_attach = users
 
-      users_to_attach = []
-      if !active_users.empty?
-        users_to_attach = active_users
-        params[:users] = active_users.map(&:uuid)
-      end
+      params = {title: title, users: extract_users_uuids(users_to_attach)}
 
       json = client.post("central/api/chats?rel=activeUsers", params)
 
@@ -23,61 +19,35 @@ module Lifen
 
       self.user = user
       self.uuid = flow.uuid
+      self.title = flow.title
 
-      self.active_users = []
-      Array(json_flow["activeUsers"]).each do |element|
-        element[:first_name] = element["firstName"]
-        element[:last_name] = element["lastName"]
-
-        self.active_users << Lifen::User.new(element)
-      end
-
-      users_to_attach.each do |user|
-        raise Lifen::Error, "User #{user.uuid} was not attached to this flow" if !active_users.map(&:uuid).include? user.uuid
-      end
+      build_users(json_flow)
 
-      self.title = flow.title
+      check_if_users_were_attached!(users_to_attach)
 
       self
     end
 
-    def attach_users!(users)
-      users = Array(users)
-
-      params = users.map(&:uuid).compact.uniq
+    def attach_users(users_to_attach)
+      params = extract_users_uuids(users_to_attach)
 
       json = client.post("central/api/chats/#{uuid}/attach_users?rel=activeUsers", params)
 
-      Array(json["activeUsers"]).each do |element|
-        element[:first_name] = element["firstName"]
-        element[:last_name] = element["lastName"]
-
-        self.active_users << Lifen::User.new(element)
-      end
+      build_users(json)
 
-      users.each do |user|
-        raise Lifen::Error, "User #{user.uuid} was not attached to this flow" if !active_users.map(&:uuid).include? user.uuid
-      end
+      check_if_users_were_attached!(users_to_attach)
 
       self
     end
 
-    def detach_users!(users)
-      users = Array(users)
-
-      params = users.map(&:uuid).compact.uniq
+    def detach_users(users_to_detach)
+      params = extract_users_uuids(users_to_detach)
 
       json = client.post("central/api/chats/#{uuid}/detach_users?rel=activeUsers", params)
 
-      self.active_users = []
+      build_users(json)
 
-      Array(json["activeUsers"]).each do |element|
-        self.active_users << Lifen::User.new(element)
-      end
-
-      users.each do |user|
-        raise Lifen::Error, "User #{user.uuid} was not detached to this flow" if active_users.map(&:uuid).include? user.uuid
-      end
+      check_if_users_were_detached!(users_to_detach)
 
       self
     end
@@ -88,5 +58,32 @@ module Lifen
         @client ||= user.client
       end
 
+      def build_users(json)
+        self.users = []
+
+        Array(json["activeUsers"]).each do |element|
+          element[:first_name] = element["firstName"]
+          element[:last_name] = element["lastName"]
+
+          self.users << Lifen::User.new(element)
+        end
+      end
+
+      def extract_users_uuids(users)
+        Array(users).map(&:uuid).compact.uniq
+      end
+
+      def check_if_users_were_attached!(users_to_attach)
+        missing_users = Array(users_to_attach).map(&:uuid) - users.map(&:uuid)
+
+        raise Lifen::Error, "Users #{missing_users.join(', ')} were not attached to this flow" if !missing_users.empty?
+      end
+
+      def check_if_users_were_detached!(users_to_detach)
+        extra_users = users.map(&:uuid) & Array(users_to_detach).map(&:uuid)
+
+        raise Lifen::Error, "Users #{extra_users.join(', ')} were not detached from this flow" if !extra_users.empty?
+      end
+
   end
 end

data/lib/lifen/flows.rb

@@ -1,12 +1,8 @@
 module Lifen
   class Flows < Base
 
-    def initialize(user)
-      @user = user
-      @collection = []
-    end
-
-    attr_reader :collection, :user
+    attribute :user, Lifen::User
+    attribute :elements, Array[Lifen::Flow], default: []
 
     def all
       json = client.get("central/api/chats")
@@ -15,10 +11,10 @@ module Lifen
         flow = Flow.new(element)
         flow.user = user
 
-        @collection << flow
+        elements << flow
       end
 
-      collection
+      elements
     end
 
     private

data/lib/lifen/status.rb

@@ -1,9 +1,11 @@
 module Lifen
-  class Status < Base
+  class Status
 
-    attribute :user, Lifen::User
+    include Virtus.model(finalize: false)
 
-    attribute :unread, Integer
+    attribute :user, "Lifen::User"
+
+    attribute :unread, Integer, default: 0
 
     def refresh
       json = client.get("central/api/chats/status")

data/lib/lifen/token.rb

@@ -0,0 +1,44 @@
+module Lifen
+  class Token
+  	include Virtus.model(finalize: false)
+
+  	attribute :user, "Lifen::User"
+
+    attribute :value, String
+    attribute :expires_at, Integer
+
+    def to_s
+      value
+    end
+
+    def has_expired?
+    	return true if expires_at.nil?
+
+    	return expires_at < Time.now.to_i
+    end
+
+    def refresh
+    	# params = {accountUuid: user.uuid}
+
+      json = client.post("/oauth/admin/third_party/access_token?accountUuid=#{user.uuid}")
+
+      self.value = json["access_token"]
+      self.expires_at = Time.now.to_i + json["expires_in"].to_i
+    end
+
+    def refresh_once_if_needed
+    	return if !has_expired?
+
+    	refresh
+
+    	raise Error, "Token can't be refreshed" if has_expired?
+    end
+
+    private
+
+      def client
+        @client ||= AppAuthenticatedClient.new
+      end
+
+  end
+end