From 12ccd6485e487529cec807a0775c88b55821c080 Mon Sep 17 00:00:00 2001 From: Hugo Gilmar Erazo Date: Thu, 20 Sep 2018 12:32:12 -0600 Subject: [PATCH] demodulize added on authentication class name association name fetch (#147) * demodulize added on authentication class name association name fetch * changelog entry added for PR #147 * Add missing `#` to changelog entry --- CHANGELOG.md | 1 + lib/sorcery/model/submodules/external.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9baa7a5c..fa207d4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ * Add support for VK OAuth (thanks to @Hirurg103) [#109](https://github.com/Sorcery/sorcery/pull/109) * Fix token leak via referrer header [#56](https://github.com/Sorcery/sorcery/pull/56) * Add `login_user` helper for request specs [#57](https://github.com/Sorcery/sorcery/pull/57) +* Added `demodulize` on authentication class name association name fetch [#147](https://github.com/Sorcery/sorcery/pull/147) ## 0.11.0 diff --git a/lib/sorcery/model/submodules/external.rb b/lib/sorcery/model/submodules/external.rb index 3a84c23b..864bc3ef 100644 --- a/lib/sorcery/model/submodules/external.rb +++ b/lib/sorcery/model/submodules/external.rb @@ -45,7 +45,7 @@ def load_from_provider(provider, uid) def create_and_validate_from_provider(provider, uid, attrs) user = new(attrs) - user.send(sorcery_config.authentications_class.to_s.downcase.pluralize).build( + user.send(sorcery_config.authentications_class.name.demodulize.underscore.pluralize).build( sorcery_config.provider_uid_attribute_name => uid, sorcery_config.provider_attribute_name => provider ) @@ -92,7 +92,7 @@ def build_from_provider(attrs) module InstanceMethods def add_provider_to_user(provider, uid) - authentications = sorcery_config.authentications_class.name.underscore.pluralize + authentications = sorcery_config.authentications_class.name.demodulize.underscore.pluralize # first check to see if user has a particular authentication already if sorcery_adapter.find_authentication_by_oauth_credentials(authentications, provider, uid).nil? user = send(authentications).build(sorcery_config.provider_uid_attribute_name => uid,