devise-stormpath 0.1.1 → 0.2.0

data/README.md

@@ -10,3 +10,13 @@ In the Gemfile for your application:
 In devise model:
 
     devise :stormpath_authenticatable
+
+Password reset
+--------------
+
+Model:
+
+    devise :stormpath_authenticatable, :stormpath_recoverable
+
+Setup Password Reset Workflow at https://api.stormpath.com
+Set Base URL to //<app host>/<devise scope>/password/edit (i.e. https://example.com/users/password/edit)

data/app/controllers/devise/stormpath_passwords_controller.rb

@@ -0,0 +1,9 @@
+class Devise::StormpathPasswordsController < Devise::PasswordsController
+  prepend_before_filter :proxy_stormpath_token
+
+  protected
+
+  def proxy_stormpath_token
+    params[:reset_password_token] = params[:sptoken]
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,10 @@
+#TODO Customize messages
+
+en:
+  devise:
+    stormpath_passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."

data/devise-stormpath.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary  = 'Devise extension to allow authentication via Stormpath'
   s.email = 'liquidautumn@gmail.com'
+  s.homepage      = "http://www.stormpath.com"
   s.description = s.summary
   s.author = 'Denis Grankin'
 
@@ -16,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('devise')
-  s.add_dependency('stormpath-rails')
+  s.add_dependency('stormpath-rails', '~> 0.4.0')
   s.add_dependency('activesupport')
 
   s.add_development_dependency('rake', '~> 10.0.2')

data/lib/devise-stormpath.rb

@@ -1,9 +1,11 @@
-require 'devise'
 require 'stormpath-rails'
 
-require 'devise/stormpath/strategy'
+require 'devise'
+require 'devise/stormpath/routes'
+require 'devise/stormpath/rails'
+require 'devise/strategies/stormpath_authenticatable'
 
 Warden::Strategies.add(:stormpath_authenticatable, Devise::Strategies::StormpathAuthenticatable)
 
-Devise.add_module(:stormpath_authenticatable,
-                  :route => :session, :strategy => true, :controller => :sessions, :model  => 'devise/stormpath/model')
+Devise.add_module(:stormpath_authenticatable, :route => :session, :strategy => true, :controller => :sessions, :model  => 'devise/models/stormpath_authenticatable')
+Devise.add_module(:stormpath_recoverable, :route => :password, :controller => :stormpath_passwords, :model  => 'devise/models/stormpath_recoverable')

data/lib/devise/{stormpath/model.rb → models/stormpath_authenticatable.rb}

@@ -5,6 +5,10 @@ module Devise
     module StormpathAuthenticatable
       extend ActiveSupport::Concern
 
+      def self.required_fields(klass)
+        [:current_password, :password, :password_confirmation]
+      end
+
       included do
         attr_accessor :password_confirmation, :password
         attr_reader :current_password

data/lib/devise/models/stormpath_recoverable.rb

@@ -0,0 +1,66 @@
+module Devise
+  module Models
+    module StormpathRecoverable
+      extend ActiveSupport::Concern
+
+      def self.required_fields(klass)
+        [:reset_password_token, :password, :password_confirmation]
+      end
+
+      included do
+        attr_accessible :reset_password_token, :password_confirmation
+        attr_accessor :reset_password_token
+      end
+
+      protected
+
+      def after_password_reset
+      end
+
+      module ClassMethods
+        def send_reset_password_instructions(attributes={})
+          begin
+            identifier = attributes[:email] || attributes[:username]
+            raise RuntimeError.new "Email or username required" unless identifier
+            account = ::Stormpath::Rails::Client.send_password_reset_email(identifier)
+            return self.where(stormpath_url: account.get_href).first
+          rescue RuntimeError => error
+            build_invalid_account(attributes, error)
+          end
+        end
+
+        def reset_password_by_token(attributes={})
+          begin
+            validate_attributes(attributes)
+            account = ::Stormpath::Rails::Client.verify_password_reset_token(attributes[:reset_password_token])
+            account.set_password attributes[:password]
+            account.save
+            self.where(stormpath_url: account.get_href).first
+          rescue RuntimeError => error
+            build_invalid_account(attributes, error)
+          end
+        end
+
+        def build_invalid_account(attributes, error)
+          u = self.new(attributes)
+          u.errors[:base] << error.message
+          u
+        end
+
+        #TODO work on better error handling and move strings to locales
+        def validate_attributes(attributes)
+          raise RuntimeError.new "Password reset token required" unless attributes[:reset_password_token]
+          raise RuntimeError.new "Password should match confirmation" unless attributes[:password] == attributes[:password_confirmation]
+          raise RuntimeError.new "Password required" unless attributes[:password] && !attributes[:password].empty?
+        end
+      end
+    end
+  end
+
+  #mimic default devise recoverable
+  class Mapping
+    def recoverable?
+      @recoverable ||= self.modules.any? { |m| m.to_s =~ /recoverable/ }
+    end
+  end
+end

data/lib/devise/stormpath/rails.rb

@@ -0,0 +1,9 @@
+module Devise
+  module Stormpath
+    class Engine < Rails::Engine
+      initializer "stormpath.params.filter" do |app|
+        app.config.filter_parameters << :sptoken
+      end
+    end
+  end
+end

data/lib/devise/stormpath/routes.rb

@@ -0,0 +1,8 @@
+ActionDispatch::Routing::Mapper.class_eval do
+  protected
+
+  def devise_password(mapping, controllers)
+    resource :password, :only => [:new, :create, :edit, :update],
+             :path => mapping.path_names[:password], :controller => controllers[:stormpath_passwords]
+  end
+end

data/lib/devise/stormpath/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Stormpath
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/devise/{stormpath/model_spec.rb → models/stormpath_authenticatable_spec.rb}

@@ -1,18 +1,15 @@
 require "spec_helper"
-require "devise/stormpath/model"
+require "devise/models/stormpath_authenticatable"
 
-class User
-  include Devise::Models::StormpathAuthenticatable
-end
-
-class ResourceError < Exception
-end
 
 describe Devise::Models::StormpathAuthenticatable do
+  class User
+    include Devise::Models::StormpathAuthenticatable
+  end
 
   let(:user) { mock("user") }
 
-  describe "#authenticate_with_stormpath" do
+  describe "::authenticate_with_stormpath" do
     it "should return user if authenticated on stormpath and local user exists with returned href" do
       Stormpath::Rails::Client.should_receive(:authenticate_account).with("username", "password").and_return(mock("account", get_href: "user href"))
       User.should_receive(:where).with(stormpath_url: "user href").and_return([user])

data/spec/devise/models/stormpath_recoverable_spec.rb

@@ -0,0 +1,42 @@
+require "spec_helper"
+require "devise/models/stormpath_recoverable"
+
+describe Devise::Models::StormpathRecoverable do
+  class User
+    def self.attr_accessible(*args)
+    end
+
+    include Devise::Models::StormpathRecoverable
+  end
+
+  let(:base) { mock("base") }
+  let(:errors) { mock("errors", :[] => base) }
+  let(:user) { mock("user", errors: errors) }
+
+  describe "::send_reset_password_instructions" do
+    it "should return user if password reset email sent and local user exists with returned href" do
+      Stormpath::Rails::Client.should_receive(:send_password_reset_email).with("john@example.com").and_return(mock("account", get_href: "user href"))
+      User.should_receive(:where).with(stormpath_url: "user href").and_return([user])
+      User.send_reset_password_instructions(email: "john@example.com").should == user
+    end
+
+    it "should return errored user instance if no email provided" do
+      Stormpath::Rails::Client.should_receive(:send_password_reset_email).and_raise(ResourceError.new("Error"))
+      User.stub(:new).and_return(user)
+      base.should_receive(:<<).with("Error")
+      User.send_reset_password_instructions(email: "").should == user
+    end
+  end
+
+  describe "::reset_password_by_token" do
+    let(:account) { mock("account", get_href: "user href") }
+
+    it "should update password at Stormpath and return user if password reset token is valid" do
+      Stormpath::Rails::Client.should_receive(:verify_password_reset_token).with("token").and_return(account)
+      account.should_receive(:set_password).with("password")
+      account.should_receive(:save)
+      User.should_receive(:where).with(stormpath_url: "user href").and_return([user])
+      User.reset_password_by_token(reset_password_token: "token", password: "password", password_confirmation: "password").should == user
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+require "active_support/concern"
+
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f}
 
 RSpec.configure do |config|

data/spec/support/resource_error.rb

@@ -0,0 +1,2 @@
+class ResourceError < RuntimeError
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-stormpath
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -136,15 +136,22 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/devise/stormpath_passwords_controller.rb
+- config/locales/en.yml
 - devise-stormpath.gemspec
 - lib/devise-stormpath.rb
-- lib/devise/stormpath/model.rb
-- lib/devise/stormpath/strategy.rb
+- lib/devise/models/stormpath_authenticatable.rb
+- lib/devise/models/stormpath_recoverable.rb
+- lib/devise/stormpath/rails.rb
+- lib/devise/stormpath/routes.rb
 - lib/devise/stormpath/version.rb
-- spec/devise/stormpath/model_spec.rb
+- lib/devise/strategies/stormpath_authenticatable.rb
+- spec/devise/models/stormpath_authenticatable_spec.rb
+- spec/devise/models/stormpath_recoverable_spec.rb
 - spec/spec_helper.rb
 - spec/support/client.rb
-homepage: 
+- spec/support/resource_error.rb
+homepage: http://www.stormpath.com
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -156,12 +163,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 434371363033819234
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 434371363033819234
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24