nm-gigya 0.1.18 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c86a798e71a0be6ee96fae9882537499e4a0c38506f27e9a025f576315b6e77
-  data.tar.gz: 5b7dc8adcf500307941bdd7ec10fa6241615ef70fa512f3be18aa478194cc9fc
+  metadata.gz: 54da79569c7861797f22204107d2cc001dbb777df250f622123fcb21edf3310a
+  data.tar.gz: 55602a7160d4189029e993d82d9c1bbaeeda100f2ba26c28bc78652801ac5dbb
 SHA512:
-  metadata.gz: b596f844ec3dfcc822bdd7c0d50d921a7739acec665f3930c2fcc2028f7e22cdd4b0e78ea998fea65facacd766f23f2b1fea7570d215a3ecc79137e6efc44e1e
-  data.tar.gz: 084614fa490070e52a28322a4634d8039c9073b769d8d5d7c15ba2b758f76eecd6569d8382fff13cd38e8e9da594960268cd963f4f6dfcb892eaf3618a18b722
+  metadata.gz: ac671574e315d01ce33a9d08c92eff30af86bba8b98a2dd0f90936ac990717107617ef39a858fade4e4b7da13cea2305c1909bba5ca12b167dd0506a4aa9be0d
+  data.tar.gz: e7d9027175d69dca62093a65a91b21f494be4be4216db6dc7a3feb4864db36114059ee2b6e23e9b0656afe35d706d62f51c99f7b40de0439fd362395900a71de

data/lib/gigya/connection.rb

@@ -292,6 +292,15 @@ module Gigya
 			api_call("POST", area, function, params, opts)
 		end
 
+		# This allows substituting how HTTP calls are made (could be useful for testing)
+		def http_driver
+			@http_driver || HTTParty
+		end
+
+		def http_driver=(val)
+			@http_driver = val
+		end
+
 		def api_call(http_method, area, function, params = nil, opts = nil)
 			params ||= {}
 			opts ||= {}
@@ -302,7 +311,7 @@ module Gigya
 			params[:apiKey] = opts[:api_key]
 			unless opts[:authenticate_app] == false
 				params[:secret] = opts[:user_secret]
-				params[:userKey] = opts[:user_key]
+				params[:userKey] = opts[:user_key] unless opts[:user_key].blank?
 			end
 
 			if opts[:session] != nil
@@ -319,7 +328,7 @@ module Gigya
 			end
 			http_response = nil
 			response = begin
-				http_response = http_method == "GET" ? HTTParty.get(base_url, :query => params) : HTTParty.post(base_url, :body => params)
+				http_response = http_method == "GET" ? http_driver.get(base_url, :query => params) : http_driver.post(base_url, :body => params)
 				JSON.parse(http_response.body)
 			rescue
 				{"errorCode" => 600, "errorMessage" => "Unknown error", "errorDetail" => "Unable to communicate with authentication server", :http => http_response.inspect}

data/lib/gigya/controller_utils.rb

@@ -23,10 +23,30 @@ module Gigya
 			@@gigya_refresh_time_decay
 		end
 
+		@@max_logged_tokens = 20
+		@@logged_tokens = {}
+
+		def log_token_error(tok, msg = nil)
+			if @@max_logged_tokens > 0
+				if @logged_tokens[tok]
+					# already logged
+				else
+					@@logged_tokens[tok] = true
+					@@max_logged_tokens = @@max_logged_tokens - 1
+				end
+				Rails.logger.warn("Token Issue: #{tok}") if tok.present?
+				Rails.logger.warn("Token message: #{msg}") if msg.present?
+			end
+		end
+
 		def gigya_user_required
 			begin
-				render(:json => {:error => "Invalid login"}, :status => 401) if gigya_user_identifier.blank?
+				if gigya_user_identifier.blank?
+					log_token_error(request.headers["Authorization"])
+					render(:json => {:error => "Invalid login"}, :status => 401) 
+				end
 			rescue
+				log_token_error(request.headers["Authorization"], $!.message)
 				render(:json => {:error => "#{$!.message}"}, :status => 401)
 			end
 		end
@@ -48,11 +68,13 @@ module Gigya
 				end
 
 				begin
-					tmp_token = params[GIGYA_QUERY_PARAM] unless params[GIGYA_QUERY_PARAM].blank?
-					token_location = :param
 					if tmp_token.blank?
-						tmp_token = cookies[GIGYA_COOKIE_PARAM]
-						token_location = :cookie
+						tmp_token = params[GIGYA_QUERY_PARAM] unless params[GIGYA_QUERY_PARAM].blank?
+						token_location = :param
+						if tmp_token.blank?
+							tmp_token = cookies[GIGYA_COOKIE_PARAM]
+							token_location = :cookie
+						end
 					end
 				rescue
 					# Some lightweight controllers don't do cookies
@@ -60,7 +82,7 @@ module Gigya
 
 				begin
 					if tmp_token.blank?
-						tmp_token = session[GIGYA_SESSION_PARAM]	
+						tmp_token = session[GIGYA_SESSION_PARAM]
 						token_location = :session
 					end
 				rescue
@@ -76,7 +98,7 @@ module Gigya
 		end
 
 		def interpret_jwt_token(force = false)
-			if @gigya_jwt_info.nil? 
+			if @gigya_jwt_info.nil?
 				@gigya_jwt_info = Gigya::Connection.shared_connection.validate_jwt(gigya_jwt_token)
 
 				perform_token_refresh if needs_token_refresh?
@@ -112,7 +134,7 @@ module Gigya
 			case @gigya_token_location
 				when :header
 					headers["X-Set-Authorization-Token"] = token
-					headers["X-Set-Authorization-Token-Expiration"] = expiration_time.to_i
+					headers["X-Set-Authorization-Token-Expiration"] = expiration_time.to_i.to_s
 				when :cookie
 					cookies[GIGYA_COOKIE_PARAM] = token
 				when :session
@@ -158,5 +180,5 @@ module Gigya
 				@gigya_jwt_info["sub"]
 			end
 		end
-	end	
+	end
 end

data/lib/gigya/user.rb

@@ -50,7 +50,7 @@ module Gigya
 		end
 
 		def reload
-			conn = gigya_connection || Gigya::Connection.shared_connection
+			conn = my_gigya_connection
 			set_attributes(conn.api_get("accounts", "getAccountInfo", {UID: uid, include:"profile,data,subscriptions,userInfo,preferences", extraProfileFields:@@extra_profile_fields.join(",")}))
 		end
 
@@ -60,7 +60,7 @@ module Gigya
 			info["data"] = gigya_details["data"].to_json if gigya_details["data"].present?
 			# What about isActive, isVerified?, password/newPassword, preferences, add/removeLoginEmails, subscriptions, lang, rba
 
-			conn = gigya_connection || Gigya::Connection.shared_connection	
+			conn = my_gigya_connection
 			conn.api_post("accounts", "setAccountInfo", info)
 			save_to_cache
 
@@ -89,7 +89,7 @@ module Gigya
 			email = email.gsub('"', '') # get rid of quotes
 			opts = {} if opts.nil?
 			conn = opts[:connection] || Gigya::Connection.shared_connection
-			resp = conn.api_get("accounts", "search", {:query => "SELECT uid FROM accounts WHERE profile.email = \"#{email}\""})
+			resp = conn.api_get("accounts", "search", {:query => "SELECT UID FROM accounts WHERE profile.email = \"#{email}\""})
 			uid = resp["results"][0]["UID"] rescue nil
 			return nil if uid.blank?
 			return self.find(uid, opts)
@@ -97,7 +97,7 @@ module Gigya
 
 		def self.find(uid, opts = {}) # Find a Gigya account record by its UID attribute
 			opts = {} if opts.nil?
-      opts[:cache] = true if opts[:cache].nil?
+			opts[:cache] = true if opts[:cache].nil?
 
 			cache_info = load_from_cache(uid)
 			if cache_info.present? && opts[:cache]
@@ -163,5 +163,135 @@ module Gigya
 				nil
 			end
 		end
+
+
+		# Intended way of calling this:
+		# Gigya::User.create_gigya_user_through_notify_login("abc@example.com", :password => "Abc123!!", :account => { "preferences" => {"foo" => "bar" } }, :verified => true)
+		#
+		# Options:
+		#   :password => Set a password,
+		#   :source => the registration source
+		#   :account => hash of any account defaults you want to set.  Profile defaults should be under the "profile" key.
+		#   :send_verification => Will send verification email
+		#   :verified => Will auto-set "verified"
+		#   :force => Will do things that Gigya doesn't naturally want to do (often used in combination with :verified)
+		#   :debug => will print out call information	
+
+		# Creates a gigya user through the `notify_login` pathway
+		def self.create_gigya_user_through_notify_login(email, opts = {})
+			conn = opts[:gigya_connection] || Gigya::Connection.shared_connection
+
+			# Create UUID
+			new_uid = opts[:UID] || "#{SecureRandom.uuid.gsub("-", "")}#{SecureRandom.uuid.gsub("-", "")}"
+
+			# Is the address available?
+			email_is_available = conn.api_get("accounts", "isAvailableLoginID", { "loginID" => email }, :debug_connection => opts[:debug])["isAvailable"] rescue false
+			raise "Username is unavailable" unless email_is_available
+
+			# Register UUID
+			response = conn.api_get("accounts", "notifyLogin", {"siteUID" => new_uid}, :debug_connection => opts[:debug])
+			raise "Could not register UID" unless response["errorCode"] == 0 || response["errorCode"] == 206001
+
+			# Start the registration process
+			regtoken = conn.api_get("accounts", "initRegistration", {}, :debug_connection => opts[:debug])["regToken"] rescue nil
+			raise "Could not initiate registration" if regtoken.blank?
+
+			# Create the data record
+			account_info = opts[:account] || {}        # This allows the caller to send us defaults
+			account_info["UID"] = new_uid              # Primary key
+			account_info["regToken"] = regtoken        # Ties it to the initial registration
+			account_info["securityOverride"] = true    # Allows us to set passwords if we want
+			account_info["profile"] ||= {}
+			account_info["profile"]["email"] = email   # Actual login username
+			account_info["profile"] = account_info["profile"].to_json
+			account_info["preferences"] = account_info["preferences"].to_json
+			account_info["regSource"] = opts[:source] || "nm-gigya"
+
+			# Optional data record pieces
+			account_info["isVerified"] = true if opts[:verified]
+			account_info["newPassword"] = opts[:password] unless opts[:password].blank?
+
+			# Create the registration with the data record
+			results = conn.api_post("accounts", "setAccountInfo", account_info, :debug_connection => opts[:debug])
+
+			# If not everything got set correctly (NOTE - doesn't work if :password is not also sent)
+			if opts[:force]
+				response = conn.api_get("accounts", "login", {"loginID" => email, "password" => opts[:password]}, :debug_connection => opts[:debug])
+				if response["errorCode"] != 0
+					verify_reg_token = response["regToken"]
+					response = conn.api_get("accounts", "finalizeRegistration", {"regToken" => verify_reg_token, "include" => "emails, profile"}, :debug_connection => opts[:debug])
+					unless response["errorCode"] == 0 || response["errorCode"] == 206002 || response["errorCode"] == 206001
+						raise "Unable to finalize registration" 
+					end
+				end
+			end
+
+			if opts[:send_verification]
+				conn.api_get("accounts", "resendVerificationCode", {"UID" => new_uid, "email" => email})
+			end
+
+			if opts[:send_password_change]
+				conn.api_get("accounts", "resetPassword", {"UID" => new_uid, "loginID" => email, "email" => email})
+			end
+
+			return new_uid
+		end
+
+		# Creates a gigya user through the `register` pathway
+
+		# Options:
+		#   :password => Set a password,
+		#   :source => the registration source
+		#   :account => hash of any account defaults you want to set.  Profile defaults should be under the "profile" key.
+		#   :debug => will print out call information
+
+		def self.create_gigya_user_through_register(email, opts = {})
+			conn = opts[:gigya_connection] || Gigya::Connection.shared_connection
+
+			new_password = opts[:password] || SecureRandom.urlsafe_base64(8)
+
+			# Create UUID
+			new_uid = opts[:UID] || "#{SecureRandom.uuid.gsub("-", "")}#{SecureRandom.uuid.gsub("-", "")}"
+
+			# Is the address available?
+			email_is_available = conn.api_get("accounts", "isAvailableLoginID", { "loginID" => email }, :debug_connection => opts[:debug])["isAvailable"] rescue false
+			raise "Username is unavailable" unless email_is_available
+
+			# Start the registration process
+			regtoken = conn.api_get("accounts", "initRegistration", {}, :debug_connection => opts[:debug])["regToken"] rescue nil
+			raise "Could not initiate registration" if regtoken.blank?
+
+			# Create the data record
+			account_info = opts[:account] || {}        # This allows the caller to send us defaults
+			account_info["siteUID"] = new_uid              # Primary key
+			account_info["regToken"] = regtoken        # Ties it to the initial registration
+			account_info["profile"] ||= {}
+			account_info["email"] = email
+			account_info["profile"]["email"] = email   # Actual login username
+			account_info["profile"] = account_info["profile"].to_json
+			account_info["preferences"] = account_info["preferences"].to_json unless account_info["preferences"].nil?
+			account_info["regSource"] = opts[:source] unless opts[:source].blank?
+			account_info["password"] = new_password
+			account_info["data"] = account_info["data"].to_json unless account_info["data"].nil?
+
+			# Complete the registration process
+			conn.api_post("accounts", "register", account_info, :debug_connection => opts[:debug])
+
+			if opts[:send_verification]
+				conn.api_get("accounts", "resendVerificationCode", {"UID" => new_uid, "email" => email})
+			end
+
+			if opts[:send_password_change]
+				conn.api_get("accounts", "resetPassword", {"UID" => new_uid, "loginID" => email, "email" => email})
+			end
+
+			return new_uid
+		end
+
+		private
+
+		def my_gigya_connection
+			gigya_connection || Gigya::Connection.shared_connection
+		end
 	end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: nm-gigya
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.24
 platform: ruby
 authors:
 - Jonathan Bartlett
 - Tyler Jackson
-autorequire: 
+- Clark Ritchie
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -39,8 +40,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-description: 
-email: jonathan@newmedio.com
+description:
+email: jonathan.bartlett@specialized.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -55,7 +56,7 @@ homepage: http://www.newmedio.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,9 +71,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Gigya API Utility Package
 test_files: []