devise_oauth2_rails4 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e7d2d199baa817a83576cdfbe8c2b651539c5d0
-  data.tar.gz: 4500ffa2417af62b59f952fcbc1ffbf3c0ec12f2
+  metadata.gz: 9a866772361adcb28e37292907bf7ac3f57ecbbf
+  data.tar.gz: c1eeb351c84781d24bc1cb402887675aca6a389e
 SHA512:
-  metadata.gz: 11513bb7995764ea4dac25e9471913028184ba61e7f51f29b987af2d87967a53ca2bd0b389377947d76523d3a14848de4bbe071e3bcebb3401dde7d29ca91cd4
-  data.tar.gz: 56fdce48f47e14e61c9210a93720d1f1a733259e1a219bd769c3523f92f8bcb1f7429a42eeb07dfa8f3549a2f225ab8ff1b6f316671a5ddc065e7cd3895609e2
+  metadata.gz: 95a2a339b362eb07677327308faacbd50dfb08837b3db30b8935bb06bc2a9bba9d022d875f6ad0ac6697fadd109e1a8b376b039b303ffcd53f1325743628a1c0
+  data.tar.gz: 038e545d7b5d5215d79ee5fbdc7e6fdddaf5e56420ad54b792dbd9ee38a1338b62488c5d87991ff66a2852180e84622fcf003521c8fbda8771b5939e3de10802

data/.gitignore

@@ -4,6 +4,12 @@ coverage
 # rdoc generated
 rdoc
 
+# RubyMine
+/.idea
+
+# Ignore self.gem
+/*.gem
+
 # yard generated
 doc
 .yardoc

data/.ruby-gemset

@@ -1 +1 @@
-devise_oauth2_providable
+devise_oauth2_rails4

data/CONTRIBUTORS.txt

@@ -2,5 +2,6 @@ Ryan Sonnek - Original Author
 Brian Wheeler - Rails 4 Version Adopter
 
 Complete list of contributors:
+https://github.com/bwheeler96/devise_oauth2_rails4/contibutors
 https://github.com/socialcast/devise_oauth2_providable/contributors
 

data/README.md

@@ -25,7 +25,7 @@ the request.  http://tools.ietf.org/html/draft-ietf-oauth-v2-bearer-04
 #### Install gem
 ```ruby
 # Gemfile
-gem 'devise_oauth2_providable'
+gem 'devise_oauth2_rails4'
 ```
 
 #### Migrate database for Oauth2 models
@@ -39,7 +39,7 @@ $ rake db:migrate
 # config/routes.rb
 Rails.application.routes.draw do
   # oauth routes can be mounted to any path (ex: /oauth2 or /oauth)
-  mount Devise::Oauth2Providable::Engine => '/oauth2'
+  mount Devise::Oauth2::Engine => '/oauth2'
 end
 ```
 

data/Rakefile

@@ -3,6 +3,6 @@ require "bundler/gem_tasks"
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('spec')
-task :default => :spec
+#require 'rspec/core/rake_task'
+#RSpec::Core::RakeTask.new('spec')
+#task :default => :spec

data/app/controllers/devise/{oauth2_providable → oauth2}/authorizations_controller.rb

@@ -1,7 +1,9 @@
 module Devise
-  module Oauth2Providable
+  module Oauth2
     class AuthorizationsController < ApplicationController
 
+      #include ::PermissionsHelper
+
       before_action :authenticate_user!
 
       rescue_from Rack::OAuth2::Server::Authorize::BadRequest do |e|
@@ -44,7 +46,7 @@ module Devise
                     authorization_code = current_user.authorization_codes.create!(:client => @client)
                     res.code = authorization_code.token
                   when :token
-                    access_token = current_user.access_tokens.create!(:client => @client).token
+                    access_token = current_user.access_tokens.create!(:client => @client, permissions: requested_permissions).token
                     bearer_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token)
                     res.access_token = bearer_token
                     # res.uid = current_user.id
@@ -62,6 +64,10 @@ module Devise
         respond *authorization.call(request.env)
       end
 
+      def requested_permissions
+        params[:permissions] || @client.default_permissions
+      end
+
     end
   end
 end

data/app/controllers/devise/oauth2/tokens_controller.rb

@@ -0,0 +1,23 @@
+module Devise
+  module Oauth2
+    class TokensController < ApplicationController
+      before_action :authenticate_user!
+      skip_before_action :verify_authenticity_token, :only => :create
+
+      def create
+        @refresh_token = oauth2_current_refresh_token || oauth2_current_client.refresh_tokens.create!(:user => current_user)
+        @access_token = @refresh_token.access_tokens.create!(:client => oauth2_current_client, :user => current_user)
+        render :json => @access_token.token_response
+      end
+
+      private
+
+      def oauth2_current_client
+       env[Devise::Oauth2Providable::CLIENT_ENV_REF]
+      end
+      def oauth2_current_refresh_token
+        env[Devise::Oauth2Providable::REFRESH_TOKEN_ENV_REF]
+      end
+    end
+  end
+end

data/app/models/devise/oauth2/access_token.rb

@@ -0,0 +1,39 @@
+class Devise::Oauth2::AccessToken < ActiveRecord::Base
+
+  expires_according_to :access_token_expires_in
+  before_validation :restrict_expires_at, :on => :create, :if => :refresh_token
+  belongs_to :refresh_token
+
+  serialize :permissions
+
+  def permissions=(permissions)
+    super(permissions) if permissions.is_a? Array
+    permissions = permissions.split(/[,\s\n\b\t]/).keep_if { |x| !x.empty? } if permissions.is_a? String
+    super(permissions)
+  end
+
+  def token_response
+    response = {
+      :access_token => token,
+      :token_type => 'bearer',
+      :expires_in => expires_in
+    }
+    response[:refresh_token] = refresh_token.token if refresh_token
+    response
+  end
+
+  def method_missing(method)
+    if method.to_s.match /^can_.*\?$/
+      permission = method.to_s.match(/^can_(.*)\?$/)[1]
+      return true if permission.in? self.permissions
+      return false
+    end
+    super(method)
+  end
+
+  private
+
+  def restrict_expires_at
+    self.expires_at = [self.expires_at, refresh_token.expires_at].compact.min
+  end
+end

data/app/models/devise/oauth2/authorization_code.rb

@@ -0,0 +1,3 @@
+class Devise::Oauth2::AuthorizationCode < ActiveRecord::Base
+  expires_according_to :authorization_code_expires_in
+end

data/app/models/devise/oauth2/client.rb

@@ -0,0 +1,29 @@
+class Devise::Oauth2::Client < ActiveRecord::Base
+
+  has_many :access_tokens
+  has_many :refresh_tokens
+  has_many :authorization_codes
+
+  before_validation :init_identifier, :on => :create, :unless => :identifier?
+  before_validation :init_secret, :on => :create, :unless => :secret?
+  validates :identifier, :presence => true, :uniqueness => true
+
+  serialize :default_permissions
+
+  def default_permissions=(permissions)
+    super(permissions) if permissions.is_a? Array
+    permissions = permissions.split(/[,\s\n\b\t]/).keep_if { |x| !x.blank? } if permissions.is_a? String
+    super(permissions)
+  end
+
+  private
+
+  def init_identifier
+    self.identifier = Devise::Oauth2.random_id
+  end
+
+  def init_secret
+    self.secret = Devise::Oauth2.random_id
+  end
+
+end

data/app/models/devise/{oauth2_providable → oauth2}/refresh_token.rb

@@ -1,4 +1,4 @@
-class Devise::Oauth2Providable::RefreshToken < ActiveRecord::Base
+class Devise::Oauth2::RefreshToken < ActiveRecord::Base
   expires_according_to :refresh_token_expires_in
 
   # Deprecated

data/app/views/devise/{oauth2_providable → oauth2}/authorizations/_form.html.erb

@@ -1,4 +1,5 @@
 <%= form_tag authorizations_path, :class => action do %>
+  <%= hidden_field_tag :permissions, params[:permissions] %>
   <%= hidden_field_tag :client_id, client.identifier %>
   <%= hidden_field_tag :response_type, response_type %>
   <%= hidden_field_tag :redirect_uri, redirect_uri %>

data/app/views/devise/oauth2/authorizations/new.html.erb

@@ -0,0 +1,8 @@
+<h2>Authorize app to to access your resources?</h2>
+
+<% if params[:permissions] || @client.default_permissions %>
+    <h4>Test</h4>
+<% end %>
+
+<%= render 'devise/oauth2/authorizations/form', :client => @client, :response_type => @response_type, :redirect_uri => @redirect_uri, :action => :approve %>
+<%= render 'devise/oauth2/authorizations/form', :client => @client, :response_type => @response_type, :redirect_uri => @redirect_uri, :action => :deny %>

data/config/routes.rb

@@ -1,4 +1,5 @@
-Devise::Oauth2Providable::Engine.routes.draw do
+Devise::Oauth2::Engine.routes.draw do
+
   root :to => "authorizations#new"
 
   resources :authorizations, :only => :create

data/db/migrate/20111014160714_create_devise_oauth2_providable_schema.rb

@@ -1,9 +1,9 @@
 class CreateDeviseOauth2ProvidableSchema < ActiveRecord::Migration
   def change
     create_table :oauth2_clients do |t|
-      t.string :name
+      t.belongs_to :owner, polymorphic: true
+      t.text :default_permissions
       t.string :redirect_uri
-      t.string :website
       t.string :identifier
       t.string :secret
       t.boolean :passthrough, default: false, null: false
@@ -14,7 +14,10 @@ class CreateDeviseOauth2ProvidableSchema < ActiveRecord::Migration
     end
 
     create_table :oauth2_access_tokens do |t|
-      t.belongs_to :user, :client, :refresh_token
+      t.belongs_to :owner, polymorphic: true
+      t.text :permissions
+      t.integer :client_id
+      t.integer :refresh_token_id
       t.string :token
       t.datetime :expires_at
       t.timestamps
@@ -22,12 +25,13 @@ class CreateDeviseOauth2ProvidableSchema < ActiveRecord::Migration
     change_table :oauth2_access_tokens do |t|
       t.index :token, :unique => true
       t.index :expires_at
-      t.index :user_id
+      t.index :owner_id
       t.index :client_id
     end
 
     create_table :oauth2_refresh_tokens do |t|
-      t.belongs_to :user, :client
+      t.belongs_to :owner, polymorphic: true
+      t.belongs_to :client
       t.string :token
       t.datetime :expires_at
       t.timestamps
@@ -35,12 +39,13 @@ class CreateDeviseOauth2ProvidableSchema < ActiveRecord::Migration
     change_table :oauth2_refresh_tokens do |t|
       t.index :token, :unique => true
       t.index :expires_at
-      t.index :user_id
+      t.index :owner_id
       t.index :client_id
     end
 
     create_table :oauth2_authorization_codes do |t|
-      t.belongs_to :user, :client
+      t.belongs_to :owner, polymorphic: true
+      t.belongs_to :client
       t.string :token
       t.datetime :expires_at
       t.timestamps
@@ -48,7 +53,7 @@ class CreateDeviseOauth2ProvidableSchema < ActiveRecord::Migration
     change_table :oauth2_authorization_codes do |t|
       t.index :token, :unique => true
       t.index :expires_at
-      t.index :user_id
+      t.index :owner_id
       t.index :client_id
     end
   end

data/devise_oauth2_rails4.gemspec

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "devise/oauth2/version"
+
+Gem::Specification.new do |s|
+  s.name        = "devise_oauth2_rails4"
+  s.version     = Devise::Oauth2::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Brian Wheeler"]
+  s.email       = ["bwheeler96@gmail.com"]
+  s.homepage    = ""
+  s.summary     = %q{OAuth2 Provider for Rails 4 applications}
+  s.description = %q{Rails 4 engine that adds OAuth2 Provider support to any application built with Devise authentication}
+
+  s.rubyforge_project = "devise_oauth2_rails4"
+
+  s.add_runtime_dependency(%q<rails>, [">= 4.0.0"])
+  s.add_runtime_dependency(%q<devise>, [">= 1.4.3"])
+  s.add_runtime_dependency(%q<rack-oauth2>, [">= 0.11.0"])
+  s.add_development_dependency(%q<rspec-rails>, ['>= 2.6.1'])
+  s.add_development_dependency(%q<sqlite3>, ['>= 1.3.5'])
+  s.add_development_dependency(%q<shoulda-matchers>, ['>= 1.0.0'])
+  s.add_development_dependency(%q<pry>, ['>= 0.9.6.2'])
+  s.add_development_dependency(%q<factory_girl>, ['>= 2.2.0'])
+  s.add_development_dependency(%q<factory_girl_rspec>, ['>= 0.0.1'])
+  s.add_development_dependency(%q<rake>, ['>= 0.9.2.2'])
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/lib/devise/oauth2/engine.rb

@@ -0,0 +1,16 @@
+module Devise
+  module Oauth2
+    class Engine < Rails::Engine
+      config.devise_oauth2_rails4 = ActiveSupport::OrderedOptions.new
+      config.devise_oauth2_rails4.access_token_expires_in       = 15.minutes
+      config.devise_oauth2_rails4.refresh_token_expires_in      = 1.month
+      config.devise_oauth2_rails4.authorization_code_expires_in = 1.minute
+
+      engine_name 'oauth2'
+      isolate_namespace Devise::Oauth2
+      initializer "devise_oauth2_rails4.initialize_application", :before=> :load_config_initializers do |app|
+        app.config.filter_parameters << :client_secret
+      end
+    end
+  end
+end

data/lib/devise/{oauth2_providable → oauth2}/expirable_token.rb

@@ -2,14 +2,14 @@ require 'active_support/concern'
 require 'active_record'
 
 module Devise
-  module Oauth2Providable
+  module Oauth2
     module ExpirableToken
       extend ActiveSupport::Concern
 
       module ClassMethods
         def expires_according_to(config_name)
           cattr_accessor :default_lifetime
-          self.default_lifetime = Rails.application.config.devise_oauth2_providable[config_name]
+          self.default_lifetime = Rails.application.config.devise_oauth2_rails4[config_name]
 
           belongs_to :user
           belongs_to :client
@@ -45,7 +45,7 @@ module Devise
         private
 
         def init_token
-          self.token = Devise::Oauth2Providable.random_id
+          self.token = Devise::Oauth2.random_id
         end
         def init_expires_at
           self.expires_at = self.default_lifetime.from_now
@@ -55,4 +55,4 @@ module Devise
   end
 end
 
-ActiveRecord::Base.send :include, Devise::Oauth2Providable::ExpirableToken
+ActiveRecord::Base.send :include, Devise::Oauth2::ExpirableToken

data/lib/devise/{oauth2_providable → oauth2}/models/oauth2_providable.rb

@@ -2,11 +2,11 @@ require 'devise/models'
 
 module Devise
   module Models
-    module Oauth2Providable
+    module Oauth2
       extend ActiveSupport::Concern
       included do
-        has_many :access_tokens, :class_name => 'Devise::Oauth2Providable::AccessToken'
-        has_many :authorization_codes, :class_name => 'Devise::Oauth2Providable::AuthorizationCode'
+        has_many :access_tokens, :class_name => 'Devise::Oauth2::AccessToken', as: :owner
+        has_many :authorization_codes, :class_name => 'Devise::Oauth2::AuthorizationCode', as: :owner
       end
     end
   end

data/lib/devise/{oauth2_providable → oauth2}/strategies/oauth2_authorization_code_grant_type_strategy.rb

@@ -1,4 +1,4 @@
-require 'devise/oauth2_providable/strategies/oauth2_grant_type_strategy'
+require 'devise/oauth2/strategies/oauth2_grant_type_strategy'
 
 module Devise
   module Strategies

data/lib/devise/{oauth2_providable → oauth2}/strategies/oauth2_grant_type_strategy.rb

@@ -4,7 +4,7 @@ module Devise
   module Strategies
     class Oauth2GrantTypeStrategy < Authenticatable
       def valid?
-        params[:controller] == 'devise/oauth2_providable/tokens' && request.post? && params[:grant_type] == grant_type
+        params[:controller] == 'devise/oauth2/tokens' && request.post? && params[:grant_type] == grant_type
       end
 
       # defined by subclass

data/lib/devise/{oauth2_providable → oauth2}/strategies/oauth2_password_grant_type_strategy.rb

@@ -1,4 +1,4 @@
-require 'devise/oauth2_providable/strategies/oauth2_grant_type_strategy'
+require 'devise/oauth2/strategies/oauth2_grant_type_strategy'
 
 module Devise
   module Strategies

data/lib/devise/{oauth2_providable → oauth2}/strategies/oauth2_providable_strategy.rb

@@ -9,8 +9,8 @@ module Devise
       end
       def authenticate!
         @req.setup!
-        token = Devise::Oauth2Providable::AccessToken.find_by_token @req.access_token
-        env[Devise::Oauth2Providable::CLIENT_ENV_REF] = token.client if token
+        token = Devise::Oauth2::AccessToken.find_by_token @req.access_token
+        env[Devise::Oauth2::CLIENT_ENV_REF] = token.client if token
         resource = token ? token.user : nil
         if validate(resource)
           success! resource
@@ -22,4 +22,4 @@ module Devise
   end
 end
 
-Warden::Strategies.add(:oauth2_providable, Devise::Strategies::Oauth2Providable)
+Warden::Strategies.add(:oauth2, Devise::Strategies::Oauth2Providable)

data/lib/devise/{oauth2_providable → oauth2}/strategies/oauth2_refresh_token_grant_type_strategy.rb

@@ -1,4 +1,4 @@
-require 'devise/oauth2_providable/strategies/oauth2_grant_type_strategy'
+require 'devise/oauth2/strategies/oauth2_grant_type_strategy'
 
 module Devise
   module Strategies
@@ -9,7 +9,7 @@ module Devise
 
       def authenticate_grant_type(client)
         if refresh_token = client.refresh_tokens.find_by_token(params[:refresh_token])
-          env[Devise::Oauth2Providable::REFRESH_TOKEN_ENV_REF] = refresh_token
+          env[Devise::Oauth2::REFRESH_TOKEN_ENV_REF] = refresh_token
           success! refresh_token.user
         else
           oauth_error! :invalid_grant, 'invalid refresh token'

data/lib/devise/oauth2/version.rb

@@ -0,0 +1,5 @@
+module Devise
+  module Oauth2
+    VERSION = "1.1.3"
+  end
+end

data/lib/devise_oauth2_rails4.rb

@@ -0,0 +1,41 @@
+require 'devise'
+require 'rack/oauth2'
+require 'devise/oauth2/engine'
+require 'devise/oauth2/expirable_token'
+require 'devise/oauth2/strategies/oauth2_providable_strategy'
+require 'devise/oauth2/strategies/oauth2_password_grant_type_strategy'
+require 'devise/oauth2/strategies/oauth2_refresh_token_grant_type_strategy'
+require 'devise/oauth2/strategies/oauth2_authorization_code_grant_type_strategy'
+require 'devise/oauth2/models/oauth2_providable'
+require 'devise/oauth2/models/oauth2_password_grantable'
+require 'devise/oauth2/models/oauth2_refresh_token_grantable'
+require 'devise/oauth2/models/oauth2_authorization_code_grantable'
+
+module Devise
+  module Oauth2
+    CLIENT_ENV_REF = 'oauth2.client'
+    REFRESH_TOKEN_ENV_REF = "oauth2.refresh_token"
+
+    class << self
+      def random_id
+        SecureRandom.hex
+      end
+      def table_name_prefix
+        'oauth2_'
+      end
+    end
+  end
+end
+
+Devise.add_module(:oauth2,
+  :strategy => true,
+  :model => 'devise/oauth2/models/oauth2_providable')
+Devise.add_module(:oauth2_password_grantable,
+  :strategy => true,
+  :model => 'devise/oauth2/models/oauth2_password_grantable')
+Devise.add_module(:oauth2_refresh_token_grantable,
+  :strategy => true,
+  :model => 'devise/oauth2/models/oauth2_refresh_token_grantable')
+Devise.add_module(:oauth2_authorization_code_grantable,
+  :strategy => true,
+  :model => 'devise/oauth2/models/oauth2_authorization_code_grantable')

data/lib/generators/devise/oauth2/migrations_generator.rb

@@ -0,0 +1,16 @@
+module Devise
+  module Oauth2
+
+    class MigrationsGenerator < Rails::Generators::Base
+
+      Devise::Oauth2::MigrationsGenerator.source_root(File.expand_path './')
+
+      def create_migrations
+
+        copy_file 'db/migrate/20111014160714_create_devise_oauth2_providable_schema.rb', 'db/migrate/20140306063000_create_devise_oauth2_providable_schema.rb'
+
+      end
+
+    end
+  end
+end

data/lib/generators/devise/oauth2/views_generator.rb

@@ -0,0 +1,11 @@
+module Devise
+  module Oauth2
+    class ViewsGenerator < Rails::Generators::Base
+
+      File.open(File.expand_path('../../../../../app/views/devise/oauth2/authorize.html.haml', __FILE__), 'w+') do |f|
+        f << 'helo'
+      end
+
+    end
+  end
+end

data/rails/tasks/engine.rake

@@ -0,0 +1,17 @@
+
+namespace :devise do
+  namespace :oauth2 do
+
+    task :install_migrations do
+
+      Dir.mkdir("db") unless Dir.exists?("db")
+      unless File.exists?("db/my.db")
+        File.open("db/my.db", 'w') do |f|
+          f.write("Hello db")
+        end
+      end
+
+    end
+
+  end
+end

data/spec/controllers/authorizations_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Devise::Oauth2Providable::AuthorizationsController do
+describe Devise::Oauth2::AuthorizationsController do
   describe 'GET #new' do
     context 'with valid redirect_uri' do
       with :user

data/spec/controllers/protected_controller_spec.rb

@@ -6,7 +6,7 @@ describe ProtectedController do
     with :client
     with :user
     before do
-      @token = Devise::Oauth2Providable::AccessToken.create! :client => client, :user => user
+      @token = Devise::Oauth2::AccessToken.create! :client => client, :user => user
     end
     context 'with valid bearer token in header' do
       before do

data/spec/dummy/app/models/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :oauth2_providable, :oauth2_password_grantable, :oauth2_refresh_token_grantable, :oauth2_authorization_code_grantable
+  devise :database_authenticatable, :oauth2, :oauth2_password_grantable, :oauth2_refresh_token_grantable, :oauth2_authorization_code_grantable
 end

data/spec/dummy/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= devise_error_messages! %>
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>
+
+  <div><%= f.submit "Resend confirmation instructions" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/spec/dummy/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>

data/spec/dummy/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/spec/dummy/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>

data/spec/dummy/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= devise_error_messages! %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password, :autofocus => true %></div>
+
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>
+
+  <div><%= f.submit "Change my password" %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>