bpluser 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb775c6f5f9d7b6b08b89d81a52321b32f80afe7
-  data.tar.gz: de3c3214f82ad04d79d7bde0a9040caddd985eca
+  metadata.gz: a184b0220732712ea2ca33ba036030b536d974e4
+  data.tar.gz: d85e0ab34d54d4886dd00837728f6abdb6ab5fa8
 SHA512:
-  metadata.gz: 018fc293c23d773338eef2284ef556e50b0678079ce5810858dabfc3f454307e05cd694c3d34a8222a1d1fd6a694197d6534b7c96176b402df7c1b6e14c2a0bc
-  data.tar.gz: 9bbce1dc2c4a2605be3402f887273290970872a759b55e63003957111b291c90e3af12ab4c4666ccc5b83e238b8eb6d61614cc0aac0a3d6cb6c4cd692d48d7a8
+  metadata.gz: 7a72efada4fce7d24dcd7481e523f606c0f4147c841a3c0bf818d1bfcc85d1002213f6bb069a79b871ba690089ac618fe9d1981bbea16b4aa14bbcdb2250a32c
+  data.tar.gz: 5d887691378eeac07aae08741e9e26d163ec0ba7fbeb8c0deefd9bf4475dcf95aa685462e3cf15a2eaea44af3f831b32df94725d4dbfd4f635e6dea88e999d58

data/app/models/bpluser/user.rb

@@ -23,8 +23,6 @@ module Bpluser::User
       ldap_raw_details = auth_response[:extra][:raw_info]
       ldap_info_details = auth_response[:info]
 
-      puts ldap_raw_details.samaccountname[0].downcase
-
       user = User.where(:provider => auth_response.provider, :uid => ldap_raw_details.samaccountname[0].downcase).first
 
       #first_name:ldap_info_details.first_name,
@@ -108,20 +106,22 @@ module Bpluser::User
     def find_for_local_auth(auth, signed_in_resource=nil)
       user = User.where(:provider => auth.provider, :uid => auth.uid).first
       unless user
-        user = User.create(display_name:auth.extra.raw_info.name,
+        user = User.create(display_name:auth.full_name,
                            uid:auth.uid,
                            provider:auth.provider,
-                           username:auth.info.nickname,
-                           email:auth.info.email,
-                           password:Devise.friendly_token[0,20] ,
-                           first_name:auth.extra.raw_info.first_name,
-                           last_name:auth.extra.raw_info.last_name
+                           username:auth.uid,
+                           email:auth.email,
+                           password:auth.password,
+                           first_name:auth.first_name,
+                           last_name:auth.last_name
         )
       end
       user
     end
 
 
+
+
     # This method should find User objects using the user_key you've chosen.
     # By default, uses the unique identifier specified in by devise authentication_keys (ie. find_by_id, or find_by_email).
     # You must have that find method implemented on your user class, or must override find_by_user_key
@@ -197,5 +197,9 @@ module Bpluser::User
       roles.where(name: 'superuser').exists?
     end
 
+    def permanent_account?
+      return self.provider != 'digital_stacks_temporary'
+    end
+
   end
 end

data/app/models/bpluser/validatable.rb

@@ -25,9 +25,9 @@ module Bpluser::Validatable
       assert_validations_api!(base)
 
       base.class_eval do
-        validates_presence_of   :email, if: :email_required?
+        validates_presence_of   :email, if: [:email_required?, :permanent_account?]
         #validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-        validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+        validates_format_of     :email, with: email_regexp, allow_blank: true, if: [:email_changed?, :permanent_account?]
 
         validates_presence_of     :password, if: :password_required?
         validates_confirmation_of :password, if: :password_required?

data/lib/bpluser/version.rb

@@ -1,3 +1,3 @@
 module Bpluser
-  VERSION = "0.0.17"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bpluser
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Boston Public Library Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails