allscripts_unity_client 5.0.0.pre.alpha.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81f49d5a27c7727f261d6aed0f49e8064449989123ce839646df3b14bc475a6f
-  data.tar.gz: 8f3ef4a6cf3c23e7fab0250b15b38619ff7bb82d3d056b640947700f8df3c099
+  metadata.gz: d96b72062dd8b2c9d1d6c6a990b1b18597af5ec2bcfba97b66074ae1837d95b5
+  data.tar.gz: 69910ee5c8de3126c2a4a55227189b0bd0aa2dc8045a1eb4b564e2b7911f3f71
 SHA512:
-  metadata.gz: a85fc9e1065fc894ad886fe262aa9fc6926f3913f3e7512612f5ca3fedc5129359ae92eb2b824d5ee5b3928ab302e5cc10183f407901fbf95c4a642e35745bdd
-  data.tar.gz: ac7fb5010ea2726aaf2838b750e36dea8fa21e8bb9a4853f43fbedb4a13ee126c6d5069dab7cb85f68dedbb239364a477495bd6f4d9715c762d3f6491c7db9b3
+  metadata.gz: 4175b8a59a62ffc50fa8685b711c00e74f6fd46352420bb1cb8a4711deca43970990536c9143f3e508ec35910f35ecf11e251fc27db8033cc40bcec014b48607
+  data.tar.gz: 956d56efb176d8591293158f1efb4dcf51c74403d31cabb3449b634192be67d45e9f54003c1cacebcdc3ff9cae33ebe6a5b398ad3721169b4a97f1887ce25182

data/lib/allscripts_unity_client/client_driver.rb

@@ -60,11 +60,11 @@ module AllscriptsUnityClient
     end
 
     def log_info(message)
-      if @options.logger? && !message.nil?
-        message += " #{@timer} seconds" unless @timer.nil?
-        @timer = nil
-        @options.logger.info(message)
-      end
+      log(:info, message)
+    end
+
+    def log_warn(message)
+      log(:warn, message)
     end
 
     def start_timer
@@ -85,5 +85,15 @@ module AllscriptsUnityClient
 
       GetSecurityTokenError.new(error_message)
     end
+
+    private
+
+    def log(level, message)
+      if @options.logger? && !message.nil?
+        message += " #{@timer} seconds" unless @timer.nil?
+        @timer = nil
+        @options.logger.send(level, message)
+      end
+    end
   end
 end

data/lib/allscripts_unity_client/json_client_driver.rb

@@ -8,6 +8,7 @@ module AllscriptsUnityClient
     attr_accessor :json_base_url, :connection
 
     UNITY_JSON_ENDPOINT = '/Unity/UnityService.svc/json'
+    TOKEN_REGEX = /^"?(\w|-)+"?$/
 
     def initialize(options)
       super
@@ -48,7 +49,7 @@ module AllscriptsUnityClient
 
     def magic(parameters = {})
       unless user_authenticated? || parameters[:action] == 'GetUserAuthentication'
-        log_info("Unauthenticated access of #{parameters[:action]} for #{@options.base_unity_url}")
+        raise UnauthenticatedError, "#{parameters[:action]} for #{@options.base_unity_url}"
       end
 
       request = JSONUnityRequest.new(parameters, @options.timezone, @options.appname, @security_token)
@@ -84,10 +85,10 @@ module AllscriptsUnityClient
 
       if response[:valid_user] == 'YES'
         @user_authentication = response
-        log_info("Successful authentication attempt for #{@options.base_unity_url}")
+        log_info("allscripts_unity_client authentication attempt: success #{@options.base_unity_url}")
         return true
       elsif response[:valid_user] == 'NO'
-        log_info("Unsuccessful authentication attempt for #{@options.base_unity_url}")
+        log_warn("allscripts_unity_client authentication attempt: failure #{@options.base_unity_url}")
         return false
       else
         raise StandardError.new('Unexpected response from the server')
@@ -113,10 +114,10 @@ module AllscriptsUnityClient
       log_get_security_token
       log_info("Response Status: #{response.status}")
 
-      if response.status != 200
+      if response.status != 200 || TOKEN_REGEX.match(response.body).nil?
         raise make_get_security_token_error
       else
-        raise_if_response_error(response)
+        raise_if_response_error(response.body)
 
         @security_token = response.body
       end

data/lib/allscripts_unity_client/version.rb

@@ -1,3 +1,3 @@
 module AllscriptsUnityClient
-  VERSION = '5.0.0-alpha.1'.freeze
+  VERSION = '5.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allscripts_unity_client
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.alpha.1
+  version: 5.0.0
 platform: ruby
 authors:
 - healthfinch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -260,9 +260,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: