devise-otp 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ab31b9f7027a1468e535a1ac862c26cfc95891bdf10a618115a66767e1c5d16
-  data.tar.gz: c603692b0be3e3fbd22d4296299ccd0d5b9a42a1f9ab1f4d6cd7186ea3a864a8
+  metadata.gz: 95e8a170c1942c78dae2cb24c06a818c6e91854268acf78df61b83e22fd18726
+  data.tar.gz: 409a75794455459fa1c88892216d556b138cf1a40f4bfe0a06f3ce65a47a528e
 SHA512:
-  metadata.gz: d7668d8f50ee7704c7b18eff92c16384eb47186ebf646260391686addd2acc9a06f3dcb92ffd7a70f87ec20106acbaa8e2e1cda4d6e1ebaabdc68ad27c80996b
-  data.tar.gz: 47ab6592ff48f37715e61f07e81813d75a99bd2d971a79642051b27fb14efd6de2dcddf71a6d579f4cbd8d0ed379044cb59e80da78683b2573e4cf0e47a1d329
+  metadata.gz: 45d13d374f2a2504fcee11d81f8771712ae706d138725e3bb777470b099b106cb09ffdb4e2132b6ac5c837b00bb341ff9b5fc56ce5981ff144b358d1e8ed4338
+  data.tar.gz: b946e7a0551ba464285e324559f287a9765657258159e508fe08f4b22068548a4be6602d3173a6fac46638130e5795c69bdbdd4b28031d48cfaa592b87eef9da

data/.github/workflows/ci.yml

@@ -7,28 +7,27 @@ on:
 
 jobs:
   rspec:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         ruby:
+          - '3.3'
+          - '3.2'
           - '3.1'
+          - 'head'
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Bundle
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
+          bundler-cache: true
 
       - name: Run tests
         env:
           DEVISE_ORM: active_record
-        run: rake test
+        run: bundle exec rake test

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Upgrade gemspec to support Rails v7.2
+
 ## 0.7.0
 
 Breaking changes:
@@ -57,4 +61,3 @@ Fixes:
 
 - mandatory otp fix by @cotcomsol in #68
 - remove success message by @strzibny in #69
-

data/Gemfile

@@ -2,3 +2,13 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in devise-otp.gemspec
 gemspec
+
+gem "capybara"
+gem "minitest-reporters", ">= 0.5.0"
+gem "puma"
+gem "rake"
+gem "rdoc"
+gem "shoulda"
+gem "sprockets-rails"
+gem "sqlite3", "~> 1.4"
+gem "standardrb"

data/app/controllers/devise_otp/devise/otp_tokens_controller.rb

@@ -33,7 +33,7 @@ module DeviseOtp
         if resource.valid_otp_token?(params[:confirmation_code])
           resource.enable_otp!
           otp_set_flash_message :success, :successfully_updated
-          redirect_to action: :show
+          redirect_to otp_token_path_for(resource)
         else
           otp_set_flash_message :danger, :could_not_confirm
           render :edit
@@ -48,7 +48,7 @@ module DeviseOtp
           otp_set_flash_message :success, :successfully_disabled_otp
         end
 
-        redirect_to action: :show
+        redirect_to otp_token_path_for(resource)
       end
 
       #
@@ -59,7 +59,7 @@ module DeviseOtp
           otp_set_flash_message :success, :successfully_set_persistence
         end
 
-        redirect_to action: :show
+        redirect_to otp_token_path_for(resource)
       end
 
       #
@@ -70,7 +70,7 @@ module DeviseOtp
           otp_set_flash_message :success, :successfully_cleared_persistence
         end
 
-        redirect_to action: :show
+        redirect_to otp_token_path_for(resource)
       end
 
       #
@@ -81,7 +81,7 @@ module DeviseOtp
           otp_set_flash_message :notice, :successfully_reset_persistence
         end
 
-        redirect_to action: :show
+        redirect_to otp_token_path_for(resource)
       end
 
       def recovery
@@ -100,7 +100,7 @@ module DeviseOtp
           otp_set_flash_message :success, :successfully_reset_otp
         end
 
-        redirect_to action: :edit
+        redirect_to edit_otp_token_path_for(resource)
       end
 
       private

data/app/views/devise/otp_tokens/show.html.erb

@@ -7,7 +7,7 @@
   <%= render :partial => 'trusted_devices' if trusted_devices_enabled? %>
 
   <% unless otp_mandatory_on?(resource) %>
-    <%= button_to I18n.t('disable_link', :scope => 'devise.otp.otp_tokens'), @resource, :method => :delete, :data => { "turbo-method": "DELETE" } %>
+    <%= button_to I18n.t('disable_link', :scope => 'devise.otp.otp_tokens'), otp_token_path_for(resource), :method => :delete, :data => { "turbo-method": "DELETE" } %>
   <% end %>
 <% else %>
   <%= link_to I18n.t('enable_link', :scope => 'devise.otp.otp_tokens'), edit_otp_token_path_for(resource) %>

data/devise-otp.gemspec

@@ -14,16 +14,7 @@ Gem::Specification.new do |gem|
   gem.files = `git ls-files`.split($/)
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency "rails", ">= 6.1", "< 7.2"
-  gem.add_runtime_dependency "devise", ">= 4.8.0", "< 5.0"
-  gem.add_runtime_dependency "rotp", ">= 2.0.0"
-
-  gem.add_development_dependency "capybara"
-  gem.add_development_dependency "minitest-reporters", ">= 0.5.0"
-  gem.add_development_dependency "puma"
-  gem.add_development_dependency "rdoc"
-  gem.add_development_dependency "shoulda"
-  gem.add_development_dependency "sprockets-rails"
-  gem.add_development_dependency "sqlite3", "~> 1.4"
-  gem.add_development_dependency "standardrb"
+  gem.add_dependency "rails", ">= 7.0", "< 8.0"
+  gem.add_dependency "devise", ">= 4.8.0", "< 5.0"
+  gem.add_dependency "rotp", ">= 2.0.0"
 end

data/docs/QR_CODES.md

@@ -6,43 +6,4 @@ To do that, add the the following line to your `application.js` file:
 
     //= require devise-otp
 
-You can change this behavior by overriding the `otp_authenticator_token_image` method in your view helper to call `otp_authenticator_token_image_google`:
-
-```ruby
-def otp_authenticator_token_image(resource)
-  otp_authenticator_token_image_google(resource.otp_provisioning_uri)
-end
-```
-
-This will call [Google API](https://github.com/wmlele/devise-otp/tree/master/lib/devise_otp_authenticatable/controllers/helpers.rb#L160) to render the QR code.
-
-If your application is configured to use CSP policies, you'll need to authorize `chart.googleapis.com`. Here's an example with [secure_headers](https://github.com/github/secure_headers)):
-
-```ruby
-config.csp[:img_src] << 'chart.googleapis.com'
-```
-
-A third option consists in installing [jquery-qrcode]https://github.com/jeromeetienne/jquery-qrcode with Yarn or [shakapacker](https://github.com/shakacode/shakapacker) and overriding `otp_authenticator_token_image` to render some HTML :
-
-```ruby
-def otp_authenticator_token_image(resource)
-  tag(:span, data: { toggle: 'qrcode', otp_url: resource.otp_provisioning_uri, width: 192, height: 192, render: 'canvas' })
-end
-```
-The QR code is then rendered by `jquery-qrcode` by setting a JS listener in your `application.js` :
-
-```js
-  $(document).on('turbo:load', function() {
-    return $('[data-toggle=qrcode]').each(function() {
-      var data;
-      data = $(this).data();
-      return $(this).qrcode({
-        text: data['otpUrl'],
-        width: data['width'],
-        height: data['height'],
-        render: data['render']
-      });
-    });
-  });
-```
-This way you don't rely on external services to render the QR codes.
+You can change this behavior by overriding the `otp_authenticator_token_image` method in your view helper.

data/lib/devise/strategies/database_authenticatable.rb

@@ -42,7 +42,7 @@ module Devise
       end
 
       def otp_challenge_url
-        if Rails.env.development?
+        if Rails.env.development? || Rails.env.test?
           host = "#{request.host}:#{request.port}"
         else
           host = "#{request.host}"

data/lib/devise-otp/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module OTP
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,4 +1,4 @@
-class DeviseOtpAddTo<%= table_name.camelize %> < ActiveRecord::Migration
+class DeviseOtpAddTo<%= table_name.camelize %> < ActiveRecord::Migration[7.0]
   def self.up
     change_table :<%= table_name %> do |t|
       t.string    :otp_auth_secret

data/test/dummy/config/routes.rb

@@ -1,6 +1,6 @@
 Dummy::Application.routes.draw do
-  devise_for :users
   devise_for :admins
+  devise_for :users
 
   resources :posts
   resources :admin_posts

data/test/orm/active_record.rb

@@ -3,4 +3,9 @@ ActiveRecord::Base.logger = Logger.new(nil)
 
 migrations_path = File.expand_path("../../dummy/db/migrate/", __FILE__)
 
-ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate
+if Rails.version.to_f >= 7.2
+  ActiveRecord::MigrationContext.new(migrations_path).migrate
+else
+  # To support order versions of Rails (pre v7.2)
+  ActiveRecord::MigrationContext.new(migrations_path, ActiveRecord::SchemaMigration).migrate
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-otp
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Lele Forzani
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-13 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -65,118 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: standardrb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Time Based OTP/rfc6238 compatible authentication for Devise
 email:
 - lele@windmill.it