refinerycms-authentication 2.0.2 → 2.0.3

data/app/controllers/refinery/admin/users_controller.rb

@@ -15,7 +15,7 @@ module Refinery
       end
 
       def create
-        @user = Refinery::User.new(params[:user])
+        @user = Refinery::User.new(params[:user].except(:roles))
         @selected_plugin_names = params[:user][:plugins] || []
         @selected_role_names = params[:user][:roles] || []
 

data/app/controllers/refinery/passwords_controller.rb

@@ -1,5 +1,6 @@
 module Refinery
   class PasswordsController < Devise::PasswordsController
+    helper Refinery::Core::Engine.helpers
     layout 'refinery/layouts/login'
 
     before_filter :store_password_reset_return_to, :only => [:update]

data/app/controllers/refinery/sessions_controller.rb

@@ -1,5 +1,6 @@
 module Refinery
   class SessionsController < Devise::SessionsController
+    helper Refinery::Core::Engine.helpers
     layout 'refinery/layouts/login'
 
     before_filter :clear_unauthenticated_flash, :only => [:new]

data/app/controllers/refinery/users_controller.rb

@@ -4,6 +4,7 @@ module Refinery
     # Protect these actions behind an admin login
     before_filter :redirect?, :only => [:new, :create]
 
+    helper Refinery::Core::Engine.helpers
     layout 'refinery/layouts/login'
 
     def new

data/app/helpers/refinery/admin/users_helper.rb

@@ -0,0 +1,6 @@
+module Refinery
+  module Admin
+    module UsersHelper
+    end
+  end
+end

data/app/helpers/refinery/passwords_helper.rb

@@ -0,0 +1,4 @@
+module Refinery
+  module PasswordsHelper
+  end
+end

data/app/helpers/refinery/user_mailer_helper.rb

@@ -0,0 +1,4 @@
+module Refinery
+  module UserMailerHelper
+  end
+end

data/app/models/refinery/user.rb

@@ -1,4 +1,5 @@
 require 'devise'
+require 'friendly_id'
 
 module Refinery
   class User < Refinery::Core::BaseModel
@@ -43,7 +44,7 @@ module Refinery
     end
 
     def authorized_plugins
-      plugins.collect { |p| p.name } | ::Refinery::Plugins.always_allowed.names
+      plugins.collect(&:name) | ::Refinery::Plugins.always_allowed.names
     end
 
     def can_delete?(user_to_delete = self)

data/config/routes.rb

@@ -1,5 +1,12 @@
+Refinery::Core::Engine.routes.append do
+  namespace :admin, :path => 'refinery' do
+    resources :users, :except => :show
+  end
+end
+
 Refinery::Core::Engine.routes.draw do
   begin
+    require 'devise'
     devise_for :refinery_user,
                :class_name => 'Refinery::User',
                :path => 'refinery/users',
@@ -29,9 +36,3 @@ Refinery::Core::Engine.routes.draw do
     end
   end
 end
-
-Refinery::Core::Engine.routes.append do
-  namespace :admin, :path => 'refinery' do
-    resources :users, :except => :show
-  end
-end

data/lib/refinery/authenticated_system.rb

@@ -33,8 +33,10 @@ module Refinery
     protected :store_location, :redirect_back_or_default, :refinery_user?
 
     def self.included(base)
-      base.send :helper_method, :current_refinery_user, :current_user_session,
-        :refinery_user_signed_in?, :refinery_user? if base.respond_to? :helper_method
+      if base.respond_to? :helper_method
+        base.send :helper_method, :current_refinery_user, :current_user_session,
+                                  :refinery_user_signed_in?, :refinery_user?
+      end
     end
   end
 end

data/lib/refinery/authentication/devise.rb

@@ -0,0 +1,233 @@
+require 'devise'
+
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
+Devise.setup do |config|
+  # ==> Mailer Configuration
+  # Configure the e-mail address which will be shown in Devise::Mailer,
+  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  # config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
+
+  # Configure the class responsible to send e-mails.
+  # config.mailer = "Devise::Mailer"
+
+  # Automatically apply schema changes in tableless databases
+  config.apply_schema = false
+
+  # ==> ORM configuration
+  # Load and configure the ORM. Supports :active_record (default) and
+  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+  # available as additional gems.
+  ActiveSupport.on_load(:active_record) do
+    Devise.setup do
+      require 'devise/orm/active_record'
+    end
+  end
+
+  # ==> Configuration for any authentication mechanism
+  # Configure which keys are used when authenticating a user. The default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating a user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply a hash where the value is a boolean determining whether
+  # or not authentication should be aborted when the value is not present.
+  config.authentication_keys = [ :login ]
+
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to the
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = []
+
+  # Configure which authentication keys should have whitespace stripped.
+  # These keys will have whitespace before and after removed upon creating or
+  # modifying a user and when used to authenticate or find a user. Default is :email.
+  # config.strip_whitespace_keys = [ :email ]
+
+  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given stratragies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
+  # config.params_authenticatable = true
+
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given stratragies, for example, `config.http_authenticatable = [:token]` will
+  # enable it only for token authentication.
+  # config.http_authenticatable = false
+
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
+
+  # The realm used in Http Basic Authentication. "Application" by default.
+  # config.http_authentication_realm = "Application"
+
+  # It will change confirmation, password recovery and other workflows
+  # to behave the same regardless if the e-mail provided was right or wrong.
+  # Does not affect registerable.
+  # config.paranoid = true
+
+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
+  # ==> Configuration for :database_authenticatable
+  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+  # using other encryptors, it sets how many times you want the password re-encrypted.
+  #
+  # Limiting the stretches to just one in testing will increase the performance of
+  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+  # a value less than 10 in other environments.
+  config.stretches = Rails.env.test? ? 1 : 10
+
+  # Setup a pepper to generate the encrypted password.
+  # config.pepper = <%= SecureRandom.hex(64).inspect %>
+
+  # ==> Configuration for :confirmable
+  # A period that the user is allowed to access the website even without
+  # confirming his account. For instance, if set to 2.days, the user will be
+  # able to access the website for two days without confirming his account,
+  # access will be blocked just in the third day. Default is 0.days, meaning
+  # the user cannot access the website without confirming his account.
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # If true, requires any email changes to be confirmed (exctly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  # config.reconfirmable = true
+
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # If true, extends the user's remember period when remembered via cookie.
+  # config.extend_remember_period = false
+
+  # If true, uses the password salt as remember token. This should be turned
+  # to false if you are not using database authenticatable.
+  config.use_salt_as_remember_token = true
+
+  # Options to be passed to the created cookie. For instance, you can set
+  # :secure => true in order to force SSL only cookies.
+  # config.cookie_options = {}
+
+  # ==> Configuration for :validatable
+  # Range for password length. Default is 6..128.
+  config.password_length = 4..128
+
+  # Email regex used to validate email formats. It simply asserts that
+  # an one (and only one) @ exists in the given string. This is mainly
+  # to give user feedback and not to assert the e-mail validity.
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
+
+  # ==> Configuration for :lockable
+  # Defines which strategy will be used to lock an account.
+  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+  # :none            = No lock strategy. You should handle locking by yourself.
+  # config.lock_strategy = :failed_attempts
+
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+  # :both  = Enables both strategies
+  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # config.unlock_strategy = :both
+
+  # Number of authentication tries before locking an account if lock_strategy
+  # is failed attempts.
+  # config.maximum_attempts = 20
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+
+  # Time interval you can reset your password with a reset password key.
+  # Don't put a too small interval or your users won't have the time to
+  # change their passwords.
+  config.reset_password_within = 6.hours
+
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :sha512
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # ==> Scopes configuration
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "users/sessions/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = false
+
+  # Configure the default scope given to Warden. By default it's the first
+  # devise role declared in your routes (usually :user).
+  # config.default_scope = :user
+
+  # Configure sign_out behavior.
+  # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
+  # The default is true, which means any logout action will sign out all active scopes.
+  # config.sign_out_all_scopes = true
+
+  # ==> Navigation configuration
+  # Lists the formats that should be treated as navigational. Formats like
+  # :html, should redirect to the sign in page when the user does not have
+  # access, but formats like :xml or :json, should return 401.
+  #
+  # If you have any extra navigational formats, like :iphone or :mobile, you
+  # should add them to the navigational formats lists.
+  #
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ["*/*", :html]
+
+  # The default HTTP method used to sign out a resource. Default is :delete.
+  config.sign_out_via = :delete
+
+  # ==> OmniAuth
+  # Add a new OmniAuth provider. Check the wiki for more information on setting
+  # up on your models and hooks.
+  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
+
+  # ==> Warden configuration
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
+  #
+  # config.warden do |manager|
+  #   manager.intercept_401 = false
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
+  # end
+
+  # Please do not change the router_name away from :refinery
+  # otherwise Refinery may not function properly. Thanks!
+  config.router_name = :refinery
+end

data/lib/refinery/authentication/engine.rb

@@ -28,6 +28,10 @@ module Refinery
         end
       end
 
+      config.before_configuration do
+        require 'refinery/authentication/devise'
+      end
+
       config.after_initialize do
         Refinery.register_extension(Refinery::Authentication)
       end

data/refinerycms-authentication.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'refinerycms-core',  version
   s.add_dependency 'devise',            '~> 2.0.0'
+  s.add_dependency 'orm_adapter',       '~> 0.0.7'
 end

data/spec/requests/refinery/admin/users_spec.rb

@@ -4,7 +4,7 @@ describe "manage users" do
   login_refinery_superuser
 
   describe "new/create" do
-    it "allows to create user" do
+    def visit_and_fill_form
       visit refinery.admin_users_path
       click_link "Add new user"
 
@@ -12,11 +12,34 @@ describe "manage users" do
       fill_in "Email", :with => "test@refinerycms.com"
       fill_in "Password", :with => "123456"
       fill_in "Password confirmation", :with => "123456"
+    end
+
+    it "can create a user" do
+      visit_and_fill_form
+
       click_button "Save"
 
       page.should have_content("test was successfully added.")
       page.should have_content("test (test@refinerycms.com)")
     end
+
+    context "when assigning roles config is enabled" do
+      before do
+        Refinery::Authentication.stub(:superuser_can_assign_roles).and_return(true)
+      end
+
+      it "allows superuser to assign roles" do
+        visit_and_fill_form
+
+        within "#roles" do
+          check "roles_#{Refinery::Role.first.title.downcase}"
+        end
+        click_button "Save"
+
+        page.should have_content("test was successfully added.")
+        page.should have_content("test (test@refinerycms.com)")
+      end
+    end
   end
 
   describe "edit/update" do

metadata

@@ -1,71 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-authentication
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.0.3
   prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 2
-  version: 2.0.2
 platform: ruby
-authors: 
+authors:
 - Philip Arndt
-- "U\xC4\xA3is Ozols"
+- Uģis Ozols
 - David Jones
 - Steven Heidel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: refinerycms-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
-  version_requirements: *id001
-  name: refinerycms-core
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
-  version_requirements: *id002
-  name: devise
+- !ruby/object:Gem::Dependency
+  name: orm_adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 description: The default authentication extension for Refinery CMS
 email: info@refinerycms.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/controllers/refinery/admin/users_controller.rb
 - app/controllers/refinery/passwords_controller.rb
 - app/controllers/refinery/sessions_controller.rb
 - app/controllers/refinery/users_controller.rb
+- app/helpers/refinery/admin/users_helper.rb
+- app/helpers/refinery/passwords_helper.rb
 - app/helpers/refinery/sessions_helper.rb
+- app/helpers/refinery/user_mailer_helper.rb
 - app/helpers/refinery/users_helper.rb
 - app/mailers/refinery/user_mailer.rb
 - app/models/refinery/role.rb
@@ -120,6 +130,7 @@ files:
 - lib/refinery/authenticated_system.rb
 - lib/refinery/authentication.rb
 - lib/refinery/authentication/configuration.rb
+- lib/refinery/authentication/devise.rb
 - lib/refinery/authentication/engine.rb
 - lib/refinerycms-authentication.rb
 - license.md
@@ -131,39 +142,37 @@ files:
 - spec/requests/refinery/passwords_spec.rb
 - spec/requests/refinery/sessions_spec.rb
 homepage: http://refinerycms.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -65986755646960009
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -65986755646960009
 requirements: []
-
 rubyforge_project: refinerycms
-rubygems_version: 1.8.17
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Authentication extension for Refinery CMS
-test_files: 
+test_files:
 - spec/controllers/refinery/admin/users_controller_spec.rb
 - spec/factories/user.rb
 - spec/models/refinery/user_spec.rb