lib/tokyo_api/identity.rb in tokyo_api-1.1.0 vs lib/tokyo_api/identity.rb in tokyo_api-1.1.2

@@ -6,25 +6,49 @@
 
     def full_user(id)
       client.get_request("#{normalized_base_path}full_user/#{url_escape(id)}").body
     end
 
-    def tokyo_identity_user_path(id, required_fields: nil)
+    def tokyo_identity_user_path(id, with_subscription_status: false, required_fields: nil, opt_in_public_ids: nil, minimum_consent_level: nil)
       path = "/#{normalized_base_path}user/#{url_escape(id)}"
 
+      params = []
       unless required_fields.nil?
-        path << "?#{required_fields_param(required_fields)}"
+        params << required_fields_param(required_fields)
       end
+
+      if with_subscription_status
+        params << 'with_subscription_status=true'
+        additional_subscription_parameters = path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)
+        unless additional_subscription_parameters.blank?
+          params << additional_subscription_parameters
+        end
+      end
+
+      if params.any?
+        path << "?#{params.join('&')}"
+      end
+
       path
     end
 
     def subscription_status_path(id, opt_in_public_ids: nil, minimum_consent_level: nil)
       raise 'must provide opt_in_public_ids' if opt_in_public_ids.nil?
 
-      path = "/#{normalized_base_path}subscription_status/#{url_escape(id)}?opt_in_public_ids=#{url_escape(opt_in_public_ids.join(','))}"
+      "/#{normalized_base_path}subscription_status/#{url_escape(id)}?#{path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)}"
+    end
 
+    private
+
+    def path_for_subscription_status_params(opt_in_public_ids, minimum_consent_level)
+      path = ''
+
+      if opt_in_public_ids.present?
+        path = "opt_in_public_ids=#{url_escape(opt_in_public_ids.join(','))}"
+      end
+
       if minimum_consent_level
-        path = "#{path}&minimum_consent_level=#{url_escape(minimum_consent_level)}"
+        path << "&minimum_consent_level=#{url_escape(minimum_consent_level)}"
       end
 
       path
     end
   end