thincloud-authentication 0.3.0 → 0.4.0

data/README.md

@@ -140,12 +140,12 @@ Using the example above, you will have the following routes locally:
 
 ### Redirection
 
-You can customize the paths used to redirect users after login, logout and registration by overriding the corresponding methods in your ApplicationController, or specific controllers, as needed.
+You can customize the paths used to redirect users after login, logout, registration and email verification by overriding the corresponding methods in your ApplicationController, or specific controllers, as needed.
 
 * `after_login_path` is used after the user logs in.
 * `after_logout_path` is used after the user logs out.
 * `after_registration_path` is used after the user registers.
-
+* `after_verification_path` is used after the user verifies their email.
 
 ## TODO
 

data/app/controllers/thincloud/authentication/registrations_controller.rb

@@ -1,10 +1,12 @@
-require_dependency "thincloud/authentication/application_controller"
-
 module Thincloud::Authentication
   # Public: Handle OmniAuth callbacks.
   class RegistrationsController < ApplicationController
     before_filter :extract_identity, only: :create
 
+    layout Thincloud::Authentication.configuration.layout
+
+    helper "thincloud/authentication/registrations"
+
     def new
       @identity = Identity.new
     end
@@ -13,11 +15,11 @@ module Thincloud::Authentication
       # identity exists
       if @identity.present?
         login_as @identity.user
-        redirect_to main_app.root_url, notice: "You have been logged in."
+        redirect_to after_login_path, notice: "You have been logged in."
       # new identity for current_user
       elsif current_user
         add_omniauth_identity_to_current_user
-        redirect_to main_app.root_url, notice: "You have been logged in."
+        redirect_to after_login_path, notice: "You have been logged in."
       # failed identity login
       elsif invalid_identity_credentials?
         redirect_to auth_failure_url message: "invalid_credentials",
@@ -40,7 +42,7 @@ module Thincloud::Authentication
     def verify
       identity = Identity.verify!(params[:token])
       login_as identity.user
-      redirect_to main_app.root_url,
+      redirect_to after_verification_path,
         notice: "Thank you! Your registration has been verified."
     end
 
@@ -79,12 +81,23 @@ module Thincloud::Authentication
     # Returns: An instance of `Identity`.
     def create_identity_from_request
       # params[:identity] exists when creating a local identity provider
-      Identity.new(params[:identity]).tap do |identity|
+      Identity.new(identity_params).tap do |identity|
         identity.user = User.create
         # omniauth exists if coming from a 3rd party provider like LinkedIn
         identity.apply_omniauth(omniauth) if omniauth
         identity.save
       end
     end
+
+    # Private: Provide strong_parameters support
+    # :token, :auth_key, :provider,
+    def identity_params
+      keys = [
+        :name, :email, :password,
+        :password_confirmation, :verification_token
+      ]
+
+      params.require(:identity).permit(*keys)
+    end
   end
 end

data/app/controllers/thincloud/authentication/sessions_controller.rb

@@ -1,10 +1,12 @@
-require_dependency "thincloud/authentication/application_controller"
-
 module Thincloud::Authentication
   # Public: Handle login/logout behavior.
   class SessionsController < ApplicationController
     before_filter :authenticate!, only: [:authenticated]
 
+    layout Thincloud::Authentication.configuration.layout
+
+    helper "thincloud/authentication/registrations"
+
     def new
       redirect_to after_login_path if logged_in?
       @identity = Identity.new

data/app/models/thincloud/authentication/identity.rb

@@ -1,6 +1,8 @@
 module Thincloud::Authentication
   # Public: This class represents a User identity (name, email, login provider)
   class Identity < ::OmniAuth::Identity::Models::ActiveRecord
+    include ActiveModel::ForbiddenAttributesProtection  # strong_parameters
+
     belongs_to :user
 
     # Limit the ability to mass-assign sensitive fields.
@@ -30,7 +32,9 @@ module Thincloud::Authentication
     #
     # Returns: An instance of `Identity` or `nil`.
     def self.find_omniauth(omniauth)
-      find_by_provider_and_uid omniauth["provider"], omniauth["uid"]
+      if omniauth["uid"].present?
+        find_by_provider_and_uid omniauth["provider"], omniauth["uid"]
+      end
     end
 
     # Public: Mark the `Identity` as having been verified.

data/config/routes.rb

@@ -1,5 +1,5 @@
 Thincloud::Authentication::Engine.routes.draw do
-  match ":provider/callback" => "registrations#create", as: "auth_callback"
+  post ":provider/callback", to: "registrations#create", as: "auth_callback"
   get "failure", to: "sessions#new", as: "auth_failure"
 
   get "login", to: "sessions#new", as: "login"

data/lib/thincloud/authentication/authenticatable_controller.rb

@@ -79,6 +79,14 @@ module Thincloud
         main_app.root_url
       end
 
+      # Protected: Provides the URL to redirect to after verification.
+      #
+      # Returns: A string.
+      def after_verification_path
+        main_app.root_url
+      end
+
+
     end
 
   end

data/lib/thincloud/authentication/engine.rb

@@ -1,17 +1,25 @@
 module Thincloud
   module Authentication
+
     # Public: Initialize the Rails engine
     class Engine < ::Rails::Engine
       isolate_namespace Thincloud::Authentication
 
+      require "thincloud/authentication/configuration"
+
+      initializer "thincloud.authentication.require_dependencies" do
+        require_dependency "thincloud/authentication/authenticatable_controller"
+        require_dependency "thincloud/authentication/identifiable_user"
+      end
+
       initializer "thincloud.authentication.omniauth.middleware" do |app|
         require "omniauth"
         require "omniauth-identity"
 
-        config = Thincloud::Authentication.configuration || Configuration.new
-        strategies = config.providers.keys
+        conf = Thincloud::Authentication.configuration || Configuration.new
+        strategies = conf.providers.keys
         strategies.each do |strategy|
-          lib = config.providers[strategy][:require] || "omniauth-#{strategy}"
+          lib = conf.providers[strategy][:require] || "omniauth-#{strategy}"
           require lib
         end
 
@@ -23,8 +31,8 @@ module Thincloud
           strategies.each do |strategy|
             provider strategy, ENV["#{strategy.to_s.upcase}_CONSUMER_KEY"],
               ENV["#{strategy.to_s.upcase}_CONSUMER_SECRET"],
-              fields: config.providers[strategy][:fields],
-              scope: config.providers[strategy][:scopes]
+              fields: conf.providers[strategy][:fields],
+              scope: conf.providers[strategy][:scopes]
           end
         end
       end
@@ -53,12 +61,16 @@ module Thincloud
       end
 
       initializer "thincloud.authentication.user" do
-        ::User.send :include, Thincloud::Authentication::IdentifiableUser
+        config.to_prepare do
+          ::User.send :include, Thincloud::Authentication::IdentifiableUser
+        end
       end
 
       initializer "thincloud.authentication.action_controller" do
-        ActionController::Base.send :include,
-          Thincloud::Authentication::AuthenticatableController
+        config.to_prepare do
+          ActionController::Base.send :include,
+            Thincloud::Authentication::AuthenticatableController
+        end
       end
 
       config.generators do |g|

data/lib/thincloud/authentication/version.rb

@@ -1,5 +1,5 @@
 module Thincloud
   module Authentication
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/lib/thincloud-authentication.rb

@@ -1,7 +1,4 @@
-require "thincloud/authentication/configuration"
 require "thincloud/authentication/engine"
-require "thincloud/authentication/authenticatable_controller"
-require "thincloud/authentication/identifiable_user"
 
 module Thincloud
   module Authentication

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thincloud-authentication
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,128 +27,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.8
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: omniauth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: omniauth-identity
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: guard-minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: minitest-rails-shoulda
+  name: strong_parameters
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -157,45 +45,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: omniauth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :development
+        version: 1.1.3
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: omniauth-identity
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :development
+        version: 1.1.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: thincloud-test-rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.7
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.7
+        version: 1.0.0
 description: Rails Engine to provide authentication for Thincloud applications
 email:
 - pcohen@newleaders.com
@@ -214,7 +102,6 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/thincloud/authentication/application.js
 - app/assets/stylesheets/thincloud/authentication/application.css
-- app/controllers/thincloud/authentication/application_controller.rb
 - app/controllers/thincloud/authentication/registrations_controller.rb
 - app/controllers/thincloud/authentication/sessions_controller.rb
 - app/helpers/thincloud/authentication/registrations_helper.rb
@@ -252,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3024527014021950158
+      hash: 4510440857469135512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,10 +148,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3024527014021950158
+      hash: 4510440857469135512
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rails Engine to provide authentication for Thincloud applications

data/app/controllers/thincloud/authentication/application_controller.rb

@@ -1,6 +0,0 @@
-module Thincloud::Authentication
-  # Public: Primary controller settings and helpers for the engine.
-  class ApplicationController < ActionController::Base
-    layout Thincloud::Authentication.configuration.layout
-  end
-end