Merge pull request #396 from jvlcek/bz1590398_mixed_case_userid

Ignore case of the userid when validating it.

lib/services/api/user_token_service.rb

@@ -75,7 +75,7 @@ def log_init(mod, name, options)
     end
 
     def validate_userid(userid)
-      raise "Invalid userid #{userid} specified" unless User.exists?(:userid => userid)
+      raise "Invalid userid #{userid} specified" unless User.in_my_region.where('lower(userid) = ?', userid.downcase).exists?
     end
   end
 end

spec/lib/services/api/user_token_service_spec.rb

@@ -1,13 +1,13 @@
 RSpec.describe Api::UserTokenService do
-  describe ".generate_token" do
-    before do
-      @user = FactoryGirl.create(:user_with_group)
-    end
+  before do
+    @user = FactoryGirl.create(:user_with_group)
+  end
 
-    let(:user_token_service) { described_class.new }
-    let(:token) { user_token_service.generate_token(@user.userid.capitalize, 'api', :token_ttl => token_ttl) }
-    let(:token_info) { user_token_service.token_mgr('api').token_get_info(token) }
+  let(:user_token_service) { described_class.new }
+  let(:token) { user_token_service.generate_token(@user.userid.capitalize, 'api', :token_ttl => token_ttl) }
+  let(:token_info) { user_token_service.token_mgr('api').token_get_info(token) }
 
+  describe ".generate_token" do
     context "without token_ttl set" do
       let(:token_ttl) { nil }
 
@@ -24,4 +24,10 @@
       end
     end
   end
+
+  describe ".validate_userid" do
+    it "ignores the case of the userid" do
+      expect { user_token_service.send(:validate_userid, @user.userid.capitalize) }.not_to raise_error
+    end
+  end
 end