lifen 0.2.1 → 1.0.0

data/spec/cassettes/users/{refresh_unread_messages → status/refresh}/invalid_token.yml

@@ -8,15 +8,15 @@ http_interactions:
       string: "{}"
     headers:
       User-Agent:
-      - Faraday v0.9.2
-      X-Auth-Token:
-      - invalid_token
+      - Faraday v0.10.0
+      Authorization:
+      - Bearer invalid_token
       Content-Type:
       - application/json
+      Accept:
+      - application/json
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
   response:
     status:
       code: 401
@@ -27,30 +27,34 @@ http_interactions:
       X-B3-Sampled:
       - '1'
       X-B3-Spanid:
-      - 2b0ef6c798cd0830
+      - 62fa861f3ed63e22
       X-B3-Traceid:
-      - 2b0ef6c798cd0830
+      - 62fa861f3ed63e22
       X-Content-Type-Options:
       - nosniff
       X-Xss-Protection:
       - 1; mode=block
       Cache-Control:
       - no-cache, no-store, max-age=0, must-revalidate
+      - no-store
       Pragma:
       - no-cache
+      - no-cache
       Expires:
       - '0'
+      Www-Authenticate:
+      - 'Bearer realm="oauth", error="invalid_token", error_description="Invalid access
+        token: invalid_token"'
       Content-Type:
       - application/json;charset=UTF-8
       Transfer-Encoding:
       - chunked
       Date:
-      - Tue, 22 Nov 2016 14:27:24 GMT
-      Connection:
-      - close
+      - Fri, 09 Dec 2016 13:57:42 GMT
     body:
       encoding: UTF-8
-      string: '{"timestamp":"2016-11-22T14:27:24.255+0000","status":401,"error":"Unauthorized","code":"error.401","X-B3-TraceId":"2b0ef6c798cd0830","X-B3-SpanId":"2b0ef6c798cd0830"}'
+      string: '{"error":"invalid_token","error_description":"Invalid access token:
+        invalid_token"}'
     http_version:
-  recorded_at: Tue, 22 Nov 2016 14:26:56 GMT
+  recorded_at: Fri, 09 Dec 2016 13:55:51 GMT
 recorded_with: VCR 3.0.3

data/spec/cassettes/users/{refresh_unread_messages → status/refresh}/valid_token.yml

@@ -8,15 +8,15 @@ http_interactions:
       string: "{}"
     headers:
       User-Agent:
-      - Faraday v0.9.2
-      X-Auth-Token:
-      - valid_token
+      - Faraday v0.10.0
+      Authorization:
+      - Bearer valid_token
       Content-Type:
       - application/json
+      Accept:
+      - application/json
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
   response:
     status:
       code: 200
@@ -27,9 +27,9 @@ http_interactions:
       X-B3-Sampled:
       - '1'
       X-B3-Spanid:
-      - b26c426aabc12b98
+      - e12babb877ed2906
       X-B3-Traceid:
-      - b26c426aabc12b98
+      - e12babb877ed2906
       X-Content-Type-Options:
       - nosniff
       X-Xss-Protection:
@@ -41,16 +41,14 @@ http_interactions:
       Expires:
       - '0'
       Content-Type:
-      - application/hal+json;charset=UTF-8
+      - application/json;charset=UTF-8
       Transfer-Encoding:
       - chunked
       Date:
-      - Tue, 22 Nov 2016 14:27:24 GMT
-      Connection:
-      - close
+      - Fri, 09 Dec 2016 13:58:05 GMT
     body:
       encoding: UTF-8
       string: '{"unread":2}'
     http_version:
-  recorded_at: Tue, 22 Nov 2016 14:26:56 GMT
+  recorded_at: Fri, 09 Dec 2016 13:56:13 GMT
 recorded_with: VCR 3.0.3

data/spec/cassettes/users/token/refresh/invalid_user_uuid.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://develop.lifen.fr/oauth/admin/third_party/access_token?accountUuid=invalid-user-uuid
+    body:
+      encoding: UTF-8
+      string: "{}"
+    headers:
+      User-Agent:
+      - Faraday v0.10.0
+      Authorization:
+      - Bearer valid_application_access_token
+      Content-Type:
+      - application/json
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 500
+      message: Internal Server Error
+    headers:
+      Server:
+      - Apache-Coyote/1.1
+      Content-Type:
+      - application/json;charset=UTF-8
+      Transfer-Encoding:
+      - chunked
+      Date:
+      - Fri, 09 Dec 2016 13:49:20 GMT
+    body:
+      encoding: UTF-8
+      string: '{"timestamp":"2016-12-09T13:49:20.369+0000","status":500,"error":"Internal
+        Server Error","exception":"java.lang.IllegalArgumentException","message":"Invalid
+        UUID string: invalid-user-uuid","path":"/oauth2/oauth/admin/third_party/access_token"}'
+    http_version:
+  recorded_at: Fri, 09 Dec 2016 13:47:29 GMT
+recorded_with: VCR 3.0.3

data/spec/cassettes/users/{refresh/invalid_user_uuid.yml → token/refresh/valid_user_uuid.yml}

@@ -2,42 +2,44 @@
 http_interactions:
 - request:
     method: post
-    uri: https://develop.lifen.fr/authentication/api/authenticate/third_party
+    uri: https://develop.lifen.fr/oauth/admin/third_party/access_token?accountUuid=11e6be14-8267-25ee-a3bd-0242ac110002
     body:
       encoding: UTF-8
-      string: '{"accountUuid":"invalid-user-uuid"}'
+      string: "{}"
     headers:
       User-Agent:
-      - Faraday v0.9.2
-      Secret-Key:
-      - valid_secret_key
+      - Faraday v0.10.0
+      Authorization:
+      - Bearer valid_application_access_token
       Content-Type:
       - application/json
+      Accept:
+      - application/json
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      Accept:
-      - "*/*"
   response:
     status:
-      code: 400
-      message: Bad Request
+      code: 200
+      message: OK
     headers:
       Server:
       - Apache-Coyote/1.1
       X-B3-Sampled:
       - '1'
       X-B3-Spanid:
-      - 7911bb796330c549
+      - 8a24ea0924af60c5
       X-B3-Traceid:
-      - 7911bb796330c549
+      - 8a24ea0924af60c5
       X-Content-Type-Options:
       - nosniff
       X-Xss-Protection:
       - 1; mode=block
       Cache-Control:
       - no-cache, no-store, max-age=0, must-revalidate
+      - no-store
       Pragma:
       - no-cache
+      - no-cache
       Expires:
       - '0'
       Content-Type:
@@ -45,11 +47,10 @@ http_interactions:
       Transfer-Encoding:
       - chunked
       Date:
-      - Wed, 07 Sep 2016 12:46:43 GMT
+      - Fri, 09 Dec 2016 13:50:37 GMT
     body:
       encoding: UTF-8
-      string: '{"timestamp":"2016-09-07T12:46:43.966+0000","status":400,"error":"Bad
-        Request","code":"error.badrequest","X-B3-TraceId":"7911bb796330c549","X-B3-SpanId":"7911bb796330c549"}'
+      string: '{"access_token":"762dd9a0-d0cc-45c9-b6e6-faf988167efb","token_type":"bearer","expires_in":86399,"scope":"public"}'
     http_version:
-  recorded_at: Wed, 07 Sep 2016 12:46:39 GMT
+  recorded_at: Fri, 09 Dec 2016 13:48:46 GMT
 recorded_with: VCR 3.0.3

data/spec/flows_spec.rb

@@ -2,17 +2,22 @@ require 'spec_helper'
 
 describe Lifen::Flow do
 
-	let(:user) { Lifen::User.new(token: "valid_token", uuid: "25588996-4ff1-2dbb-9643-eabb809fa654") }
+  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) }
+
+	let(:user) { Lifen::User.new(token: valid_token, uuid: "25588996-4ff1-2dbb-9643-eabb809fa654") }
 
   describe "index" do
 
   	context "invalid token" do
 	    it 'raises an error' do
-	    	user = Lifen::User.new(token: "invalid-token")
+	    	user = Lifen::User.new(token: invalid_token)
 
 	    	expect{
 		    	VCR.use_cassette "flows/invalid_token" do
-		        @flows = user.flows
+		        user.flows
 		      end
 		      }.to raise_error(Lifen::UnauthorizedError)
 	    end
@@ -24,7 +29,7 @@ describe Lifen::Flow do
 
         expect{
           VCR.use_cassette "flows/internal_error" do
-            @flows = user.flows
+            user.flows
           end
           }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: 2e2eac3a7e3fa2)")
       end
@@ -32,7 +37,7 @@ describe Lifen::Flow do
       it 'raises an error (without trace ID)' do
         expect{
           VCR.use_cassette "flows/internal_error_without_trace_id" do
-            @flows = user.flows
+            user.flows
           end
           }.to raise_error(Lifen::Error, "Error 500, Internal server error (trace ID: unknown)")
       end
@@ -41,6 +46,8 @@ describe Lifen::Flow do
 
   	context "valid token" do
 
+      # let(:valid_token_value)     { "REPLACE_ME" }
+
 	    before(:each) do
 	      VCR.use_cassette "flows/valid_token" do
 	        @flows = user.flows
@@ -49,12 +56,12 @@ describe Lifen::Flow do
 	      @flow = @flows.first
 	    end
 
-	    it { expect(@flows.size).to eq(3) }
+	    it { expect(@flows.size).to eq(1) }
 
 	    it 'has valid attributes' do
 	    	expect(@flow.user).to eq(user)
-	    	expect(@flow.uuid).to eq("11e5c68b-85e9-96e8-9d33-027026ae8c87")
-	    	expect(@flow.title).to be_nil
+	    	expect(@flow.uuid).to eq("11e6be18-7a35-d759-9177-0242ac110002")
+	    	expect(@flow.title).to eq("Rspec Flow")
 	    end
 
   	end
@@ -62,6 +69,9 @@ describe Lifen::Flow do
   end
 
   describe 'create' do
+
+    # let(:valid_token_value)     { "REPLACE_ME" }
+
   	let(:flow) { Lifen::Flow.new(user: user, title: "Rspec Flow") }
 
   	it 'creates a flow' do
@@ -77,10 +87,10 @@ describe Lifen::Flow do
 
     context 'attaching users at the same time' do
 
-      let(:user) { Lifen::User.new(token: "valid_token", uuid: "11e6b876-ba09-1d98-9f4c-0242ac110002") }
-      let(:other_user) { Lifen::User.new(uuid: "11e6b877-2997-01eb-9f4c-0242ac110002") }
+      let(:user) { Lifen::User.new(token: valid_token, uuid: "11e6be14-8267-25ee-a3bd-0242ac110002") }
+      let(:other_user) { Lifen::User.new(uuid: "11e6be15-0fb1-0a21-a3bd-0242ac110002") }
 
-      let(:flow) { Lifen::Flow.new(user: user, title: "Rspec Flow", active_users: [other_user]) }
+      let(:flow) { Lifen::Flow.new(user: user, title: "Rspec Flow", users: [other_user]) }
 
       it 'creates a flow with attached users' do
 
@@ -88,13 +98,13 @@ describe Lifen::Flow do
           flow.create
         end
 
-        expect(flow.active_users.size).to eq(2)
-        first_user = flow.active_users.first
+        expect(flow.users.size).to eq(2)
+        first_user = flow.users.first
 
-        expect(first_user.uuid).to eq("11e6b876-ba09-1d98-9f4c-0242ac110002")
-        expect(first_user.first_name).to eq("User")
+        expect(first_user.uuid).to eq("11e6be14-8267-25ee-a3bd-0242ac110002")
+        expect(first_user.first_name).to eq("Existing")
 
-        expect(flow.active_users.last.uuid).to eq("11e6b877-2997-01eb-9f4c-0242ac110002")
+        expect(flow.users.last.uuid).to eq("11e6be15-0fb1-0a21-a3bd-0242ac110002")
       end
 
     end
@@ -102,13 +112,15 @@ describe Lifen::Flow do
 
   describe 'attach_users' do
 
+    # let(:valid_token_value)     { "REPLACE_ME" }
+
   	context 'invalid flow uuid' do
   		let(:flow) { Lifen::Flow.new(uuid: "invalid-uuid", user: user) }
 
   		it 'raises an error' do
   			expect{
 		    	VCR.use_cassette "flows/attach_users/invalid_flow_uuid" do
-		       	flow.attach_users!(user)
+		       	flow.attach_users(user)
 		      end
 		      }.to raise_error(Lifen::InvalidParamsError)
   		end
@@ -116,7 +128,9 @@ describe Lifen::Flow do
   	end
 
   	context 'valid flow uuid' do
-  		let(:flow) { Lifen::Flow.new(uuid: "11e65eca-4af7-d795-bf1a-0242ac110002", user: user) }
+
+  		let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
+      let(:other_user) { Lifen::User.new(uuid: "11e6be15-0fb1-0a21-a3bd-0242ac110002") }
 
   		context 'invalid user params' do
 
@@ -125,7 +139,7 @@ describe Lifen::Flow do
 
 	  			expect{
 			    	VCR.use_cassette "flows/attach_users/invalid_user_uuid" do
-			       	flow.attach_users!(invalid_user)
+			       	flow.attach_users(invalid_user)
 			      end
 			    }.to raise_error(Lifen::InvalidParamsError)
 	  		end
@@ -133,11 +147,12 @@ describe Lifen::Flow do
 
   		it 'attaches a user' do
   			VCR.use_cassette "flows/attach_users/valid" do
-	       	flow.attach_users!(user)
+	       	flow.attach_users(other_user)
 	      end
 
-        expect(flow.active_users.size).to eq(1)
-        expect(flow.active_users.first.uuid).to eq("25588996-4ff1-2dbb-9643-eabb809fa654")
+        expect(flow.users.size).to eq(2)
+        expect(flow.users.first.uuid).to eq("11e6be14-8267-25ee-a3bd-0242ac110002")
+        expect(flow.users.first.first_name).to eq("Existing")
   		end
 
   	end
@@ -146,15 +161,18 @@ describe Lifen::Flow do
 
   describe 'detach_users' do
 
+    # let(:valid_token_value)     { "REPLACE_ME" }
+
   	context 'valid flow uuid' do
-  		let(:flow) { Lifen::Flow.new(uuid: "11e65eca-4af7-d795-bf1a-0242ac110002", user: user) }
+  		let(:flow) { Lifen::Flow.new(uuid: "11e6be18-7a35-d759-9177-0242ac110002", user: user) }
+      let(:other_user) { Lifen::User.new(uuid: "11e6be15-0fb1-0a21-a3bd-0242ac110002") }
 
   		it 'detaches a users' do
   			VCR.use_cassette "flows/detach_users/valid" do
-	       	flow.detach_users!(user)
+	       	flow.detach_users(other_user)
 	      end
 
-        expect(flow.active_users.size).to eq(0)
+        expect(flow.users.size).to eq(1)
   		end
 
       # it 'raises an error if the error is not detached' do

data/spec/messages_spec.rb

@@ -2,9 +2,14 @@ require 'spec_helper'
 
 describe Lifen::Message do
 
-	let(:user)      { Lifen::User.new(token: "valid_token") }
-  let(:flow)      { Lifen::Flow.new(user: user, uuid: "11e6b870-37a5-59af-ac0e-0242ac110002") }
-  let(:message)   { Lifen::Message.new(flow: flow, content: "Bonjour Lifen") }
+  let(:valid_token_value)   { "valide_token" }
+  # let(:valid_token_value)   { "REPLACE_ME" }
+
+  let(:valid_token)         { Lifen::Token.new(value: valid_token_value, expires_at: Time.now.to_i + 60) }
+	let(:user)                { Lifen::User.new(token: valid_token) }
+
+  let(:flow)                { Lifen::Flow.new(user: user, uuid: "11e6be18-7a35-d759-9177-0242ac110002") }
+  let(:message)             { Lifen::Message.new(flow: flow, content: "Bonjour Lifen") }
 
   describe "create" do
 
@@ -16,10 +21,10 @@ describe Lifen::Message do
           message.create
         end
 
-	    	expect(message.uuid).to eq("11e6b871-1e02-9662-ac0e-0242ac110002")
+	    	expect(message.uuid).to eq("11e6be20-5647-8f9b-9177-0242ac110002")
         expect(message.type).to eq("regular")
         expect(message.flow).to eq(flow)
-        expect(message.sent_at.to_date).to eq Date.new(2016, 12, 2)
+        expect(message.sent_at.to_date).to eq Date.new(2016, 12, 9)
 
 	    end
 

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ RSpec.configure do |c|
   c.before(:each) do
   	Lifen.configure do |config|
 			config.site = "https://develop.lifen.fr/"
-      config.secret_key = "valid_secret_key"
+      config.application_access_token = "valid_application_access_token"
 		end
   end
 end