stormpath-sdk 1.6.0 → 1.7.0

data/lib/stormpath-sdk/error.rb

@@ -28,13 +28,24 @@ module Stormpath
 
     private
 
-      class NilError
-        def message; '' end
-        def status; -1 end
-        def code; -1 end
-        def developer_message; end
-        def more_info; end
-        def request_id; end
+    class NilError
+      def message
+        ''
       end
+
+      def status
+        -1
+      end
+
+      def code
+        -1
+      end
+
+      def developer_message; end
+
+      def more_info; end
+
+      def request_id; end
+    end
   end
 end

data/lib/stormpath-sdk/http/authc/sauthc1_signer.rb

@@ -21,26 +21,26 @@ module Stormpath
         include UUIDTools
         include Stormpath::Http::Utils
 
-        DEFAULT_ALGORITHM = "SHA256"
-        HOST_HEADER = "Host"
-        AUTHORIZATION_HEADER = "Authorization"
-        STORMPATH_DATE_HEADER = "X-Stormpath-Date"
-        ID_TERMINATOR = "sauthc1_request"
-        ALGORITHM = "HMAC-SHA-256"
-        AUTHENTICATION_SCHEME = "SAuthc1"
-        SAUTHC1_ID = "sauthc1Id"
-        SAUTHC1_SIGNED_HEADERS = "sauthc1SignedHeaders"
-        SAUTHC1_SIGNATURE = "sauthc1Signature"
-        DATE_FORMAT = "%Y%m%d"
-        TIMESTAMP_FORMAT = "%Y%m%dT%H%M%SZ"
-        #noinspection RubyConstantNamingConvention
-        NL = "\n"
-
-        def initialize(uuid_generator=UUID.method(:random_create))
+        DEFAULT_ALGORITHM = 'SHA256'.freeze
+        HOST_HEADER = 'Host'.freeze
+        AUTHORIZATION_HEADER = 'Authorization'.freeze
+        STORMPATH_DATE_HEADER = 'X-Stormpath-Date'.freeze
+        ID_TERMINATOR = 'sauthc1_request'.freeze
+        ALGORITHM = 'HMAC-SHA-256'.freeze
+        AUTHENTICATION_SCHEME = 'SAuthc1'.freeze
+        SAUTHC1_ID = 'sauthc1Id'.freeze
+        SAUTHC1_SIGNED_HEADERS = 'sauthc1SignedHeaders'.freeze
+        SAUTHC1_SIGNATURE = 'sauthc1Signature'.freeze
+        DATE_FORMAT = '%Y%m%d'.freeze
+        TIMESTAMP_FORMAT = '%Y%m%dT%H%M%SZ'.freeze
+        # noinspection RubyConstantNamingConvention
+        NL = "\n".freeze
+
+        def initialize(uuid_generator = UUID.method(:random_create))
           @uuid_generator = uuid_generator
         end
 
-        def sign_request request
+        def sign_request(request)
           request.http_headers.delete(Sauthc1Signer::AUTHORIZATION_HEADER)
           request.http_headers.delete(Sauthc1Signer::STORMPATH_DATE_HEADER)
 
@@ -56,9 +56,7 @@ module Stormpath
           # have to have it in the request by the time we sign.
           host_header = uri.host
 
-          unless default_port?(uri)
-            host_header << ":" << uri.port.to_s
-          end
+          host_header << ':' << uri.port.to_s unless default_port?(uri)
 
           request.http_headers.store HOST_HEADER, host_header
 
@@ -78,7 +76,7 @@ module Stormpath
                                signed_headers_string,
                                request_payload_hash_hex].join(NL)
 
-          id = [request.api_key.id, date_stamp, nonce, ID_TERMINATOR].join("/")
+          id = [request.api_key.id, date_stamp, nonce, ID_TERMINATOR].join('/')
 
           canonical_request_hash_hex = to_hex(hash_text(canonical_request))
 
@@ -93,16 +91,15 @@ module Stormpath
           signature = sign to_utf8(string_to_sign), k_signing, DEFAULT_ALGORITHM
           signature_hex = to_hex signature
 
-          authorization_header = AUTHENTICATION_SCHEME + " " +
-              create_name_value_pair(SAUTHC1_ID, id) + ", " +
-              create_name_value_pair(SAUTHC1_SIGNED_HEADERS, signed_headers_string) + ", " +
-              create_name_value_pair(SAUTHC1_SIGNATURE, signature_hex)
+          authorization_header = AUTHENTICATION_SCHEME + ' ' +
+                                 create_name_value_pair(SAUTHC1_ID, id) + ', ' +
+                                 create_name_value_pair(SAUTHC1_SIGNED_HEADERS, signed_headers_string) + ', ' +
+                                 create_name_value_pair(SAUTHC1_SIGNATURE, signature_hex)
 
           request.http_headers.store AUTHORIZATION_HEADER, authorization_header
         end
 
-
-        def to_hex data
+        def to_hex(data)
           result = ''
 
           data.each_byte do |val|
@@ -121,72 +118,69 @@ module Stormpath
 
         private
 
-          def canonicalize_query_string request
-            request.to_s_query_string true
-          end
+        def canonicalize_query_string(request)
+          request.to_s_query_string true
+        end
 
-          def hash_text text
-            Digest.digest DEFAULT_ALGORITHM, to_utf8(text)
-          end
+        def hash_text(text)
+          Digest.digest DEFAULT_ALGORITHM, to_utf8(text)
+        end
 
-          def sign data, key, algorithm
-            digest_data = to_utf8 data
-            digest = Digest.new(algorithm)
-            HMAC.digest(digest, key, digest_data)
-          end
+        def sign(data, key, algorithm)
+          digest_data = to_utf8 data
+          digest = Digest.new(algorithm)
+          HMAC.digest(digest, key, digest_data)
+        end
 
-          def to_utf8 str
-            #we ask for multi line UTF-8 text
-            str.scan(/./mu).join
-          end
+        def to_utf8(str)
+          # we ask for multi line UTF-8 text
+          str.scan(/./mu).join
+        end
 
-          def get_request_payload request
-            get_request_payload_without_query_params request
-          end
+        def get_request_payload(request)
+          get_request_payload_without_query_params request
+        end
 
-          def get_request_payload_without_query_params request
-            request.body || ''
-          end
+        def get_request_payload_without_query_params(request)
+          request.body || ''
+        end
 
-          def create_name_value_pair name, value
-            "#{name}=#{value}"
-          end
+        def create_name_value_pair(name, value)
+          "#{name}=#{value}"
+        end
 
-          def canonicalize_resource_path resource_path
-            if resource_path.nil? or resource_path.empty?
-              '/'
-            else
-              encode_url resource_path, true, true
-            end
+        def canonicalize_resource_path(resource_path)
+          if resource_path.nil? || resource_path.empty?
+            '/'
+          else
+            encode_url resource_path, true, true
           end
+        end
 
+        def canonicalize_headers(request)
+          sorted_headers = request.http_headers.keys.sort!
+          result = ''
 
-          def canonicalize_headers request
-            sorted_headers = request.http_headers.keys.sort!
-            result = ''
-
-            sorted_headers.each do |header|
-              result << header.downcase << ':' << request.http_headers[header].to_s
-              result << NL
-            end
-            result
+          sorted_headers.each do |header|
+            result << header.downcase << ':' << request.http_headers[header].to_s
+            result << NL
           end
+          result
+        end
 
-          def get_signed_headers request
-            sorted_headers = request.http_headers.keys.sort!
-            result = ''
-            sorted_headers.each do |header|
-              if result.empty?
-                result << header
-              else
-                result << ';' << header
-              end
+        def get_signed_headers(request)
+          sorted_headers = request.http_headers.keys.sort!
+          result = ''
+          sorted_headers.each do |header|
+            if result.empty?
+              result << header
+            else
+              result << ';' << header
             end
-            result.downcase
           end
-
-
-      end#Sauthc1Signer
-    end#Authc
-  end#Http
-end#Stormpath
+          result.downcase
+        end
+      end # Sauthc1Signer
+    end # Authc
+  end # Http
+end # Stormpath

data/lib/stormpath-sdk/http/http_client_request_executor.rb

@@ -21,11 +21,11 @@ module Stormpath
 
       def initialize(options = {})
         @signer = Sauthc1Signer.new
-        @http_client = HTTPClient.new options[:proxy]
+        @http_client = HTTPClient.new(options[:proxy])
       end
 
       def execute_request(request, redirects_limit = 10)
-        assert_not_nil request, "Request argument cannot be null."
+        assert_not_nil request, 'Request argument cannot be null.'
 
         @redirect_response = nil
 
@@ -37,7 +37,7 @@ module Stormpath
                    request.href
                  end
 
-        if request.http_headers["Content-Type"] == "application/x-www-form-urlencoded"
+        if request.http_headers['Content-Type'] == 'application/x-www-form-urlencoded'
           @http_client.set_auth(request.href, request.api_key.id, request.api_key.secret)
         end
 
@@ -45,17 +45,19 @@ module Stormpath
 
         response = method.call domain, request.body, request.http_headers
 
-        if response.redirect? and redirects_limit > 0
+        if response.redirect? && redirects_limit > 0
           request.href = response.http_header['location'][0]
           redirects_limit -= 1
           @redirect_response = execute_request request, redirects_limit
           return @redirect_response
         end
 
-        Response.new response.http_header.status_code,
-                     response.http_header.body_type,
-                     response.content,
-                     response.http_header.body_size
+        Response.new(
+          response.http_header.status_code,
+          response.http_header.body_type,
+          response.content,
+          response.http_header.body_size
+        )
       end
     end
   end

data/lib/stormpath-sdk/http/response.rb

@@ -16,11 +16,10 @@
 module Stormpath
   module Http
     class Response
-
       attr_reader :http_status, :body
       attr_accessor :headers
 
-      def initialize http_status, content_type, body, content_length
+      def initialize(http_status, content_type, body, content_length)
         @http_status = http_status
         @headers = HTTP::Message::Headers.new
         @body = body
@@ -29,17 +28,16 @@ module Stormpath
       end
 
       def client_error?
-        http_status >= 400 and http_status < 500
+        (http_status >= 400) && http_status < 500
       end
 
       def server_error?
-        http_status >= 500 and http_status < 600
+        (http_status >= 500) && http_status < 600
       end
 
       def error?
-        client_error? or server_error?
+        client_error? || server_error?
       end
-
     end
   end
-end
+end

data/lib/stormpath-sdk/id_site/id_site_result.rb

@@ -3,14 +3,14 @@ module Stormpath
     class IdSiteResult
       attr_accessor :jwt_response, :account_href, :state, :status, :is_new_account
 
-      alias_method :new_account?, :is_new_account
+      alias new_account? is_new_account
 
       def initialize(jwt_response)
         @jwt_response = jwt_response
-        @account_href = jwt_response["sub"]
-        @status = jwt_response["status"]
-        @state = jwt_response["state"]
-        @is_new_account = jwt_response["isNewSub"]
+        @account_href = jwt_response['sub']
+        @status = jwt_response['status']
+        @state = jwt_response['state']
+        @is_new_account = jwt_response['isNewSub']
       end
 
       def jwt_invalid?(api_key_id)
@@ -19,4 +19,3 @@ module Stormpath
     end
   end
 end
-

data/lib/stormpath-sdk/oauth/access_token_authentication_result.rb

@@ -3,12 +3,10 @@ module Stormpath
     class AccessTokenAuthenticationResult < Stormpath::Resource::Instance
       prop_reader :access_token, :refresh_token, :token_type, :expires_in, :stormpath_access_token_href
 
-      alias_method :href, :stormpath_access_token_href
+      alias href stormpath_access_token_href
 
       def delete
-        unless href.respond_to?(:empty) and href.empty?
-          data_store.delete self
-        end
+        data_store.delete(self) unless href.respond_to?(:empty) && href.empty?
       end
 
       def account
@@ -22,11 +20,9 @@ module Stormpath
       end
 
       def jwt_response
-        begin
-          JWT.decode(access_token, data_store.api_key.secret).first
-        rescue JWT::ExpiredSignature => error
-          raise Stormpath::Oauth::Error.new(:jwt_expired)
-        end
+        JWT.decode(access_token, data_store.api_key.secret).first
+      rescue JWT::ExpiredSignature => error
+        raise Stormpath::Oauth::Error, :jwt_expired
       end
     end
   end

data/lib/stormpath-sdk/oauth/authenticator.rb

@@ -8,14 +8,14 @@ module Stormpath
       end
 
       def authenticate(parent_href, request)
-        assert_not_nil parent_href, "parent_href must be specified"
+        assert_not_nil parent_href, 'parent_href must be specified'
 
         clazz = GRANT_CLASSES_BY_TYPE[request.grant_type.to_sym]
         attempt = @data_store.instantiate(clazz)
         attempt.set_options(request)
         href = parent_href + '/oauth/token'
 
-        @data_store.create href, attempt, Stormpath::Oauth::AccessTokenAuthenticationResult
+        @data_store.create(href, attempt, Stormpath::Oauth::AccessTokenAuthenticationResult)
       end
 
       GRANT_CLASSES_BY_TYPE = {

data/lib/stormpath-sdk/oauth/error.rb

@@ -26,28 +26,28 @@ module Stormpath
           },
           jwt_expired: {
             status: 400,
-            code: 10011,
+            code: 10_011,
             message: 'Token is invalid',
             developer_message: 'Token is no longer valid because it has expired',
             request_id: 'Oauth error UUID'
           },
           jwt_invalid: {
             status: 400,
-            code: 10012,
+            code: 10_012,
             message: 'Token is invalid',
             developer_message: 'Token is invalid because the issued at time (iat) is after the current time',
             request_id: 'Oauth error UUID'
           },
           jwt_invalid_issuer: {
             status: 400,
-            code: 10014,
+            code: 10_014,
             message: 'Token is invalid',
             developer_message: 'Token is invalid because the issuer of the token does not match the Application validating the token.',
             request_id: 'Oauth error UUID'
           },
           jwt_invalid_signature: {
             status: 400,
-            code: 10017,
+            code: 10_017,
             message: 'Token is invalid',
             developer_message: 'Token is invalid because verifying the signature of a JWT failed.',
             request_id: 'Oauth error UUID'

data/lib/stormpath-sdk/oauth/id_site_grant_request.rb

@@ -5,7 +5,7 @@ module Stormpath
 
       def initialize(token)
         @token = token
-        @grant_type = "id_site_token"
+        @grant_type = 'id_site_token'
       end
     end
   end

data/lib/stormpath-sdk/oauth/password_grant_request.rb

@@ -6,7 +6,7 @@ module Stormpath
       def initialize(username, password, options = {})
         @username = username
         @password = password
-        @grant_type = "password"
+        @grant_type = 'password'
         @organization_name_key = options[:organization_name_key]
       end
     end