devise_masquerade 0.6.5 → 2.1.0

data/spec/dummy/db/schema.rb

@@ -1,52 +1,58 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140418160449) do
+ActiveRecord::Schema.define(version: 2019_10_22_100000) do
 
-  create_table "admin_users", :force => true do |t|
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
-    t.string   "reset_password_token"
+  create_table "admin_users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer "sign_in_count", default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_admin_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_admin_users_on_reset_password_token", unique: true
   end
 
-  add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
-  add_index "admin_users", ["reset_password_token"], :name => "index_admin_users_on_reset_password_token", :unique => true
+  create_table "students", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index "\"reset_password_token\"", name: "index_students_on_reset_password_token", unique: true
+    t.index ["email"], name: "index_students_on_email", unique: true
+  end
 
-  create_table "users", :force => true do |t|
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
-    t.string   "reset_password_token"
+  create_table "users", force: :cascade do |t|
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer "sign_in_count", default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["email"], name: "index_users_on_email", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
-  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
-
 end

data/spec/models/user_spec.rb

@@ -3,37 +3,10 @@ require 'spec_helper'
 describe User do
   let!(:user) { create(:user) }
 
-  describe '#masquerade!' do
+  describe '#masquerade_key' do
     it 'should cache special key on masquerade' do
-      expect(SecureRandom).to receive(:urlsafe_base64).with(16) { "secure_key" }
-      user.masquerade!
-    end
-  end
-
-  describe '#remove_masquerade_key' do
-    before { allow(SecureRandom).to receive(:urlsafe_base64) { "secure_key" } }
-
-    let(:key) { 'users:secure_key:masquerade' }
-
-    it 'should be possible to remove cached masquerade key' do
-      user.masquerade!
-      expect(Rails.cache.exist?(key)).to eq(true)
-
-      User.remove_masquerade_key!('secure_key')
-      expect(Rails.cache.exist?(key)).to eq(false)
-    end
-  end
-
-  describe '#find_by_masquerade_key' do
-    it 'should be possible to find user by generate masquerade key' do
-      user.masquerade!
-
-      allow(Rails.cache).to receive(:read).with("users:#{user.masquerade_key}:masquerade") { user.id }
-      allow(Rails.cache).to receive(:delete).with("users:#{user.masquerade_key}:masquerade")
-
-      new_user = User.find_by_masquerade_key(user.masquerade_key)
-
-      expect(new_user).to eq(user)
+      expect(user).to receive(:to_sgid).with(expires_in: 1.minute, for: 'masquerade') { "secure_key" }
+      user.masquerade_key
     end
   end
 end

data/spec/orm/active_record.rb

@@ -1,5 +1,8 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 
-ActiveRecord::Migrator.migrate(File.expand_path("../dummy/db/migrate/", __FILE__))
-
+ActiveRecord::MigrationContext.
+  new(
+    File.expand_path("../../dummy/db/migrate/", __FILE__),
+    ActiveRecord::Base.connection.schema_migration
+  ).migrate

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'devise_masquerade'
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rails/test_help'
 require 'rspec/rails'
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 
 Rails.backtrace_cleaner.remove_silencers!
@@ -18,9 +18,9 @@ RSpec.configure do |config|
   require 'rspec/expectations'
   config.include RSpec::Matchers
 
-  config.include Devise::TestHelpers, :type => :controller
+  config.include Devise::Test::ControllerHelpers, :type => :controller
   config.include Warden::Test::Helpers
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include Authentication
 
   config.raise_errors_for_deprecations!

data/spec/support/factories.rb

@@ -1,16 +1,20 @@
-FactoryGirl.define do
-  sequence(:email) { |i| "john#{i}@example.com" }
-
+FactoryBot.define do
   factory :user do
-    email
-    password 'password'
-    password_confirmation 'password'
+    sequence(:email) { |i| "user#{i}@example.com" }
+    password  { 'password' }
+    password_confirmation { 'password' }
   end
 
   factory :admin_user, :class => 'Admin::User' do
-    email
-    password 'password'
-    password_confirmation 'password'
+    sequence(:email) { |i| "admin#{i}@example.com" }
+    password  { 'password' }
+    password_confirmation { 'password' }
+  end
+
+  factory :student do
+    sequence(:email) { |i| "student#{i}@example.com" }
+    password  { 'password' }
+    password_confirmation { 'password' }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_masquerade
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 2.1.0
 platform: ruby
 authors:
 - Alexandr Korsak
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 4.7.0
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 description: devise masquerade library
 email:
 - alex.korsak@gmail.com
@@ -59,12 +73,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
+- ".github/workflows/brakeman-analysis.yml"
+- ".github/workflows/rubocop-analysis.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
 - ".rvmrc"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - Makefile
@@ -74,13 +92,19 @@ files:
 - config/environment.rb
 - devise_masquerade.gemspec
 - features/back.feature
+- features/expires_masquerade.feature
+- features/multiple_masquerading_models.feature
 - features/step_definitions/auth_steps.rb
 - features/step_definitions/back_steps.rb
+- features/step_definitions/expires_steps.rb
+- features/step_definitions/url_helpers_steps.rb
 - features/support/env.rb
+- features/url_helpers.feature
 - lib/devise_masquerade.rb
 - lib/devise_masquerade/controllers/helpers.rb
 - lib/devise_masquerade/controllers/url_helpers.rb
-- lib/devise_masquerade/model.rb
+- lib/devise_masquerade/models.rb
+- lib/devise_masquerade/models/masqueradable.rb
 - lib/devise_masquerade/rails.rb
 - lib/devise_masquerade/routes.rb
 - lib/devise_masquerade/version.rb
@@ -88,20 +112,25 @@ files:
 - spec/controllers/admin/dashboard_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/devise/masquerades_controller_spec.rb
-- spec/controllers/masquerades_controller_spec.rb
+- spec/controllers/masquerades_tests_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/admin/dashboard_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dashboard_controller.rb
-- spec/dummy/app/controllers/masquerades_controller.rb
+- spec/dummy/app/controllers/masquerades_tests_controller.rb
+- spec/dummy/app/controllers/students_controller.rb
 - spec/dummy/app/controllers/users/masquerades_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/admin.rb
 - spec/dummy/app/models/admin/user.rb
+- spec/dummy/app/models/student.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/admin/dashboard/index.html.erb
+- spec/dummy/app/views/dashboard/extra_params.html.erb
 - spec/dummy/app/views/dashboard/index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/students/_student.html.erb
+- spec/dummy/app/views/students/index.html.erb
 - spec/dummy/app/views/users/_user.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -120,8 +149,10 @@ files:
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/20121119085620_devise_create_users.rb
 - spec/dummy/db/migrate/20140418160449_create_admin_users.rb
+- spec/dummy/db/migrate/20191022100000_create_students.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/.empty
@@ -131,11 +162,11 @@ files:
 - spec/spec_helper.rb
 - spec/support/authentication.rb
 - spec/support/factories.rb
-homepage: http://github.com/oivoodoo/devise_masquerade/
+homepage: http://github.com/oivoodoo/devise_masquerade
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,33 +181,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: use for login as functionallity on your admin users pages
 test_files:
 - features/back.feature
+- features/expires_masquerade.feature
+- features/multiple_masquerading_models.feature
 - features/step_definitions/auth_steps.rb
 - features/step_definitions/back_steps.rb
+- features/step_definitions/expires_steps.rb
+- features/step_definitions/url_helpers_steps.rb
 - features/support/env.rb
+- features/url_helpers.feature
 - spec/controllers/admin/dashboard_controller_spec.rb
 - spec/controllers/dashboard_controller_spec.rb
 - spec/controllers/devise/masquerades_controller_spec.rb
-- spec/controllers/masquerades_controller_spec.rb
+- spec/controllers/masquerades_tests_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/admin/dashboard_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/dashboard_controller.rb
-- spec/dummy/app/controllers/masquerades_controller.rb
+- spec/dummy/app/controllers/masquerades_tests_controller.rb
+- spec/dummy/app/controllers/students_controller.rb
 - spec/dummy/app/controllers/users/masquerades_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/admin.rb
 - spec/dummy/app/models/admin/user.rb
+- spec/dummy/app/models/student.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/admin/dashboard/index.html.erb
+- spec/dummy/app/views/dashboard/extra_params.html.erb
 - spec/dummy/app/views/dashboard/index.html.erb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/app/views/students/_student.html.erb
+- spec/dummy/app/views/students/index.html.erb
 - spec/dummy/app/views/users/_user.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -195,8 +235,10 @@ test_files:
 - spec/dummy/config/locales/devise.en.yml
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/.gitignore
 - spec/dummy/db/migrate/20121119085620_devise_create_users.rb
 - spec/dummy/db/migrate/20140418160449_create_admin_users.rb
+- spec/dummy/db/migrate/20191022100000_create_students.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/.empty

data/lib/devise_masquerade/model.rb

@@ -1,42 +0,0 @@
-module Devise
-  module Models
-    module Masqueradable
-      def self.included(base)
-        base.class_eval do
-          attr_reader :masquerade_key
-
-          include InstanceMethods
-          extend ClassMethods
-        end
-      end
-
-      module InstanceMethods
-        def masquerade!
-          @masquerade_key = SecureRandom.urlsafe_base64(Devise.masquerade_key_size)
-          cache_key = self.class.cache_masquerade_key_by(@masquerade_key)
-          Rails.cache.write(cache_key, id, :expires_in => Devise.masquerade_expires_in)
-        end
-      end
-
-      module ClassMethods
-        def cache_masquerade_key_by(key)
-          "#{self.name.pluralize.underscore}:#{key}:masquerade"
-        end
-
-        def remove_masquerade_key!(key)
-          Rails.cache.delete(cache_masquerade_key_by(key))
-        end
-
-        def find_by_masquerade_key(key)
-          id = Rails.cache.read(cache_masquerade_key_by(key))
-
-          # clean up the cached masquerade key value
-          remove_masquerade_key!(key)
-
-          where(id: id).first
-        end
-      end # ClassMethods
-    end
-  end
-end
-

data/spec/controllers/masquerades_controller_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe MasqueradesController, type: :controller do
-  before { @request.env['devise.mapping'] = Devise.mappings[:user] }
-
-  context 'no access for masquerade' do
-    before do
-      session.clear
-      allow_any_instance_of(MasqueradesController).to receive(:masquerade_authorized?) { false }
-    end
-
-    before { logged_in }
-
-    let(:mask) { create(:user) }
-
-    before { get :show, :id => mask.to_param }
-
-    it { expect(response.status).to eq(403) }
-    it { expect(session.keys).not_to include('devise_masquerade_user') }
-    it { expect(session["warden.user.user.key"].first.first).not_to eq(mask.id) }
-  end
-
-  context 'access for masquerade' do
-    before do
-      session.clear
-      allow_any_instance_of(MasqueradesController).to receive(:masquerade_authorized?) { true }
-    end
-
-    before { logged_in }
-
-    let(:mask) { create(:user) }
-
-    before do
-      expect(SecureRandom).to receive(:urlsafe_base64) { "secure_key" }
-      get :show, :id => mask.to_param
-    end
-
-    it { expect(response.status).to eq(302) }
-    it { expect(session.keys).to include('devise_masquerade_user') }
-    it { expect(session["warden.user.user.key"].first.first).to eq(mask.id) }
-  end
-end

data/spec/dummy/app/controllers/masquerades_controller.rb

@@ -1,5 +0,0 @@
-class MasqueradesController < Devise::MasqueradesController
-  def show
-    super
-  end
-end