miiCardConsumers 2.3.0 → 2.4.0

data/lib/certs/sts.miicard.com.pem

@@ -0,0 +1,98 @@
+-----BEGIN CERTIFICATE-----
+MIIGCzCCBPOgAwIBAgIQOUeVqa/DtbhT+rwGo2fFdDANBgkqhkiG9w0BAQUFADCB
+vjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE4MDYGA1UEAxMv
+VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBTR0MgQ0Ew
+HhcNMTIwNzEzMDAwMDAwWhcNMTQwNzEzMjM1OTU5WjCCATUxEzARBgsrBgEEAYI3
+PAIBAxMCR0IxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMREwDwYDVQQF
+EwhTQzQwMDQ1OTELMAkGA1UEBhMCR0IxEzARBgNVBAgUCk1pZGxvdGhpYW4xEjAQ
+BgNVBAcUCUVkaW5idXJnaDEYMBYGA1UEChQPbWlpQ2FyZCBMaW1pdGVkMTUwMwYD
+VQQLFCxUZXJtcyBvZiB1c2UgYXQgd3d3LnZlcmlzaWduLmNvLnVrL3JwYSAoYykw
+NTEiMCAGA1UECxMZQXV0aGVudGljYXRlZCBieSBWZXJpU2lnbjEnMCUGA1UECxMe
+TWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMRgwFgYDVQQDFA9zdHMubWlp
+Y2FyZC5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDApAjYwzON
+QgH2RO/G7fCs5uENV7mID0hlKw8O5rLfhGdIRrEAb8Lupa9uQAPo0bA4zXyH/JE1
+JxDIdo1YL31Os6qP3wfoAnXKWB8Scz9Jk4mggmhJn+WLD0fHhmzKvY1Ac0bOrMqR
+wq5FNcQfxNAUFKTwGuYoVBYobVJuBBwXMXCDrCEjsqsmnQ9SdTga8OONFQKdN678
+NgyZEGLQrNUmwZQz93E6Hi4/1+1OebjtFmungFJkSQTG6un9SqtYAWGCZS+Dcgn7
+p5K/h/bmAY3IisuSS/BnZPmBRPKc+mf0EzztY6aGv0O22J9sG+ipvwHHkADN89Qi
+69/gS1FXjB1ZAgMBAAGjggGJMIIBhTAaBgNVHREEEzARgg9zdHMubWlpY2FyZC5j
+b20wCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwRAYDVR0gBD0wOzA5BgtghkgB
+hvhFAQcXBjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy52ZXJpc2lnbi5jb20v
+Y3BzMD4GA1UdHwQ3MDUwM6AxoC+GLWh0dHA6Ly9FVkludGwtY3JsLnZlcmlzaWdu
+LmNvbS9FVkludGwyMDA2LmNybDA0BgNVHSUELTArBggrBgEFBQcDAQYIKwYBBQUH
+AwIGCWCGSAGG+EIEAQYKKwYBBAGCNwoDAzAfBgNVHSMEGDAWgBROQ8gddu83U3pP
+8lhvlPM44tW93zBvBggrBgEFBQcBAQRjMGEwJAYIKwYBBQUHMAGGGGh0dHA6Ly9v
+Y3NwLnZlcmlzaWduLmNvbTA5BggrBgEFBQcwAoYtaHR0cDovL0VWSW50bC1haWEu
+dmVyaXNpZ24uY29tL0VWSW50bDIwMDYuY2VyMA0GCSqGSIb3DQEBBQUAA4IBAQBH
+D6dBvAlKkvXnKQh4bhwj+4s0sE8vMWj+0k3gezFAU1P6KUvu2rB0CwwrsR1DOnQD
+B5FJP0ZJmNnN/jCjZcZlJiQNNm29VNuhUKmCy5V5DpOY1gNg9HVMzheVIQl3NG0B
+BEqFG41F7NtR3+fZnUFywpGrrANWzh7G2dBnEF2vKgSw2zoFs8tC0hc5MOzW3ff6
+FcDOX3zKZWP9NTJDfRv0Hk12IEs0+qToiyByHPCjub5RThaycgfIwu/K9KlGLcco
+ph3sdlqg+WzieiP3C5ufdWtyfKSOkdHlOQWRiBU/Vz6dAZ+GhhghWiJU0o9dQ5lB
+UhJXUKCEU/JHTepCLSgq
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIGCjCCBPKgAwIBAgIQESoAbTflEG/WynzD77rMGDANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMTYxMTA3MjM1OTU5WjCBvjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQg
+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE4MDYGA1UEAxMvVmVy
+aVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBTR0MgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9Voi6iDRkZM/NyrDu5xlzxXLZ
+u0W8taj/g74cA9vtibcuEBolvFXKQaGfC88ZXnC5XjlLnjEcX4euKqqoK6IbOxAj
+XxOx3QiMThTag4HjtYzjaO0kZ85Wtqybc5ZE24qMs9bwcZOO23FUSutzWWqPcFEs
+A5+X0cwRerxiDZUqyRx1V+n1x+q6hDXLx4VafuRN4RGXfQ4gNEXb8aIJ6+s9nriW
+Q140SwglHkMaotm3igE0PcP45a9PjP/NZfAjTsWXs1zakByChQ0GDcEitnsopAPD
+TFPRWLxyvAg5/KB2qKjpS26IPeOzMSWMcylIDjJ5Bu09Q/T25On8fb6OCNUfAgMB
+AAGjggH0MIIB8DAdBgNVHQ4EFgQUTkPIHXbvN1N6T/JYb5TzOOLVvd8wEgYDVR0T
+AQH/BAgwBgEB/wIBADA9BgNVHSAENjA0MDIGBFUdIAAwKjAoBggrBgEFBQcCARYc
+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL2NwczA9BgNVHR8ENjA0MDKgMKAuhixo
+dHRwOi8vRVZTZWN1cmUtY3JsLnZlcmlzaWduLmNvbS9wY2EzLWc1LmNybDAgBgNV
+HSUEGTAXBglghkgBhvhCBAEGCmCGSAGG+EUBCAEwDgYDVR0PAQH/BAQDAgEGMBEG
+CWCGSAGG+EIBAQQEAwIBBjBtBggrBgEFBQcBDARhMF+hXaBbMFkwVzBVFglpbWFn
+ZS9naWYwITAfMAcGBSsOAwIaBBSP5dMahqyNjmvDz4Bq1EgYLHsZLjAlFiNodHRw
+Oi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvLmdpZjApBgNVHREEIjAgpB4wHDEa
+MBgGA1UEAxMRQ2xhc3MzQ0EyMDQ4LTEtNDgwPQYIKwYBBQUHAQEEMTAvMC0GCCsG
+AQUFBzABhiFodHRwOi8vRVZTZWN1cmUtb2NzcC52ZXJpc2lnbi5jb20wHwYDVR0j
+BBgwFoAUf9Nlp8Ld7LvwMAnzQzn6Aq8zMTMwDQYJKoZIhvcNAQEFBQADggEBAFqi
+sb/rjdQ4qIBywtw4Lqyncfkro7tHu21pbxA2mIzHVi67vKtKm3rW8oKT4BT+is6D
+t4Pbk4errGV5Sf1XqbHOCR+6EBXECQ5i4/kKJdVkmPDyqA92Mn6R5hjuvOfa0E6N
+eLvincBZK8DOlQ0kDHLKNF5wIokrSrDxaIfz7kSNKEB3OW5IckUxXWs5DoYC6maZ
+kzEP32fepp+MnUzOcW86Ifa5ND/5btia9z7a84Ffelxtj3z2mXS3/+QXXe1hXqtI
+u5aNZkU5tBIK9nDpnHYiS2DpKhs0Sfei1GfAsSatE7rZhAHBq+GObXAWO3eskZq7
+Gh/aWKfkT8Fhrryi/ks=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----

data/lib/miiCardConsumers.rb

@@ -1,14 +1,39 @@
 require "oauth"
 require "json"
+require "digest/sha1"
+require "net/http"
+require "openssl/x509"
 
 class MiiCardServiceUrls
 	OAUTH_ENDPOINT = "https://sts.miicard.com/auth/OAuth.ashx"
 	STS_SITE = "https://sts.miicard.com"
 	CLAIMS_SVC = "https://sts.miicard.com/api/v1/Claims.svc/json"
+	FINANCIAL_SVC = "https://sts.miicard.com/api/v1/Financial.svc/json"
+	DIRECTORY_SVC = "https://sts.miicard.com/api/v1/Members"
 	
+	# Deprecated - prefer the API-specific methods get_claims_method_url
+	# and get_financial_method_url
 	def self.get_method_url(method_name)
 		return MiiCardServiceUrls::CLAIMS_SVC + "/" + method_name
 	end
+
+	def self.get_claims_method_url(method_name)
+		return MiiCardServiceUrls::CLAIMS_SVC + "/" + method_name
+	end
+
+	def self.get_financial_method_url(method_name)
+		return MiiCardServiceUrls::FINANCIAL_SVC + "/" + method_name
+	end
+
+	def self.get_directory_service_query_url(criterion, value, hashed = false)
+		to_return = DIRECTORY_SVC + "?" + criterion + "=" + value
+
+		if (hashed)
+			to_return = to_return + "&hashed=true"
+		end
+
+		return to_return
+	end
 end
 
 # Describes the overall status of an API call.
@@ -25,6 +50,10 @@ end
 module MiiApiErrorCode
 	# The API call succeeded.
 	SUCCESS = 0
+	# An unrecognised search criterion was supplied to the Directory API
+	UNKNOWN_SEARCH_CRITERION = 10
+	# No miiCard members matched the Directory API search criteria
+	NO_MATCHES = 11
 	# The user has revoked access to your application. The user would
 	# have to repeat the OAuth authorisation process before access would be
 	# restored to your application.
@@ -34,6 +63,8 @@ module MiiApiErrorCode
 	USER_SUBSCRIPTION_LAPSED = 200
 	# Signifies that your account has not been enabled for transactional support.
 	TRANSACTIONAL_SUPPORT_DISABLED = 1000
+	# Signifies that your account has not been enabled for Financial API support.
+	FINANCIAL_DATA_SUPPPORT_DISABLED = 1001
 	# Signifies that your account's support status is development-only. This is the
 	# case when your application hasn't yet been made live in the miiCard system, for example
 	# while we process your billing details and perform final checks.
@@ -66,6 +97,34 @@ module WebPropertyType
 	WEBSITE = 1
 end
 
+module QualificationType
+	# Indicates that the Qualification relates to an academic award
+	ACADEMIC = 0
+	# Indicates that the Qualification relates to a professional certification
+	PROFESSIONAL = 1
+end
+
+module AuthenticationTokenType
+	# Specifies that no second factor was employed
+	NONE = 0
+	# Specifies that a soft token was employed, such as an SMS sent to
+	# a registered mobile device or software OATH provider
+	SOFT = 1
+	# Specifies that a hard token was employed, such as a YubiKey
+	HARD = 2
+end
+
+module RefreshState
+	# Indicates that a request to refresh financial data is in an incomplete, unknown
+	# state - probably indicating an error
+	UNKNOWN = 0
+	# Indicates that the requested financial data refresh has completed and the most
+	# recent available financial data can now be requested
+	DATA_AVAILABLE = 1
+	# Indicates that a requested financial data refresh is still in progress
+	IN_PROGRESS = 2
+end
+
 # Base class for most verifiable identity data.
 class Claim
 	attr_accessor :verified
@@ -194,12 +253,211 @@ class WebProperty < Claim
 	end
 end
 
+class Qualification
+	attr_accessor :type, :title, :data_provider, :data_provider_url
+
+	def initialize(type, title, data_provider, data_provider_url)
+		@type = type
+		@title = title
+		@data_provider = data_provider
+		@data_provider_url = data_provider_url
+	end
+
+	def self.from_hash(hash)
+		return Qualification.new(
+			hash["Type"],
+			hash["Title"],
+			hash["DataProvider"],
+			hash["DataProviderUrl"]
+		)
+	end
+end
+
+class GeographicLocation
+	attr_accessor :location_provider, :latitude, :longitude, :lat_long_accuracy_metres
+	attr_accessor :approximate_address
+
+	def initialize(location_provider, latitude, longitude, lat_long_accuracy_metres, approximate_address)
+		@location_provider = location_provider
+		@latitude = latitude
+		@longitude = longitude
+		@lat_long_accuracy_metres = lat_long_accuracy_metres
+		@approximate_address = approximate_address
+	end
+
+	def self.from_hash(hash)	
+		postal_address = hash["ApproximateAddress"]
+		postal_address_parsed = nil
+		unless (postal_address.nil?)
+			postal_address_parsed = PostalAddress::from_hash(postal_address)
+		end
+
+		return GeographicLocation.new(
+			hash["LocationProvider"],
+			hash["Latitude"],
+			hash["Longitude"],
+			hash["LatLongAccuracyMetres"],
+			postal_address_parsed
+		)
+	end
+end
+
+class AuthenticationDetails
+	attr_accessor :authentication_time_utc, :second_factor_token_type, :second_factor_provider, :locations
+
+	def initialize(authentication_time_utc, second_factor_token_type, second_factor_provider, locations)
+		@authentication_time_utc = authentication_time_utc
+		@second_factor_token_type = second_factor_token_type
+		@second_factor_provider = second_factor_provider
+		@locations = locations
+	end
+
+	def self.from_hash(hash)
+		locations = hash["Locations"]
+		locations_parsed = nil
+		unless (locations.nil? || locations.empty?)
+			locations_parsed = locations.map{|item| GeographicLocation::from_hash(item)}
+		end
+
+		return AuthenticationDetails.new(
+			(Util::parse_dot_net_json_datetime(hash['AuthenticationTimeUtc']) rescue nil),
+			hash['SecondFactorTokenType'],
+			hash['SecondFactorProvider'],
+			locations_parsed
+		)
+	end
+end
+
+class FinancialRefreshStatus
+	attr_accessor :state
+
+	def initialize(state)
+		@state = state
+	end
+
+	def self.from_hash(hash)
+		@state = hash['State']
+	end
+end
+
+class FinancialTransaction
+	attr_accessor :date, :amount_credited, :amount_debited, :description, :id
+
+	def initialize(date, amount_credited, amount_debited, description, id)
+		@date = date
+		@amount_credited = amount_credited
+		@amount_debited = amount_debited
+		@description = description
+		@id = id
+	end
+
+	def self.from_hash(hash)
+		return FinancialTransaction.new(
+			(Util::parse_dot_net_json_datetime(hash['Date']) rescue nil),
+			hash['AmountCredited'],
+			hash['AmountDebited'],
+			hash['Description'],
+			hash['ID']
+		)
+	end
+end
+
+class FinancialAccount
+	attr_accessor :account_name, :holder, :sort_code, :account_number, :type, :from_date, :last_updated_utc
+	attr_accessor :closing_balance, :debits_sum, :debits_count, :credits_sum, :credits_count, :currency_iso
+	attr_accessor :transactions
+
+	def initialize(account_name, holder, sort_code, account_number, type, from_date, last_updated_utc, closing_balance, debits_sum, debits_count, credits_sum, credits_count, currency_iso, transactions)
+		@account_name = account_name
+		@holder = holder
+		@sort_code = sort_code
+		@account_number = account_number
+		@type = type
+		@from_date = from_date
+		@last_updated_utc = last_updated_utc
+		@closing_balance = closing_balance
+		@debits_sum = debits_sum
+		@debits_count = debits_count
+		@credits_sum = credits_sum
+		@credits_count = credits_count
+		@currency_iso = currency_iso
+		@transactions = transactions
+	end
+
+	def self.from_hash(hash)
+		transactions = hash["Transactions"]
+		transactions_parsed = nil
+		unless (transactions.nil? || transactions.empty?)
+			transactions_parsed = transactions.map{|item| FinancialTransaction::from_hash(item)}
+		end
+
+		return FinancialAccount.new(
+			hash['AccountName'],
+			hash['Holder'],
+			hash['SortCode'],
+			hash['AccountNumber'],
+			hash['Type'],
+			(Util::parse_dot_net_json_datetime(hash['FromDate']) rescue nil),
+			(Util::parse_dot_net_json_datetime(hash['LastUpdatedUtc']) rescue nil),
+			hash['ClosingBalance'],
+			hash['DebitsSum'],
+			hash['DebitsCount'],
+			hash['CreditsSum'],
+			hash['CreditsCount'],
+			hash['CurrencyIso'],
+			transactions_parsed
+		)
+	end
+end
+
+class FinancialProvider
+	attr_accessor :provider_name, :financial_accounts
+
+	def initialize(provider_name, financial_accounts)
+		@provider_name = provider_name
+		@financial_accounts = financial_accounts
+	end
+
+	def self.from_hash(hash)
+		accounts = hash["FinancialAccounts"]
+		accounts_parsed = nil
+		unless (accounts.nil? || accounts.empty?)
+			accounts_parsed = accounts.map{|item| FinancialAccount::from_hash(item)}
+		end
+
+		return FinancialProvider.new(
+			hash['ProviderName'],
+			accounts_parsed
+		)
+	end
+end
+
+class MiiFinancialData
+	attr_accessor :financial_providers
+
+	def initialize(financial_providers)
+		@financial_providers = financial_providers
+	end
+
+	def self.from_hash(hash)
+		financial_providers = hash["FinancialProviders"]
+		financial_providers_parsed = nil
+		unless (financial_providers.nil? || financial_providers.empty?)
+			financial_providers_parsed = financial_providers.map{|item| FinancialProvider::from_hash(item)}
+		end
+
+		return MiiFinancialData.new(
+			financial_providers_parsed
+		)
+	end
+end
+
 class MiiUserProfile
 	attr_accessor :username, :salutation, :first_name, :middle_name, :last_name
 	attr_accessor :previous_first_name, :previous_middle_name, :previous_last_name
 	attr_accessor :last_verified, :profile_url, :profile_short_url, :card_image_url, :email_addresses, :identities, :postal_addresses
 	attr_accessor :phone_numbers, :web_properties, :identity_assured, :has_public_profile
-	attr_accessor :public_profile, :date_of_birth
+	attr_accessor :public_profile, :date_of_birth, :qualifications, :age
 	
 	def initialize(
 		username,
@@ -222,7 +480,9 @@ class MiiUserProfile
 		identity_assured,
 		has_public_profile,
 		public_profile,
-		date_of_birth
+		date_of_birth,
+		qualifications,
+		age
 		)
 		
 		@username= username
@@ -246,6 +506,8 @@ class MiiUserProfile
 		@has_public_profile = has_public_profile
 		@public_profile = public_profile
 		@date_of_birth = date_of_birth
+		@qualifications = qualifications
+		@age = age
 	end
 	
 	def self.from_hash(hash)
@@ -278,6 +540,12 @@ class MiiUserProfile
 		unless (web_properties.nil? || web_properties.empty?)
 			web_properties_parsed = web_properties.map{|item| WebProperty::from_hash(item)}
 		end
+
+		qualifications = hash["Qualifications"]
+		qualifications_parsed = nil
+		unless (qualifications.nil? || qualifications.empty?)
+			qualifications_parsed = qualifications.map{|item| Qualification::from_hash(item)}
+		end
 		
 		public_profile = hash["PublicProfile"]
 		public_profile_parsed = nil
@@ -306,7 +574,9 @@ class MiiUserProfile
 			hash['IdentityAssured'],
 			hash['HasPublicProfile'],
 			public_profile_parsed,
-                        (Util::parse_dot_net_json_datetime(hash['DateOfBirth']) rescue nil)
+            (Util::parse_dot_net_json_datetime(hash['DateOfBirth']) rescue nil),
+			qualifications_parsed,
+			hash['Age']
 			)			
 	end
 end
@@ -396,71 +666,188 @@ class MiiCardOAuthServiceBase
 		@access_token = access_token
 		@access_token_secret = access_token_secret
 	end
+	
+	protected
+	def make_request(url, post_data, payload_processor, wrapped_response, array_type_payload = false)
+		consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {:site => MiiCardServiceUrls::STS_SITE, :request_token_path => MiiCardServiceUrls::OAUTH_ENDPOINT, :access_token_path => MiiCardServiceUrls::OAUTH_ENDPOINT, :authorize_path => MiiCardServiceUrls::OAUTH_ENDPOINT })
+		access_token = OAuth::AccessToken.new(consumer, @access_token, @access_token_secret)
+				
+		response = access_token.post(url, post_data.to_json(), { 'Content-Type' => 'application/json' })
+		
+		if wrapped_response
+			return MiiApiResponse::from_hash(JSON.parse(response.body), payload_processor, array_type_payload)
+		elsif !payload_processor.nil?
+			return payload_processor.call(response.body)
+		else
+			return response.body
+		end
+	end
 end
 
 class MiiCardOAuthClaimsService < MiiCardOAuthServiceBase
 	def initialize(consumer_key, consumer_secret, access_token, access_token_secret)
 		super(consumer_key, consumer_secret, access_token, access_token_secret)
 	end
+
+	def get_method_url(method)
+		return MiiCardServiceUrls.get_claims_method_url(method)
+	end
 	
 	def get_claims
-		return make_request(MiiCardServiceUrls.get_method_url('GetClaims'), nil, MiiUserProfile.method(:from_hash), true)
+		return make_request(get_method_url('GetClaims'), nil, MiiUserProfile.method(:from_hash), true)
 	end
 	
 	def is_social_account_assured(social_account_id, social_account_type)
 		params = Hash["socialAccountId", social_account_id, "socialAccountType", social_account_type]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('IsSocialAccountAssured'), params, nil, true)
+		return make_request(get_method_url('IsSocialAccountAssured'), params, nil, true)
 	end
 	
 	def is_user_assured
-		return make_request(MiiCardServiceUrls.get_method_url('IsUserAssured'), nil, nil, true)
+		return make_request(get_method_url('IsUserAssured'), nil, nil, true)
 	end
 	
 	def assurance_image(type)
 		params = Hash["type", type]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('AssuranceImage'), params, nil, false)
+		return make_request(get_method_url('AssuranceImage'), params, nil, false)
 	end
 
 	def get_card_image(snapshot_id, show_email_address, show_phone_number, format)
 		params = Hash["SnapshotId", snapshot_id, "ShowEmailAddress", show_email_address, "ShowPhoneNumber", show_phone_number, "Format", format]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('GetCardImage'), params, nil, false)
+		return make_request(get_method_url('GetCardImage'), params, nil, false)
 	end
 		
 	def get_identity_snapshot_details(snapshot_id = nil)
 		params = Hash["snapshotId", snapshot_id]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('GetIdentitySnapshotDetails'), params, IdentitySnapshotDetails.method(:from_hash), true, true)
+		return make_request(get_method_url('GetIdentitySnapshotDetails'), params, IdentitySnapshotDetails.method(:from_hash), true, true)
 	end
 	
 	def get_identity_snapshot(snapshot_id)
 		params = Hash["snapshotId", snapshot_id]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('GetIdentitySnapshot'), params, IdentitySnapshot.method(:from_hash), true)
+		return make_request(get_method_url('GetIdentitySnapshot'), params, IdentitySnapshot.method(:from_hash), true)
 	end
 
 	def get_identity_snapshot_pdf(snapshot_id)
 		params = Hash["snapshotId", snapshot_id]
 		
-		return make_request(MiiCardServiceUrls.get_method_url('GetIdentitySnapshotPdf'), params, nil, false)
+		return make_request(get_method_url('GetIdentitySnapshotPdf'), params, nil, false)
 	end
+
+	def get_authentication_details(snapshot_id = nil)
+		params = Hash["snapshotId", snapshot_id]
+
+		return make_request(get_method_url('GetAuthenticationDetails'), params, AuthenticationDetails.method(:from_hash), true)
+	end
+end
+
+class MiiCardOAuthFinancialService < MiiCardOAuthServiceBase
+	def initialize(consumer_key, consumer_secret, access_token, access_token_secret)
+		super(consumer_key, consumer_secret, access_token, access_token_secret)
+	end	
 	
-	private
-	def make_request(url, post_data, payload_processor, wrapped_response, array_type_payload = false)
-		consumer = OAuth::Consumer.new(@consumer_key, @consumer_secret, {:site => MiiCardServiceUrls::STS_SITE, :request_token_path => MiiCardServiceUrls::OAUTH_ENDPOINT, :access_token_path => MiiCardServiceUrls::OAUTH_ENDPOINT, :authorize_path => MiiCardServiceUrls::OAUTH_ENDPOINT })
-		access_token = OAuth::AccessToken.new(consumer, @access_token, @access_token_secret)
-				
-		response = access_token.post(url, post_data.to_json(), { 'Content-Type' => 'application/json' })
+	def get_method_url(method)
+		return MiiCardServiceUrls.get_financial_method_url(method)
+	end
+
+	def is_refresh_in_progress
+		return make_request(get_method_url('IsRefreshInProgress'), nil, nil, true)
+	end
+
+	def refresh_financial_data
+		return make_request(get_method_url('RefreshFinancialData'), nil, FinancialRefreshStatus.method(:from_hash), true)
+	end
+
+	def get_financial_transactions
+		return make_request(get_method_url('GetFinancialTransactions'), nil, MiiFinancialData.method(:from_hash), true)
+	end
+end
+
+class MiiCardDirectoryService
+	CRITERION_USERNAME = "username"
+	CRITERION_EMAIL = "email"
+	CRITERION_PHONE = "phone"
+	CRITERION_TWITTER = "twitter"
+	CRITERION_FACEBOOK = "facebook"
+	CRITERION_LINKEDIN = "linkedin"
+	CRITERION_GOOGLE = "google"
+	CRITERION_MICROSOFT_ID = "liveid"
+	CRITERION_EBAY = "ebay"
+	CRITERION_VERITAS_VITAE = "veritasvitae"
+
+	def find_by_email(email, hashed = false)
+		return find_by(CRITERION_EMAIL, email, hashed)
+	end
+
+	def find_by_phone_number(phone, hashed = false)
+		return find_by(CRITERION_PHONE, phone, hashed)
+	end
+
+	def find_by_username(username, hashed = false)
+		return find_by(CRITERION_USERNAME, username, hashed)
+	end
+
+	def find_by_twitter(twitter_handle_or_profile_url, hashed = false)
+		return find_by(CRITERION_TWITTER, twitter_handle_or_profile_url, hashed)
+	end
+
+	def find_by_facebook(facebook_url, hashed = false)
+		return find_by(CRITERION_FACEBOOK, facebook_url, hashed)
+	end
+
+	def find_by_linkedin(linkedin_www_url, hashed = false)
+		return find_by(CRITERION_LINKEDIN, linkedin_www_url, hashed)
+	end
+
+	def find_by_google(google_handle_or_profile_url, hashed = false)
+		return find_by(CRITERION_GOOGLE, google_handle_or_profile_url, hashed)
+	end
+
+	def find_by_microsoft_id(microsoft_id_url, hashed = false)
+		return find_by(CRITERION_MICROSOFT_ID, microsoft_id_url, hashed)
+	end
+
+	def find_by_ebay(ebay_handle_or_profile_url, hashed = false)
+		return find_by(CRITERION_EBAY, ebay_handle_or_profile_url, hashed)
+	end
+
+	def find_by_veritas_vitae(veritas_vitae_vv_number_or_profile_url, hashed = false)
+		return find_by(CRITERION_VERITAS_VITAE, veritas_vitae_vv_number_or_profile_url, hashed)
+	end
+
+	def find_by(criterion, value, hashed = false)
+		url = MiiCardServiceUrls::get_directory_service_query_url(criterion, value, hashed)
+		uri = URI.parse(url)
+
+		cert_store = OpenSSL::X509::Store.new
+		cert_store.set_default_paths
+
+		http = Net::HTTP.new(uri.host, uri.port)
+		http.use_ssl = true
+		http.cert_store = cert_store
+		http.ca_file = File.join(File.dirname(__FILE__), "certs/sts.miicard.com.pem")
+
+		request = Net::HTTP::Get.new(url)
+		request['Content-type'] = 'application/json'
 		
-		if wrapped_response
-			return MiiApiResponse::from_hash(JSON.parse(response.body), payload_processor, array_type_payload)
-		elsif !payload_processor.nil?
-			return payload_processor.call(response.body)
-		else
-			return response.body
+		response = (http.request(request) rescue nil)
+
+		if !response.nil? && !response.body.to_s.empty?
+			# Try parsing the response as a MiiApiResponse of MiiUserProfile
+			parsed_response = (MiiApiResponse::from_hash(JSON.parse(response.body), MiiUserProfile.method(:from_hash)) rescue nil)
+			if !parsed_response.nil? && !parsed_response.data.nil?
+				to_return = parsed_response.data
+			end
 		end
+
+		return to_return
+	end
+	
+	def self.hash_identifier(identifier)
+		return Digest::SHA1.hexdigest(identifier.downcase)
 	end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: miiCardConsumers
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -52,9 +52,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/miiCardConsumers.rb
+- lib/certs/sts.miicard.com.pem
 - test/test_miiCardConsumers.rb
 homepage: http://www.miicard.com/developers
-licenses: []
+licenses:
+- BSD
 post_install_message: 
 rdoc_options: []
 require_paths: