caren-api 0.4.2 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.2
1
+ 0.4.3
data/caren-api.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{caren-api}
8
- s.version = "0.4.2"
8
+ s.version = "0.4.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Andre Foeken"]
@@ -26,6 +26,8 @@ Gem::Specification.new do |s|
26
26
  "VERSION",
27
27
  "caren-api.gemspec",
28
28
  "certs/caren-api.pub",
29
+ "certs/example",
30
+ "certs/example.pub",
29
31
  "init.rb",
30
32
  "lib/caren-api.rb",
31
33
  "lib/caren/base.rb",
data/certs/example ADDED
@@ -0,0 +1,9 @@
1
+ -----BEGIN RSA PRIVATE KEY-----
2
+ MIIBOwIBAAJBAK1Ya72vzsFU0UWVx815q2SU4AUVG8MFYomzp23wJp4fplvGOMPA
3
+ eZpFgAcO+3xAsI8zj/RObU5mj66styu55X0CAwEAAQJAT8y2vLokekfrlxcexe7P
4
+ AhyvDGftQdhGxpGX8Dpv7LZvREAl6T8/8V3MYCyPSHM30pF4asSTSKhXCwTIDrDY
5
+ AQIhANdqIAJAsk3B62uNVSi51wiCV7+SVQeFZ2ToBx9JuHB9AiEAzgE3V+GN4ZO1
6
+ WXpP2Nw4eT9VvRop4cLbS0NQSlleWQECIBoRirwbDjjgvdevK94Y10/9Thct40Jc
7
+ v41zkuETb9GVAiEAllrq4th8bq0ZSqJsDtLE4THpySiEcwN+fRM3UdyicQECIQCT
8
+ PTGO73T/BixmylPe3vO/D4fF+bF6TSUqHXX75y33wg==
9
+ -----END RSA PRIVATE KEY-----
data/certs/example.pub ADDED
@@ -0,0 +1,4 @@
1
+ -----BEGIN RSA PUBLIC KEY-----
2
+ MEgCQQCtWGu9r87BVNFFlcfNeatklOAFFRvDBWKJs6dt8CaeH6ZbxjjDwHmaRYAH
3
+ Dvt8QLCPM4/0Tm1OZo+urLcrueV9AgMBAAE=
4
+ -----END RSA PUBLIC KEY-----
@@ -20,7 +20,7 @@ class Caren::CareProvider < Caren::Base
20
20
  :min_start, # String (07:00)
21
21
  :show_employee_name_as_title, # Boolean
22
22
  :communication, # Boolean
23
- :push_hook_url, # String (Optional url to push api acceptor)
23
+ :api_push_support, # Boolean
24
24
  :api_url # String (Required url to api resources)
25
25
  ]
26
26
  end
@@ -55,7 +55,9 @@ class Caren::CareProvider < Caren::Base
55
55
  :max_start => self.max_start,
56
56
  :show_employee_name_as_title => self.show_employee_name_as_title,
57
57
  :show_employee_names => self.show_employee_names,
58
- :communication => self.communication }
58
+ :communication => self.communication,
59
+ :api_push_support => self.api_push_support,
60
+ :api_url => self.api_url }
59
61
  end
60
62
 
61
63
  def to_logo_xml logo_hash_or_path
data/lib/caren/caren.rb CHANGED
@@ -118,8 +118,8 @@ module Caren
118
118
 
119
119
  # Sign your string and timestamp using private key
120
120
  # Timestamp is UNIX timestamp seconds since 1970
121
- def sign timestamp, string=nil
122
- encrypted_digest = self.private_key.sign( "sha1", string.to_s + timestamp.to_s )
121
+ def sign timestamp, string=nil, private_key=self.private_key
122
+ encrypted_digest = private_key.sign( "sha1", string.to_s + timestamp.to_s )
123
123
  signature = CGI.escape(Base64.encode64(encrypted_digest))
124
124
  return signature
125
125
  end
@@ -131,9 +131,9 @@ module Caren
131
131
  end
132
132
 
133
133
  # Verify the signature using the caren public key
134
- def verify_signature signature, timestamp, string=nil
135
- signature = Base64.decode64(CGI.unescape(signature))
136
- self.caren_public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
134
+ def verify_signature signature, timestamp, string=nil, public_key=self.caren_public_key
135
+ signature = Base64.decode64(CGI.unescape(signature.to_s))
136
+ public_key.verify( "sha1", signature, string.to_s + timestamp.to_s )
137
137
  end
138
138
 
139
139
  private
@@ -150,6 +150,7 @@ module Caren
150
150
  errors << Caren::Error.new( error.attributes["category"], error.text.strip )
151
151
  end
152
152
  end
153
+ y errors
153
154
  raise Caren::Exceptions::ServerSideError.new(errors)
154
155
  end
155
156
 
metadata CHANGED
@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 4
8
- - 2
8
+ - 3
9
9
  segments_generated: true
10
- version: 0.4.2
10
+ version: 0.4.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Andre Foeken
@@ -167,6 +167,8 @@ files:
167
167
  - VERSION
168
168
  - caren-api.gemspec
169
169
  - certs/caren-api.pub
170
+ - certs/example
171
+ - certs/example.pub
170
172
  - init.rb
171
173
  - lib/caren-api.rb
172
174
  - lib/caren/base.rb