devise_jwt_auth 0.1.1 → 0.1.6

data/test/controllers/devise_jwt_auth/confirmations_controller_test.rb

@@ -59,7 +59,7 @@ class DeviseJwtAuth::ConfirmationsControllerTest < ActionController::TestCase
           end
 
           test 'redirect url includes token params' do
-            assert @token_params.all? { |param| response.body.include?(param) }
+            assert(@token_params.all? { |param| response.body.include?(param) })
             assert response.body.include?('account_confirmation_success')
           end
         end
@@ -84,7 +84,7 @@ class DeviseJwtAuth::ConfirmationsControllerTest < ActionController::TestCase
           end
 
           test 'redirect url does not include token params' do
-            refute @token_params.any? { |param| response.body.include?(param) }
+            refute(@token_params.any? { |param| response.body.include?(param) })
             assert response.body.include?('account_confirmation_success')
           end
         end
@@ -92,9 +92,9 @@ class DeviseJwtAuth::ConfirmationsControllerTest < ActionController::TestCase
         describe 'resend confirmation' do
           before do
             post :create,
-                params: { email: @new_user.email,
-                          redirect_url: @redirect_url },
-                xhr: true
+                 params: { email: @new_user.email,
+                           redirect_url: @redirect_url },
+                 xhr: true
             @resource = assigns(:resource)
 
             @mail = ActionMailer::Base.deliveries.last

data/test/controllers/devise_jwt_auth/omniauth_callbacks_controller_test.rb

@@ -18,7 +18,7 @@ class OmniauthTest < ActionDispatch::IntegrationTest
   end
 
   def get_parsed_data_json
-    encoded_json_data = @response.body.match(/var data \= JSON.parse\(decodeURIComponent\(\'(.+)\'\)\)\;/)[1]
+    encoded_json_data = @response.body.match(/var data = JSON.parse\(decodeURIComponent\('(.+)'\)\);/)[1]
     JSON.parse(URI.unescape(encoded_json_data))
   end
 
@@ -286,9 +286,9 @@ class OmniauthTest < ActionDispatch::IntegrationTest
   describe 'failure callback' do
     setup do
       OmniAuth.config.mock_auth[:facebook] = :invalid_credentials
-      OmniAuth.config.on_failure = proc { |env|
+      OmniAuth.config.on_failure = proc do |env|
         OmniAuth::FailureEndpoint.new(env).redirect_to_failure
-      }
+      end
     end
 
     test 'renders expected data' do
@@ -331,8 +331,7 @@ class OmniauthTest < ActionDispatch::IntegrationTest
   end
 
   describe 'Using redirect_whitelist' do
-
-    describe "newWindow" do
+    describe 'newWindow' do
       before do
         @user_email = 'slemp.diggler@sillybandz.gov'
         OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new(
@@ -361,7 +360,7 @@ class OmniauthTest < ActionDispatch::IntegrationTest
 
         data = get_parsed_data_json
         assert_equal "Redirect to &#39;#{@bad_redirect_url}&#39; not allowed.",
-                    data['error']
+                     data['error']
         # TODO: parse data and assert no access or refresh tokens were sent.
       end
 
@@ -395,7 +394,7 @@ class OmniauthTest < ActionDispatch::IntegrationTest
       end
     end
 
-    describe "sameWindow" do
+    describe 'sameWindow' do
       before do
         @user_email = 'slemp.diggler@sillybandz.gov'
         OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new(

data/test/controllers/devise_jwt_auth/passwords_controller_test.rb

@@ -66,7 +66,7 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
         describe 'for edit' do
           before do
             get_reset_token
-            get :edit, params: { reset_password_token: @mail_reset_token}
+            get :edit, params: { reset_password_token: @mail_reset_token }
             @data = JSON.parse(response.body)
           end
 
@@ -145,7 +145,7 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
 
             @mail_config_name  = CGI.unescape(@mail.body.match(/config=([^&]*)&/)[1])
             @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)&/)[1])
-            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)"/)[1]
           end
 
           test 'response should return success status' do
@@ -237,7 +237,7 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
           before do
             @resource_class = User
             @request_params = {
-              email:        @resource.email.upcase,
+              email: @resource.email.upcase,
               redirect_url: @redirect_url
             }
           end
@@ -264,13 +264,12 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
 
             @mail = ActionMailer::Base.deliveries.last
             @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)&/)[1])
-            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)"/)[1]
 
             @resource.reload
           end
 
           describe 'reset_password_token is valid' do
-
             test 'mail_reset_token should be the same as reset_password_token' do
               assert_equal Devise.token_generator.digest(self, :reset_password_token, @mail_reset_token), @resource.reset_password_token
             end
@@ -492,7 +491,7 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
 
             @mail = ActionMailer::Base.deliveries.last
             @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)&/)[1])
-            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+            @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)"/)[1]
 
             # confirm via password reset email link
             get :edit, params: { reset_password_token: @mail_reset_token,
@@ -568,10 +567,9 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
             DeviseJwtAuth.require_client_password_reset_token = true
             @redirect_url = 'http://client-app.dev'
             get_reset_token
-            edit_url = CGI.unescape(@mail.body.match(/href=\"(.+)\"/)[1])
+            edit_url = CGI.unescape(@mail.body.match(/href="(.+)"/)[1])
             query_parts = Rack::Utils.parse_nested_query(URI.parse(edit_url).query)
             get :edit, params: query_parts
-            
           end
 
           test 'reponse should be redirect' do
@@ -668,8 +666,8 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
 
         describe 'without valid headers' do
           before do
-           @auth_headers = @resource.create_named_token_pair
-           new_password = Faker::Internet.password
+            @auth_headers = @resource.create_named_token_pair
+            new_password = Faker::Internet.password
 
             put :update, params: { password: new_password,
                                    password_confirmation: new_password }
@@ -856,8 +854,8 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
         @config_name  = 'altUser'
 
         params = { email: @resource.email,
-                                redirect_url: @redirect_url,
-                                config_name: @config_name }
+                   redirect_url: @redirect_url,
+                   config_name: @config_name }
         get_reset_token params
       end
 
@@ -875,7 +873,7 @@ class DeviseJwtAuth::PasswordsControllerTest < ActionController::TestCase
 
       @mail_config_name  = CGI.unescape(@mail.body.match(/config=([^&]*)&/)[1])
       @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)&/)[1])
-      @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)\"/)[1]
+      @mail_reset_token  = @mail.body.match(/reset_password_token=(.*)"/)[1]
     end
   end
 end

data/test/controllers/devise_jwt_auth/refresh_token_controller_test.rb

@@ -8,8 +8,7 @@ class DeviseJwtAuth::RefreshTokenControllerTest < ActionDispatch::IntegrationTes
       before do
         @resource = create(:user, :confirmed)
         @auth_headers = get_cookie_header(DeviseJwtAuth.refresh_token_name,
-                                          @resource.create_refresh_token
-        )
+                                          @resource.create_refresh_token)
         get '/auth/refresh_token', params: {}, headers: @auth_headers
         @resp = JSON.parse(response.body)
       end
@@ -22,13 +21,12 @@ class DeviseJwtAuth::RefreshTokenControllerTest < ActionDispatch::IntegrationTes
         assert @resp[DeviseJwtAuth.access_token_name]
       end
     end
-    
+
     describe 'unconfirmed user' do
       before do
         @resource = create(:user)
         @auth_headers = get_cookie_header(DeviseJwtAuth.refresh_token_name,
-                                          @resource.create_refresh_token
-        )
+                                          @resource.create_refresh_token)
         get '/auth/refresh_token', params: {}, headers: @auth_headers
         @resp = JSON.parse(response.body)
       end
@@ -41,19 +39,18 @@ class DeviseJwtAuth::RefreshTokenControllerTest < ActionDispatch::IntegrationTes
         assert_nil @resp[DeviseJwtAuth.access_token_name]
       end
     end
-    
+
     describe 'an expired token' do
       before do
         @resource = create(:user, :confirmed)
         @exp = (Time.now - 1.hour).to_i
         @expired_token = @resource.create_refresh_token(exp: @exp)
         @auth_headers = get_cookie_header(DeviseJwtAuth.refresh_token_name,
-                                          @expired_token
-        )
+                                          @expired_token)
         get '/auth/refresh_token', params: {}, headers: @auth_headers
         @resp = JSON.parse(response.body)
       end
-      
+
       it 'response error' do
         assert_equal 401, response.status
       end
@@ -66,12 +63,11 @@ class DeviseJwtAuth::RefreshTokenControllerTest < ActionDispatch::IntegrationTes
     describe 'an invalid refresh token' do
       before do
         @auth_headers = get_cookie_header(DeviseJwtAuth.refresh_token_name,
-                                          "invalid-token"
-        )
+                                          'invalid-token')
         get '/auth/refresh_token', params: {}, headers: @auth_headers
         @resp = JSON.parse(response.body)
       end
-      
+
       it 'response error' do
         assert_equal 401, response.status
       end

data/test/controllers/devise_jwt_auth/registrations_controller_test.rb

@@ -105,7 +105,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
 
         @data = JSON.parse(response.body)
       end
-      
+
       test 'an access token should be returned' do
         assert @data[DeviseJwtAuth.access_token_name]
       end
@@ -185,7 +185,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
                        unpermitted_param: '(x_x)' }
 
         @data = JSON.parse(response.body)
-        
+
         assert_equal 422, response.status
         assert_nil @data[DeviseJwtAuth.access_token_name]
         assert_nil response.cookies[DeviseJwtAuth.refresh_token_name]
@@ -223,17 +223,17 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
         @resource = assigns(:resource)
         @data = JSON.parse(response.body)
         @mail = ActionMailer::Base.deliveries.last
-        @sent_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)(&|\")/)[1])
+        @sent_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=([^&]*)(&|")/)[1])
       end
-      
+
       teardown do
         DeviseJwtAuth.default_confirm_success_url = nil
       end
-      
+
       test 'request should be successful' do
         assert_equal 200, response.status
       end
-      
+
       test 'email contains the default redirect url' do
         assert_equal @redirect_url, @sent_redirect_url
       end
@@ -310,7 +310,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
         @mail = ActionMailer::Base.deliveries.last
 
         @mail_reset_token  = @mail.body.match(/confirmation_token=([^&]*)&/)[1]
-        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)\"/)[1])
+        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)"/)[1])
         @mail_config_name  = CGI.unescape(@mail.body.match(/config=([^&]*)&/)[1])
       end
 
@@ -449,10 +449,10 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
         before do
           @existing_user = create(:user, :confirmed)
           @auth_headers = @existing_user.create_named_token_pair
-          #@client_id     = @auth_headers['client']
+          # @client_id     = @auth_headers['client']
 
           # ensure request is not treated as batch request
-          #age_token(@existing_user, @client_id)
+          # age_token(@existing_user, @client_id)
 
           delete '/auth', params: {}, headers: @auth_headers
 
@@ -495,7 +495,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
     describe 'Update user account' do
       describe 'existing user' do
         before do
-          @existing_user = create(:user, :confirmed)          
+          @existing_user = create(:user, :confirmed)
           @auth_headers = @existing_user.create_named_token_pair
 
           # @client_id     = @auth_headers['client']
@@ -799,7 +799,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
         @resource.skip_confirmation!
         @resource.save!
         @auth_headers = @resource.create_named_token_pair
-  
+
         # @client_id     = @auth_headers['client']
 
         # ensure request is not treated as batch request
@@ -832,7 +832,7 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
         @resource.reload
 
         @mail_reset_token  = @mail.body.match(/confirmation_token=([^&]*)&/)[1]
-        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)\"/)[1])
+        @mail_redirect_url = CGI.unescape(@mail.body.match(/redirect_url=(.*)"/)[1])
         @mail_config_name  = CGI.unescape(@mail.body.match(/config=([^&]*)&/)[1])
       end
 
@@ -879,20 +879,18 @@ class DeviseJwtAuth::RegistrationsControllerTest < ActionDispatch::IntegrationTe
       test 'user was confirmed' do
         assert @resource.confirmed?
       end
-      
-=begin
-      test 'auth headers were returned in response' do
-        assert response.headers['access-token']
-        assert response.headers['token-type']
-        assert response.headers['client']
-        assert response.headers['expiry']
-        assert response.headers['uid']
-      end
 
-      test 'response token is valid' do
-        assert @resource.valid_token?(@token, @client_id)
-      end
-=end
+      #       test 'auth headers were returned in response' do
+      #         assert response.headers['access-token']
+      #         assert response.headers['token-type']
+      #         assert response.headers['client']
+      #         assert response.headers['expiry']
+      #         assert response.headers['uid']
+      #       end
+      #
+      #       test 'response token is valid' do
+      #         assert @resource.valid_token?(@token, @client_id)
+      #       end
     end
 
     describe 'User with only :database_authenticatable and :registerable included' do

data/test/controllers/devise_jwt_auth/sessions_controller_test.rb

@@ -141,7 +141,8 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
           assert_nil @data[DeviseJwtAuth.access_token_name]
         end
 
-        test 'response should not have refresh token' do
+        test 'response should delete refresh token from client' do
+          assert_equal true, response.cookies.keys.include?(DeviseJwtAuth.refresh_token_name)
           assert_nil response.cookies[DeviseJwtAuth.refresh_token_name]
         end
 
@@ -174,7 +175,7 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
 
         test 'response should not have refresh token' do
           assert_nil response.cookies[DeviseJwtAuth.refresh_token_name]
-        end        
+        end
       end
 
       describe 'failure' do
@@ -206,37 +207,35 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
         end
       end
 
-=begin
-      describe 'failure with bad password when change_headers_on_each_request false' do
-        before do
-          DeviseJwtAuth.change_headers_on_each_request = false
-
-          # accessing current_user calls through set_user_by_token,
-          # which initializes client_id
-          @controller.current_user
-
-          post :create,
-               params: { email: @existing_user.email,
-                         password: 'bogus' }
-
-          @resource = assigns(:resource)
-          @data = JSON.parse(response.body)
-        end
-
-        test 'request should fail' do
-          assert_equal 401, response.status
-        end
-
-        test 'response should contain errors' do
-          assert @data['errors']
-          assert_equal @data['errors'], [I18n.t('devise_jwt_auth.sessions.bad_credentials')]
-        end
-
-        after do
-          DeviseJwtAuth.change_headers_on_each_request = true
-        end
-      end
-=end
+      #       describe 'failure with bad password when change_headers_on_each_request false' do
+      #         before do
+      #           DeviseJwtAuth.change_headers_on_each_request = false
+      #
+      #           # accessing current_user calls through set_user_by_token,
+      #           # which initializes client_id
+      #           @controller.current_user
+      #
+      #           post :create,
+      #                params: { email: @existing_user.email,
+      #                          password: 'bogus' }
+      #
+      #           @resource = assigns(:resource)
+      #           @data = JSON.parse(response.body)
+      #         end
+      #
+      #         test 'request should fail' do
+      #           assert_equal 401, response.status
+      #         end
+      #
+      #         test 'response should contain errors' do
+      #           assert @data['errors']
+      #           assert_equal @data['errors'], [I18n.t('devise_jwt_auth.sessions.bad_credentials')]
+      #         end
+      #
+      #         after do
+      #           DeviseJwtAuth.change_headers_on_each_request = true
+      #         end
+      #       end
 
       describe 'case-insensitive email' do
         before do
@@ -284,7 +283,6 @@ class DeviseJwtAuth::SessionsControllerTest < ActionController::TestCase
           @data = JSON.parse(response.body)
 
           assert_equal 200, response.status
-          # p 'DATA', @data.inspect
           assert @data[DeviseJwtAuth.access_token_name]
           assert response.cookies[DeviseJwtAuth.refresh_token_name]
         end

data/test/controllers/devise_jwt_auth/unlocks_controller_test.rb

@@ -95,7 +95,7 @@ class DeviseJwtAuth::UnlocksControllerTest < ActionController::TestCase
             @data = JSON.parse(response.body)
 
             @mail_config_name  = CGI.unescape(@mail.body.match(/config=([^&]*)&/)[1])
-            @mail_reset_token  = @mail.body.match(/unlock_token=(.*)\"/)[1]
+            @mail_reset_token  = @mail.body.match(/unlock_token=(.*)"/)[1]
           end
 
           test 'response should return success status' do
@@ -161,7 +161,7 @@ class DeviseJwtAuth::UnlocksControllerTest < ActionController::TestCase
           before do
             @resource_class = LockableUser
             @request_params = {
-              email:        @resource.email.upcase
+              email: @resource.email.upcase
             }
           end