bpluser 0.1.18 → 0.2.0

data/app/models/bpluser/concerns/users.rb

@@ -1,190 +0,0 @@
-module Bpluser
-  module Concerns
-    module Users
-      #Changed this to a concern so the modules can resolve better
-      extend ActiveSupport::Concern
-      include Validatable
-      #included
-      included do
-        devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :omniauthable, :omniauth_providers => [:ldap, :polaris, :facebook]
-
-        has_many :user_institutions, inverse_of: :user, :class_name => "Bpluser::UserInstitution" #Is this deprecated? Seems like it.
-
-        has_many :folders, inverse_of: :user, :dependent => :destroy, :class_name => "Bpluser::Folder"
-        has_many :folder_items, through: :folders, class_name: "Bpluser::FolderItem"
-
-        #BEGIN INSTANCE METHODS
-        def to_s
-          self.name
-        end
-
-        def name
-          return self.username rescue self.display_name.try(:titleize)
-        end
-
-        def user_key
-          send(Devise.authentication_keys.first)
-        end
-
-
-        def ldap_groups
-          #Hydra::LDAP.groups_for_user(username + ",dc=psu,dc=edu")
-          #['archivist', 'admin_policy_object_editor']
-
-          Hydra::LDAP.groups_for_user(Net::LDAP::Filter.eq('samaccountname', self.username), ['memberOf'])  { |result| result.first[:memberOf].select{ |y| y.starts_with? 'CN=' }.map{ |x| x.sub(/^CN=/, '').sub(/,OU=Private Groups,DC=private,DC=bpl,DC=org/, '').sub(/,OU=Distribution Lists/, '').sub(/,OU=Security Groups/, '') } } rescue []
-        end
-
-        def populate_attributes
-        end
-
-        def default_user_groups
-          # # everyone is automatically a member of the group 'public'
-          #['public', 'test']
-        end
-
-        def get_uploads_collection
-          query="rightsMetadata_edit_access_machine_person_t:#{uid} AND title_s:Uploads AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-          ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-        end
-
-        def get_details_collection
-          query="rightsMetadata_edit_access_machine_person_t:#{uid} AND title_s:Details AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-          ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-        end
-
-        def collections
-          query="rightsMetadata_edit_access_machine_person_t:#{uid} AND NOT title_t:Uploads AND NOT title_t:Details AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-          ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-        end
-
-        def existing_folder_item_for (document_id)
-          self.get_folder_item(document_id)
-        end
-
-        def get_folder_item (document_id)
-          self.folder_items.where(document_id: document_id).first if self.folder_items.where(document_id: document_id).exists?
-        end
-
-        def superuser?
-          roles.where(name: 'superuser').exists?
-        end
-
-        def permanent_account?
-          self.provider != 'digital_stacks_temporary'
-        end
-
-        def email_not_required?
-           self.provider != 'digital_stacks_temporary' and self.provider != 'polaris'
-        end
-        #END INSTANCE METHODS
-      end
-
-
-
-
-      #BEGIN CLASS METHODS
-      class_methods do
-        def find_for_ldap_oauth(auth_response, signed_in_resource=nil)
-
-          ldap_raw_details = auth_response[:extra][:raw_info]
-          ldap_info_details = auth_response[:info]
-
-          user = User.where(:provider => auth_response.provider, :uid => ldap_raw_details.samaccountname[0].downcase).first
-
-          #first_name:ldap_info_details.first_name,
-          #last_name:ldap_info_details.last_name,
-          unless user
-            user = User.create(provider:auth_response.provider,
-                               uid:ldap_raw_details.samaccountname[0].downcase,
-                               username:ldap_raw_details.samaccountname[0].downcase,
-                               email:ldap_raw_details.mail[0].to_s.downcase,
-                               password:Devise.friendly_token[0,20],
-                               display_name: ldap_info_details.first_name + " " + ldap_info_details.last_name,
-                               first_name: ldap_info_details.first_name,
-                               last_name: ldap_info_details.last_name
-            )
-          end
-          groups = user.ldap_groups
-          groups.each do |group|
-            if(group == "Repository Administrators")
-              superuser_role = Role.where(:name=>'superuser').first
-              if(superuser_role == nil)
-                superuser_role = Role.create(:name=>"superuser")
-              end
-              user.roles << superuser_role unless user.roles.include?(superuser_role)
-              user.save!
-
-              admin_role = Role.where(:name=>'admin').first
-              if(admin_role == nil)
-                admin_role = Role.create(:name=>"admin")
-              end
-              user.roles << admin_role unless user.roles.include?(admin_role)
-              user.save!
-            end
-          end
-          user
-        end
-
-        def find_for_polaris_oauth(auth_response, signed_in_resource=nil)
-          polaris_raw_details = auth_response[:extra][:raw_info]
-          polaris_info_details = auth_response[:info]
-
-          user = User.where(:provider => auth_response.provider, :uid => auth_response[:uid]).first
-
-          #first_name:ldap_info_details.first_name,
-          #last_name:ldap_info_details.last_name,
-          unless user
-            email_value = polaris_info_details[:email].present? ? polaris_info_details[:email] : ''
-            #For some reason, User.create has no id set despite that intending to be autocreated. Unsure what is up with that. So trying this.
-            user = User.new(provider:auth_response.provider,
-                               uid:auth_response[:uid],
-                               username:polaris_info_details[:first_name],
-                               email:email_value,
-                               password:Devise.friendly_token[0,20],
-                               display_name:polaris_info_details[:first_name] + " " + polaris_info_details[:last_name],
-                               first_name: polaris_info_details[:first_name],
-                               last_name: polaris_info_details[:last_name]
-
-            )
-            user.save!
-
-          end
-          user
-        end
-
-        def find_for_facebook_oauth(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,
-                               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
-            )
-          end
-          user
-        end
-
-        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.full_name,
-                               uid:auth.uid,
-                               provider:auth.provider,
-                               username:auth.uid,
-                               email:auth.email,
-                               password:auth.password,
-                               first_name:auth.first_name,
-                               last_name:auth.last_name
-            )
-          end
-          user
-        end
-      end
-      #END CLASS METHODS
-    end
-  end
-end

data/app/models/bpluser/concerns/validatable.rb

@@ -1,47 +0,0 @@
-module Bpluser
-  module Concerns
-    module Validatable
-      extend ActiveSupport::Concern
-      VALIDATIONS = %i(validates_presence_of validates_format_of validates_confirmation_of validates_length_of).freeze
-      #BEGIN INCLUDED
-      included do
-        validates_presence_of   :email, if: [:email_required?, :email_not_required?]
-        #validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-        validates_format_of     :email, with: email_regexp, allow_blank: true, if: [:email_changed?, :email_not_required?]
-
-        validates_presence_of     :password, if: :password_required?
-        validates_confirmation_of :password, if: :password_required?
-        validates_length_of       :password, within: password_length, allow_blank: true
-
-        #INSTANCE METHODS
-        protected
-        def password_required?
-          !persisted? || !password.nil? || !password_confirmation.nil?
-        end
-
-        def email_required?
-          true
-        end
-      end
-      #END INCLUDED
-
-      #BEGIN CLASS METHODS
-      class_methods do
-        ::Devise::Models.config(self, :email_regexp, :password_length)
-
-        def required_fields(klass)
-          []
-        end
-
-        # def assert_validations_api!(base) #:nodoc:
-        #   unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
-        #
-        #   unless unavailable_validations.empty?
-        #     raise "Could not use :validatable module since #{base} does not respond " <<
-        #               "to the following methods: #{unavailable_validations.to_sentence}."
-        #   end
-        # end
-      end
-    end
-  end
-end

data/app/models/bpluser/user.rb~

@@ -1,213 +0,0 @@
-module Bpluser::User
-
-  #DEPRECATED TO BE REMOVED UPON RELASE OF NEXT VERSION IN FAVOR OF CONCERNS
-  def self.included(base)
-    #, :validatable
-    base.send :devise, :database_authenticatable, :registerable,
-              :recoverable, :rememberable, :trackable, :omniauthable, :omniauth_providers => [:ldap, :polaris, :facebook]
-    #base.send :attr_accessible, :provider, :username, :email, :password, :password_confirmation, :remember_me, :first_name, :last_name, :display_name, :uid
-    base.send :has_many, :user_institutions, inverse_of: :user, dependent: :destroy, :class_name => "Bpluser::UserInstitution"
-    base.send :has_many, :folders, :dependent => :destroy, :class_name => "Bpluser::Folder"
-    base.extend(ClassMethods)
-    base.send :include, InstanceMethods
-
-    #Include custom validation that doesn't require email to be uniqe. Based on: https://github.com/plataformatec/devise/blob/master/lib/devise/models/validatable.rb
-    base.send :include, Bpluser::Validatable
-
-  end
-
-  module ClassMethods
-    def find_for_ldap_oauth(auth_response, signed_in_resource=nil)
-
-
-      ldap_raw_details = auth_response[:extra][:raw_info]
-      ldap_info_details = auth_response[:info]
-
-      user = User.where(:provider => auth_response.provider, :uid => ldap_raw_details.samaccountname[0].downcase).first
-
-      #first_name:ldap_info_details.first_name,
-      #last_name:ldap_info_details.last_name,
-      unless user
-        user = User.create(provider:auth_response.provider,
-                           uid:ldap_raw_details.samaccountname[0].downcase,
-                           username:ldap_raw_details.samaccountname[0].downcase,
-                           email:ldap_raw_details.mail[0].to_s.downcase,
-                           password:Devise.friendly_token[0,20],
-                           display_name: ldap_info_details.first_name + " " + ldap_info_details.last_name,
-                           first_name: ldap_info_details.first_name,
-                           last_name: ldap_info_details.last_name
-        )
-      end
-      groups = user.ldap_groups
-      groups.each do |group|
-        if(group == "Repository Administrators")
-          superuser_role = Role.where(:name=>'superuser').first
-          if(superuser_role == nil)
-            superuser_role = Role.create(:name=>"superuser")
-          end
-          user.roles << superuser_role unless user.roles.include?(superuser_role)
-          user.save!
-
-          admin_role = Role.where(:name=>'admin').first
-          if(admin_role == nil)
-            admin_role = Role.create(:name=>"admin")
-          end
-          user.roles << admin_role unless user.roles.include?(admin_role)
-          user.save!
-        end
-
-      end
-
-      user
-    end
-
-    def find_for_polaris_oauth(auth_response, signed_in_resource=nil)
-      polaris_raw_details = auth_response[:extra][:raw_info]
-      polaris_info_details = auth_response[:info]
-
-      user = User.where(:provider => auth_response.provider, :uid => auth_response[:uid]).first
-
-      #first_name:ldap_info_details.first_name,
-      #last_name:ldap_info_details.last_name,
-      unless user
-        email_value = polaris_info_details[:email].present? ? polaris_info_details[:email] : ''
-        #For some reason, User.create has no id set despite that intending to be autocreated. Unsure what is up with that. So trying this.
-        user = User.new(provider:auth_response.provider,
-                           uid:auth_response[:uid],
-                           username:polaris_info_details[:first_name],
-                           email:email_value,
-                           password:Devise.friendly_token[0,20],
-                           display_name:polaris_info_details[:first_name] + " " + polaris_info_details[:last_name],
-                           first_name: polaris_info_details[:first_name],
-                           last_name: polaris_info_details[:last_name]
-
-        )
-        user.save!
-
-      end
-      user
-    end
-
-    def find_for_facebook_oauth(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,
-                           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
-        )
-      end
-      user
-    end
-
-    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.full_name,
-                           uid:auth.uid,
-                           provider:auth.provider,
-                           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
-    #def find_by_user_key(key)
-      #self.send("find_by_#{Devise.authentication_keys.first}".to_sym, key)
-    #end
-  end
-
-  #has_and_belongs_to_many :groups
-
-  # Method added by Blacklight; Blacklight uses #to_s on your
-  # user class to get a user-displayable login/identifier for
-  # the account.
-
-  # The following methods will be included in any active model object
-  # that calls "is_blacklight_user"
-  module InstanceMethods
-
-
-    def to_s
-      self.username
-    end
-
-    def name
-      return self.username rescue self.display_name.titleize
-    end
-
-    def user_key
-      send(Devise.authentication_keys.first)
-    end
-
-
-    def ldap_groups
-      #Hydra::LDAP.groups_for_user(username + ",dc=psu,dc=edu")
-      #['archivist', 'admin_policy_object_editor']
-
-      Hydra::LDAP.groups_for_user(Net::LDAP::Filter.eq('samaccountname', self.username), ['memberOf'])  { |result| result.first[:memberOf].select{ |y| y.starts_with? 'CN=' }.map{ |x| x.sub(/^CN=/, '').sub(/,OU=Private Groups,DC=private,DC=bpl,DC=org/, '').sub(/,OU=Distribution Lists/, '').sub(/,OU=Security Groups/, '') } } rescue []
-    end
-
-    def populate_attributes
-
-    end
-
-    def default_user_groups
-      # # everyone is automatically a member of the group 'public'
-      #['public', 'test']
-    end
-
-    def get_uploads_collection
-      query="rightsMetadata_edit_access_machine_person_t:#{uid} AND title_s:Uploads AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-      ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-    end
-
-    def get_details_collection
-      query="rightsMetadata_edit_access_machine_person_t:#{uid} AND title_s:Details AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-      ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-    end
-
-    def collections
-      query="rightsMetadata_edit_access_machine_person_t:#{uid} AND NOT title_t:Uploads AND NOT title_t:Details AND has_model_s:info\\:fedora/afmodel\\:DILCollection"
-      ActiveFedora::SolrService.query(query, {:fl=>'id title_t'})
-    end
-
-    def existing_folder_item_for (document_id)
-      self.folders.find do |fldr|
-        fldr.folder_items.find do |fldr_itm|
-          return fldr_itm if fldr_itm.document_id == document_id
-        end
-      end
-    end
-
-    def superuser?
-      roles.where(name: 'superuser').exists?
-    end
-
-    def permanent_account?
-      return self.provider != 'digital_stacks_temporary'
-    end
-
-    def email_not_required?
-      if self.provider != 'digital_stacks_temporary' and self.provider != 'polaris'
-        return true
-      end
-      return false
-    end
-
-  end
-end

data/app/models/bpluser/user_institution.rb

@@ -1,6 +0,0 @@
-module Bpluser
-  class UserInstitution < ApplicationRecord
-    self.table_name = "user_institutions"
-    belongs_to :user, inverse_of: :user_institutions
-  end
-end

data/app/models/bpluser/validatable.rb~

@@ -1,65 +0,0 @@
-#By default, devise requires an email to be unique. I want the email checks but need to remove the uniqueness...
-module Bpluser::Validatable
-  #DEPRECATED TO BE REMOVED UPON RELAESE OF NEXT VERSION IN FAVOR OF CONCERNS
-  # Validatable creates all needed validations for a user email and password.
-  # It's optional, given you may want to create the validations by yourself.
-  # Automatically validate if the email is present, unique and its format is
-  # valid. Also tests presence of password, confirmation and length.
-  #
-  # == Options
-  #
-  # Validatable adds the following options to devise_for:
-  #
-  #   * +email_regexp+: the regular expression used to validate e-mails;
-  #   * +password_length+: a range expressing password length. Defaults to 8..72.
-  #
-    # All validations used by this module.
-
-    VALIDATIONS = [:validates_presence_of, :validates_format_of,
-                   :validates_confirmation_of, :validates_length_of].freeze
-
-    def self.required_fields(klass)
-      []
-    end
-
-    def self.included(base)
-      base.extend ClassMethods
-      assert_validations_api!(base)
-
-      base.class_eval do
-        validates_presence_of   :email, if: [:email_required?, :email_not_required?]
-        #validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-        validates_format_of     :email, with: email_regexp, allow_blank: true, if: [:email_changed?, :email_not_required?]
-
-        validates_presence_of     :password, if: :password_required?
-        validates_confirmation_of :password, if: :password_required?
-        validates_length_of       :password, within: password_length, allow_blank: true
-      end
-    end
-
-    def self.assert_validations_api!(base) #:nodoc:
-      unavailable_validations = VALIDATIONS.select { |v| !base.respond_to?(v) }
-
-      unless unavailable_validations.empty?
-        raise "Could not use :validatable module since #{base} does not respond " <<
-                  "to the following methods: #{unavailable_validations.to_sentence}."
-      end
-    end
-
-    protected
-
-    # Checks whether a password is needed or not. For validations only.
-    # Passwords are always required if it's a new record, or if the password
-    # or confirmation are being set somewhere.
-    def password_required?
-      !persisted? || !password.nil? || !password_confirmation.nil?
-    end
-
-    def email_required?
-      true
-    end
-
-    module ClassMethods
-      ::Devise::Models.config(self, :email_regexp, :password_length)
-    end
-  end

data/lib/bpluser/routes.rb

@@ -1,37 +0,0 @@
-module Bpluser
-  class Routes
-    def initialize(router, options)
-      @router = router
-      @options = options
-    end
-
-    def draw
-      route_sets.each do |r|
-        self.send(r)
-      end
-    end
-
-    protected
-
-    def add_routes &blk
-      @router.instance_exec(@options, &blk)
-    end
-
-    def route_sets
-      (@options[:only] || default_route_sets) - (@options[:except] || [])
-    end
-
-    def default_route_sets
-      [:omniauth_callbacks]
-    end
-
-    module RouteSets
-      def omniauth_callbacks
-        add_routes do |options|
-          resources :omniauth_callbacks
-        end
-      end
-    end
-    include RouteSets
-  end
-end