lifen 0.2.1 → 1.0.0

data/spec/users_spec.rb

@@ -2,15 +2,20 @@ require 'spec_helper'
 
 describe Lifen::User do
 
+  let(:valid_token_value)   { "valid_token" }
+
+  let(:invalid_token)       { Lifen::Token.new(value: "invalid_token", expires_at: Time.now.to_i + 60) }
+  let(:valid_token)         { Lifen::Token.new(value: valid_token_value, expires_at: Time.now.to_i + 60) }
+
   describe ':create' do
     context 'missing field' do
 
-      let(:user) { Lifen::User.new() }
+      let(:user) { Lifen::User.new(first_name: "Marc") }
 
       it 'raises an error' do
         expect{
           VCR.use_cassette "users/create/missing_fields" do
-            user.create!
+            user.create
           end
         }.to raise_error(Lifen::Error)
       end
@@ -22,42 +27,41 @@ describe Lifen::User do
 
       before do
         Lifen.configure do |config|
-          config.secret_key = "invalid-secret-key"
+          config.application_access_token = "invalid-secret-key"
         end
       end
 
       it 'raises an error' do
         expect{
           VCR.use_cassette "users/create/invalid_token" do
-            user.create!
+            user.create
           end
         }.to raise_error(Lifen::InvalidSecretTokenError)
       end
     end
 
     context 'exisiting user' do
-      let(:user) { Lifen::User.new(email: "existing-user@domain.tld") }
+      let(:user) { Lifen::User.new(email: "existing-user@domain.tld", first_name: "Existing", last_name: "User") }
 
       it 'creates the user' do
 
         expect{
           VCR.use_cassette "users/create/existing_user" do
-            user.create!
+            user.create
           end
         }.to raise_error(Lifen::UserAlreadyExistingError)
       end
     end
 
     context 'valid attributes' do
-      let(:user) { Lifen::User.new(email: "valid-email-spec@domain.tld") }
+      let(:user) { Lifen::User.new(email: "valid-email-spec@domain.tld", first_name: "Valid", last_name: "User") }
 
       it 'creates the user' do
 
         VCR.use_cassette "users/create/valid_attributes" do
-          user.create!
+          user.create
         end
 
-        expect(user.token).to_not be_nil
         expect(user.uuid).to_not be_nil
       end
     end
@@ -65,7 +69,7 @@ describe Lifen::User do
   end
 
 
-  describe ':refresh_token' do
+  describe ':token.refresh' do
 
     context 'invalid user uuid' do
 
@@ -73,8 +77,8 @@ describe Lifen::User do
 
       it 'raises an error' do
         expect{
-          VCR.use_cassette "users/refresh/invalid_user_uuid" do
-            user.refresh_token
+          VCR.use_cassette "users/token/refresh/invalid_user_uuid" do
+            user.token.refresh
           end
         }.to raise_error(Lifen::Error)
       end
@@ -82,33 +86,48 @@ describe Lifen::User do
 
     context 'valid user uuid' do
 
-      let(:user) { Lifen::User.new(uuid: "valid_uuid") }
+      let(:user) { Lifen::User.new(uuid: "11e6be14-8267-25ee-a3bd-0242ac110002") }
 
       it 'raises an error' do
 
-        previous_token = user.token
+        previous_token_value = user.token.value
+
+        VCR.use_cassette "users/token/refresh/valid_user_uuid" do
+          user.token.refresh
+        end
+
+        expect(user.token.value).to_not be_nil
+        expect(user.token.value).to_not eq previous_token_value
+      end
+    end
+
+    describe 'expired token' do
+
+      let(:expired_token)   { Lifen::Token.new(value: "valid_token", expires_at: Time.now.to_i - 60) }
+      let(:user)            { Lifen::User.new(token: expired_token) }
 
-        VCR.use_cassette "users/refresh/valid_user_uuid" do
-          user.refresh_token
+
+      it 'refreshs the token' do
+        expect(expired_token).to receive(:refresh) do
+          expired_token.expires_at = Time.now.to_i + 60
         end
 
-        expect(user.token).to_not be_nil
-        expect(user.token).to_not eq previous_token
+        expired_token.refresh_once_if_needed
       end
+
     end
 
   end
 
-  describe ':refresh_unread_messages' do
+  describe ':status.refresh' do
 
     context 'invalid token' do
-
-      let(:user) { Lifen::User.new(token: "invalid_token") }
+      let(:user) { Lifen::User.new(token: invalid_token) }
 
       it 'raises an error' do
         expect{
-          VCR.use_cassette "users/refresh_unread_messages/invalid_token" do
-            user.refresh_unread_messages
+          VCR.use_cassette "users/status/refresh/invalid_token" do
+            user.status.refresh
           end
         }.to raise_error(Lifen::Error)
       end
@@ -116,11 +135,12 @@ describe Lifen::User do
 
     context 'valid token' do
 
-      let(:user) { Lifen::User.new(token: "valid_token") }
+      # let(:valid_token_value)     { "REPLACE_ME" }
+      let(:user)            { Lifen::User.new(token: valid_token) }
 
       it 'raises an error' do
-        VCR.use_cassette "users/refresh_unread_messages/valid_token" do
-          user.refresh_unread_messages
+        VCR.use_cassette "users/status/refresh/valid_token" do
+          user.status.refresh
         end
 
         expect(user.unread_messages).to eq 2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Etienne Depaulis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: inflecto
+  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: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,6 @@ files:
 - Rakefile
 - lib/lifen.rb
 - lib/lifen/app_authenticated_client.rb
-- lib/lifen/authentication.rb
 - lib/lifen/base.rb
 - lib/lifen/client.rb
 - lib/lifen/configuration.rb
@@ -148,6 +161,7 @@ files:
 - lib/lifen/flows.rb
 - lib/lifen/message.rb
 - lib/lifen/status.rb
+- lib/lifen/token.rb
 - lib/lifen/user.rb
 - lib/lifen/user_authenticated_client.rb
 - lib/lifen/version.rb
@@ -158,7 +172,6 @@ files:
 - spec/cassettes/flows/create.yml
 - spec/cassettes/flows/create_with_users.yml
 - spec/cassettes/flows/detach_users/valid.yml
-- spec/cassettes/flows/detach_users/valid_again.yml
 - spec/cassettes/flows/internal_error.yml
 - spec/cassettes/flows/internal_error_without_trace_id.yml
 - spec/cassettes/flows/invalid_token.yml
@@ -168,10 +181,10 @@ files:
 - spec/cassettes/users/create/invalid_token.yml
 - spec/cassettes/users/create/missing_fields.yml
 - spec/cassettes/users/create/valid_attributes.yml
-- spec/cassettes/users/refresh/invalid_user_uuid.yml
-- spec/cassettes/users/refresh/valid_user_uuid.yml
-- spec/cassettes/users/refresh_unread_messages/invalid_token.yml
-- spec/cassettes/users/refresh_unread_messages/valid_token.yml
+- spec/cassettes/users/status/refresh/invalid_token.yml
+- spec/cassettes/users/status/refresh/valid_token.yml
+- spec/cassettes/users/token/refresh/invalid_user_uuid.yml
+- spec/cassettes/users/token/refresh/valid_user_uuid.yml
 - spec/flows_spec.rb
 - spec/messages_spec.rb
 - spec/spec_helper.rb
@@ -207,7 +220,6 @@ test_files:
 - spec/cassettes/flows/create.yml
 - spec/cassettes/flows/create_with_users.yml
 - spec/cassettes/flows/detach_users/valid.yml
-- spec/cassettes/flows/detach_users/valid_again.yml
 - spec/cassettes/flows/internal_error.yml
 - spec/cassettes/flows/internal_error_without_trace_id.yml
 - spec/cassettes/flows/invalid_token.yml
@@ -217,10 +229,10 @@ test_files:
 - spec/cassettes/users/create/invalid_token.yml
 - spec/cassettes/users/create/missing_fields.yml
 - spec/cassettes/users/create/valid_attributes.yml
-- spec/cassettes/users/refresh/invalid_user_uuid.yml
-- spec/cassettes/users/refresh/valid_user_uuid.yml
-- spec/cassettes/users/refresh_unread_messages/invalid_token.yml
-- spec/cassettes/users/refresh_unread_messages/valid_token.yml
+- spec/cassettes/users/status/refresh/invalid_token.yml
+- spec/cassettes/users/status/refresh/valid_token.yml
+- spec/cassettes/users/token/refresh/invalid_user_uuid.yml
+- spec/cassettes/users/token/refresh/valid_user_uuid.yml
 - spec/flows_spec.rb
 - spec/messages_spec.rb
 - spec/spec_helper.rb

data/lib/lifen/authentication.rb

@@ -1,29 +0,0 @@
-module Lifen
-  class Authentication < Base
-
-    attribute :user, Lifen::User
-
-    attribute :uuid, String
-    attribute :token, String
-
-    def register!
-      json = client.post("authentication/api/register/third_party", {emailAddress: user.email, lastName: user.last_name, firstName: user.first_name})
-
-      self.token    = json["token"]
-      self.uuid     = json["accountUuid"]
-    end
-
-    def refresh_token
-      json = client.post("authentication/api/authenticate/third_party", {accountUuid: user.uuid})
-
-      self.token    = json.first["token"]
-    end
-
-    private
-
-      def client
-        @client ||= AppAuthenticatedClient.new
-      end
-
-  end
-end

data/spec/cassettes/flows/detach_users/valid_again.yml

@@ -1,57 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://develop.lifen.fr/central/api/chats/11e65eca-4af7-d795-bf1a-0242ac110002/detach_users?rel=activeUsers
-    body:
-      encoding: UTF-8
-      string: '["25588996-4ff1-2dbb-9643-eabb809fa654"]'
-    headers:
-      User-Agent:
-      - Faraday v0.9.2
-      X-Auth-Token:
-      - valid_token
-      Content-Type:
-      - application/json
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      X-B3-Sampled:
-      - '1'
-      X-B3-Spanid:
-      - 65008d9ee1e9b85c
-      X-B3-Traceid:
-      - 65008d9ee1e9b85c
-      X-Content-Type-Options:
-      - nosniff
-      X-Xss-Protection:
-      - 1; mode=block
-      Cache-Control:
-      - no-cache, no-store, max-age=0, must-revalidate
-      Pragma:
-      - no-cache
-      Expires:
-      - '0'
-      Content-Type:
-      - application/hal+json;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Wed, 10 Aug 2016 07:37:16 GMT
-      Connection:
-      - close
-    body:
-      encoding: UTF-8
-      string: '{"uuid":"11e65eca-4af7-d795-bf1a-0242ac110002","version":0,"title":"Rspec
-        Flow","activeUsers":[],"type":"regular"}'
-    http_version:
-  recorded_at: Wed, 10 Aug 2016 07:37:16 GMT
-recorded_with: VCR 3.0.3

data/spec/cassettes/users/refresh/valid_user_uuid.yml

@@ -1,54 +0,0 @@
----
-http_interactions:
-- request:
-    method: post
-    uri: https://develop.lifen.fr/authentication/api/authenticate/third_party
-    body:
-      encoding: UTF-8
-      string: '{"accountUuid":"valid_uuid"}'
-    headers:
-      User-Agent:
-      - Faraday v0.9.2
-      Secret-Key:
-      - valid_secret_key
-      Content-Type:
-      - application/json
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      X-B3-Sampled:
-      - '1'
-      X-B3-Spanid:
-      - 510282ea864e9c04
-      X-B3-Traceid:
-      - 510282ea864e9c04
-      X-Content-Type-Options:
-      - nosniff
-      X-Xss-Protection:
-      - 1; mode=block
-      Cache-Control:
-      - no-cache, no-store, max-age=0, must-revalidate
-      Pragma:
-      - no-cache
-      Expires:
-      - '0'
-      Content-Type:
-      - application/hal+json;charset=UTF-8
-      Transfer-Encoding:
-      - chunked
-      Date:
-      - Wed, 07 Sep 2016 12:46:43 GMT
-    body:
-      encoding: UTF-8
-      string: '[{"uuid":"valid_uuid","version":0,"token":"2VHHqKwuYeTsi+N35FAyjhKK3LCVsXbZXqwYpJtCvgRXAYW5/JJxCtHD0O7or9ej/YGYg31tHQhbUiTH+4sCSUzPLkaqw0DSAzgAD1+mSOH9k6C4TggCEieUJqpzXR2ipJ2nt36eOgda8GuqXhvQKpkh5Y8lDbJZEN0G6rj+tTIHim+577ypcoJbSTgTGDnx9DtwkwK3iPZhZOPgh3VIUXcsCjV0LV3u","role":"THIRD_PARTY","profilePicUrl":"","firstName":"N/A","lastName":"N/A","locale":"fr","registered":true,"activated":true,"informed":false,"email":"valid-email-spec@domain.tld","default":true}]'
-    http_version:
-  recorded_at: Wed, 07 Sep 2016 12:46:40 GMT
-recorded_with: VCR 3.0.3