🚨 Linting

Author: pboling

.rubocop_gradual.lock

@@ -23,7 +23,7 @@
     [47, 7, 38, "RSpec/AnyInstance: Avoid stubbing using `allow_any_instance_of`.", 3627954156],
     [84, 7, 48, "RSpec/AnyInstance: Avoid stubbing using `allow_any_instance_of`.", 2759780562]
   ],
-  "spec/omniauth/strategies/ldap_spec.rb:1834231975": [
+  "spec/omniauth/strategies/ldap_spec.rb:4166458344": [
     [126, 13, 9, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1130140517],
     [181, 17, 28, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 3444838747],
     [190, 17, 23, "RSpec/ContextWording: Context description should match /^when\\b/, /^with\\b/, or /^without\\b/.", 1584148894],

README.md

@@ -71,9 +71,9 @@ use OmniAuth::Strategies::LDAP,
     ciphers: ["AES-128-CBC", "AES-128-CBC-HMAC-SHA1", "AES-128-CBC-HMAC-SHA256"],
   },
   mapping: {
-    'name' => 'cn;lang-en',
-    'email' => ['preferredEmail', 'mail'],
-    'nickname' => ['uid', 'userid', 'sAMAccountName']
+    "name" => "cn;lang-en",
+    "email" => ["preferredEmail", "mail"],
+    "nickname" => ["uid", "userid", "sAMAccountName"],
   }
 # Or, alternatively:
 # use OmniAuth::Strategies::LDAP, filter: '(&(uid=%{username})(memberOf=cn=myapp-users,ou=groups,dc=example,dc=com))'

lib/omniauth/strategies/ldap.rb

@@ -205,7 +205,7 @@ def directory_lookup(adaptor, username)
         search_filter = filter(adaptor, username)
         adaptor.connection.open do |conn|
           rs = conn.search(filter: search_filter, size: 1)
-          entry = rs&.first
+          entry = rs && rs.first
         end
         entry
       end

spec/omniauth/strategies/ldap_spec.rb

@@ -433,19 +433,19 @@ def make_env(path = "/auth/ldap", props = {})
         expect(info.description).to eq "omniauth-ldap"
       end
 
-      context 'and mapping is set' do
+      context "when mapping is set" do
         let(:app) do
           Rack::Builder.new {
             use OmniAuth::Test::PhonySession
-            use MyLdapProvider, :name => 'ldap', :host => '192.168.1.145', :base => 'dc=score, dc=local', :mapping => { 'phone' => 'mobile' }
-            run lambda { |env| [404, {'Content-Type' => 'text/plain'}, [env.key?('omniauth.auth').to_s]] }
+            use MyLdapProvider, name: "ldap", host: "192.168.1.145", base: "dc=score, dc=local", mapping: {"phone" => "mobile"}
+            run lambda { |env| [404, {"Content-Type" => "text/plain"}, [env.key?("omniauth.auth").to_s]] }
           }.to_app
         end
 
-        it 'should map user info according to customized mapping' do
-          post('/auth/ldap/callback', {:username => 'ping', :password => 'password'})
-          expect(auth_hash.info.phone).to eq '444-444-4444'
-          expect(auth_hash.info.mobile).to eq '444-444-4444'
+        it "maps user info according to customized mapping" do
+          post("/auth/ldap/callback", {username: "ping", password: "password"})
+          expect(auth_hash.info.phone).to eq "444-444-4444"
+          expect(auth_hash.info.mobile).to eq "444-444-4444"
         end
       end
     end
@@ -646,7 +646,7 @@ def connection_returning(entry)
             header_auth: true,
             header_name: "REMOTE_USER",
             name_proc: proc { |n| n },
-            mapping: { "phone" => "mobile" }
+            mapping: {"phone" => "mobile"}
           run lambda { |env| [404, {"Content-Type" => "text/plain"}, [env.key?("omniauth.auth").to_s]] }
         end.to_app
       end