devise_token_auth 0.1.27 → 0.1.28.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c29b93ff06ca8cc30fdd3deffb09a913a047f2
-  data.tar.gz: bd35baa78de384a098d7e27bc19ac3670c49c373
+  metadata.gz: 5b99f8dae62f960788af8b108ab370e420a54291
+  data.tar.gz: ddad0d672de28b386c09c2384bbec83d9acd5efe
 SHA512:
-  metadata.gz: 9e8bfe5cbcb0ab772824ba30605d8cff0013eaa7ef0442aca020f9a88149e7d9b78a3e388f62d95bd30277194ae575d9061713592b3046bc7b7bab52efbe2dc3
-  data.tar.gz: 200d1973c8dc02826de98b4406af9d7eeb42bf977471ce546061577bfb5d107578f3cab6fafd62e112e0a6557849883cd1a389f8ae1ab051bc405b2adf9ab6a7
+  metadata.gz: f7dca0bf0da13694fd383a38052d6da35d376597dc649a218b04d984a74c56b71c2c299b6a72c8b923a0b240392f3233f64f10dae27139884e92934ec5288a51
+  data.tar.gz: 1bf8004bfc4de1e9d74ea228b97770f30a969f3606321868cb8bd573c87c10658c9e87db3e147ade029838ee019b25d94b014fc92fcdd0379fcc2a00f22bcf04

data/README.md

@@ -36,7 +36,7 @@ This project leverages the following gems:
 Add the following to your `Gemfile`:
 
 ~~~ruby
-gem devise_token_auth
+gem 'devise_token_auth'
 ~~~
 
 Then install the gem using bundle:

data/app/controllers/devise_token_auth/application_controller.rb

@@ -1,5 +1,5 @@
 module DeviseTokenAuth
-  class ApplicationController < ActionController::Base
+  class ApplicationController < DeviseController
     include DeviseTokenAuth::Concerns::SetUserByToken
   end
 end

data/app/controllers/devise_token_auth/auth_controller.rb

@@ -21,11 +21,9 @@ module DeviseTokenAuth
     end
 
     def omniauth_success
-      # pull resource class from omniauth return
-      resource = request.env['omniauth.params']['resource_class'].constantize
 
       # find or create user by provider and provider uid
-      @user = resource.where({
+      @user = resource_name.where({
         uid:      auth_hash['uid'],
         provider: auth_hash['provider']
       }).first_or_initialize
@@ -61,6 +59,10 @@ module DeviseTokenAuth
         email:    auth_hash['info']['email']
       })
 
+      # assign any additional (whitelisted) attributes
+      extra_params = whitelisted_params
+      @user.assign_attributes(extra_params) if extra_params
+
       # don't send confirmation email!!!
       @user.skip_confirmation!
 
@@ -84,6 +86,32 @@ module DeviseTokenAuth
       request.env['omniauth.auth']
     end
 
+    def whitelisted_params
+      whitelist = devise_parameter_sanitizer.for(:sign_up)
+
+      whitelist.inject({}){|coll, key|
+        param = request.env['omniauth.params'][key.to_s]
+        if param
+          coll[key] = param
+        end
+        coll
+      }
+    end
+
+    def devise_controller?
+      true
+    end
+
+    # pull resource class from omniauth return
+    def resource_name
+      request.env['omniauth.params']['resource_class'].constantize
+    end
+
+    # necessary for access to devise_parameter_sanitizers
+    def devise_mapping
+      Devise.mappings[request.env['omniauth.params']['resource_class'].underscore.to_sym]
+    end
+
     def generate_url(url, params = {})
       uri = URI(url)
       uri.query = params.to_query

data/lib/devise_token_auth/version.rb

@@ -1,3 +1,3 @@
 module DeviseTokenAuth
-  VERSION = "0.1.27"
+  VERSION = "0.1.28.beta1"
 end

data/test/controllers/devise_token_auth/auth_controller_test.rb

@@ -57,6 +57,32 @@ class OmniauthTest < ActionDispatch::IntegrationTest
         assert_equal User, @user.class
       end
     end
+
+    describe 'pass additional params' do
+      before do
+        @fav_color = 'alizarin crimson'
+        @unpermitted_param = "M. Bison"
+        get_via_redirect '/auth/facebook', {
+          auth_origin_url: @redirect_url,
+          favorite_color: @fav_color,
+          name: @unpermitted_param
+        }
+
+        @user = assigns(:user)
+      end
+
+      test 'status shows success' do
+        assert_equal 200, response.status
+      end
+
+      test 'additional attribute was passed' do
+        assert_equal @fav_color, @user.favorite_color
+      end
+
+      test 'non-whitelisted attributes are ignored' do
+        refute_equal @unpermitted_param, @user.name
+      end
+    end
   end
 
 

data/test/dummy/app/helpers/application_helper.rb

@@ -60,7 +60,7 @@ module ApplicationHelper
     "Beaver",
     "Beige",
     "B'dazzled blue",
-    "Big dip o’ruby",
+    "Big dip o'ruby",
     "Bisque",
     "Bistre",
     "Bistre brown",
@@ -134,8 +134,8 @@ module ApplicationHelper
     "Cadmium orange",
     "Cadmium red",
     "Cadmium yellow",
-    "Café au lait",
-    "Café noir",
+    "Cafe au lait",
+    "Cafe noir",
     "Cal Poly Pomona green",
     "Cambridge Blue",
     "Camel",
@@ -422,7 +422,7 @@ module ApplicationHelper
     "Grizzly",
     "Grullo",
     "Guppie green",
-    "Halayà úbe",
+    "Halaya ube",
     "Han blue",
     "Han purple",
     "Hansa yellow",
@@ -955,7 +955,7 @@ module ApplicationHelper
     "Teal deer",
     "Teal green",
     "Telemagenta",
-    "Tenné",
+    "Tenne",
     "Terra cotta",
     "Thistle",
     "Thulian pink",