bpluser 0.0.26 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f2736b79e16012f1fe5260a9394007435b8de59
-  data.tar.gz: 596b8419d24719160f6a32e1b829ac91ca24e6b3
+  metadata.gz: 04206bee183f4ca5010dd71a07eab672510d0098
+  data.tar.gz: 4b8bce44344445856fdb59f1f594b2efeb4e209d
 SHA512:
-  metadata.gz: bcddf94ebff73f14573d001e2996f33e2b5a7f968e9ba0673f975dce5d0e007b911a86950204fd40a89d421eef20600dd3d674926634e0fe0b93259e2b5e1d04
-  data.tar.gz: 00ad7498d128642772df76654d90dc0dd28f0c3af6d32584be643c949147b67fbe3a3622c992c83c6bc3ee9754c641b0ae3f474366810fb68870c0be2126ba7a
+  metadata.gz: 6ec00eb6a9c8c925066994f37ebc76de27361d74e53db06cd959d4d95557fdfab40a149c7fe480a86138360b2e3fa4b205728ea61bdfe20821e5f2e4eb160592
+  data.tar.gz: 253907c67704b55ced0a3ae28060e5c1271e33f04850e3ce751b67bf68c333a9cb74e224a870fc71c847797c7dc7d4ce891098d51bbd359a3b1fba8a5a52f7ec

data/.gitignore

@@ -0,0 +1,70 @@
+# Generated by default by Github #
+##################################
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.rspec
+/.bundle
+/vendor/bundle
+/log/*
+/tmp/*
+/db/*.sqlite3
+/public/system/*
+/coverage/
+/spec/tmp/*
+**.orig
+rerun.txt
+pickle-email-*.html
+
+# Specific configuration files #
+################################
+database.yml
+fedora.yml
+solr.yml
+role_map_cucumber.yml
+role_map_development.yml
+role_map_production.yml
+role_map_test.yml
+ark.yml
+bpl_config.yml
+
+# Files to ignore by default in Git #
+#####################################
+*.pdf
+*.db
+*.jar
+*.gz
+*.tar
+*.zip
+*.dll
+*.sqlite
+*.sql
+*.sqlite3
+*.log
+# Specific Files to ignore #
+############################
+Thumbs.db
+Icon?
+.DS_Store?
+.DS_Store
+ehthumbs.db
+.idea # Rubymine config files
+/.idea/*
+Gemfile.lock
+
+# Directories to ignore #
+#########################
+/public/data/*
+/public/batch_uploads/*
+/jetty/*
+/solr_conf/*
+/fedora_conf/*
+/hydra-jetty/*
+/*jetty*
+/pkg/*
+
+# Ignore edited Linux files #
+#############################
+
+*~

data/Gemfile

@@ -0,0 +1,19 @@
+source "https://rubygems.org"
+
+# Declare your gem's dependencies in bpluser.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+gem 'bootsnap', require: false
+# jquery-rails is used by the dummy application
+group :development, :test do
+  gem "jquery-rails"
+end
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'debugger'

data/Rakefile

@@ -1,16 +1,15 @@
-# encoding: UTF-8
-require 'rubygems'
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rake'
-Bundler::GemHelper.install_tasks
-
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 # load rake tasks defined in lib/tasks that are not loaded in lib/active_fedora.rb
-load "tasks/bpluser_tasks.rake"
+Dir['lib/tasks/*.rake'].each { |rake| load rake }
+
+load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/statistics.rake'
 
-task :default => :test
+task :default => [:spec]

data/app/controllers/bpluser/api_controller.rb

@@ -2,8 +2,7 @@ module Bpluser
   class APIController < ActionController::Base
 
     def sdf
-      JSON.parse(request.body.read)
-
+      JSON.parse(request.body.read) #What does this do?
     end
   end
-end
+end

data/app/controllers/bpluser/users/omniauth_callbacks_controller.rb

@@ -32,10 +32,6 @@ module Bpluser::Users::OmniauthCallbacksController
       end
     end
 
-    def password
-      puts "here in local authentication!"
-    end
-
     def facebook
       # You need to implement the method below in your model (e.g. app/models/user.rb)
       @user = User.find_for_facebook_oauth(request.env["omniauth.auth"], current_user)
@@ -49,4 +45,4 @@ module Bpluser::Users::OmniauthCallbacksController
       end
     end
   end
-end
+end

data/app/controllers/bpluser/users/registrations_controller.rb

@@ -1,7 +1,8 @@
 module Bpluser::Users::RegistrationsController
+#TODO Make this an actual controller
 #< Devise::RegistrationsController
   def self.included(base)
-    base.send :before_filter, :update_sanitized_params, :if => :devise_controller?
+    base.send :before_action, :update_sanitized_params, :if => :devise_controller?
     base.send :include, InstanceMethods
   end
 
@@ -18,7 +19,7 @@ module Bpluser::Users::RegistrationsController
       params[:user][:uid] = params[:user][:email]
       params[:user][:username] = params[:user][:uid]
       params[:user][:display_name] = params[:user][:first_name] + " " + params[:user][:last_name]
-      if User.where(:provider => params[:user][:provider], :uid => params[:user][:email]).present?
+      if User.where(:provider => params[:user][:provider], :uid => params[:user][:email]).exists?
         flash[:error] = "An account with that email (#{params[:user][:email]}) already exists. Please sign in or click the \"Forgot your password?\" link below."
         redirect_to new_user_session_path
       else
@@ -30,6 +31,5 @@ module Bpluser::Users::RegistrationsController
     def resource_params
       params.require(:user).permit(:username, :email, :first_name, :last_name, :provider, :display_name, :password, :password_confirmation, :uid)
     end
-
   end
 end

data/app/models/bpluser/ability.rb

@@ -1,5 +1,5 @@
 module Bpluser::Ability
-
+  #TODO Move this into concern
   def self.included(base)
     base.send :include, InstanceMethods
   end
@@ -19,4 +19,4 @@ module Bpluser::Ability
     end
   end
 
-end
+end

data/app/models/bpluser/application_record.rb

@@ -0,0 +1,5 @@
+module Bpluser
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

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

@@ -0,0 +1,190 @@
+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, dependent: :destroy, :class_name => "Bpluser::UserInstitution"
+
+        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

@@ -0,0 +1,47 @@
+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/folder.rb

@@ -1,8 +1,8 @@
 module Bpluser
-  class Folder < ActiveRecord::Base
+  class Folder < ApplicationRecord
 
-    belongs_to :user, polymorphic: true
-    has_many :folder_items, :dependent => :destroy, :class_name => "Bpluser::FolderItem"
+    belongs_to :user, inverse_of: :folders, class_name: "::User"
+    has_many :folder_items, inverse_of: :folder ,:dependent => :destroy, :class_name => "Bpluser::FolderItem"
 
     validates :user_id, :presence => true
     #validates :title, :presence => true, :length => {:maximum => 40}
@@ -13,9 +13,7 @@ module Bpluser
     #attr_accessible :id, :title, :description, :visibility
 
     def has_folder_item (document_id)
-      self.folder_items.find do |fldr_itm|
-        return fldr_itm if fldr_itm.document_id == document_id
-      end
+      self.folder_items.where(document_id: document_id) if self.folder_items.where(document_id: document_id).exists?
     end
 
   end

data/app/models/bpluser/folder_item.rb

@@ -1,8 +1,8 @@
 module Bpluser
-  class FolderItem < ActiveRecord::Base
+  class FolderItem < ApplicationRecord
     #attr_accessible :document_id
 
-    belongs_to :folder, :class_name => "Bpluser::Folder"
+    belongs_to :folder, inverse_of: :folder_items, :class_name => "Bpluser::Folder"
 
     validates :folder_id, :presence => true
     validates :document_id, :presence => true
@@ -12,4 +12,4 @@ module Bpluser
     end
 
   end
-end
+end

data/app/models/bpluser/user_institution.rb

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

data/bin/rails

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('..', __dir__)
+ENGINE_PATH = File.expand_path('../lib/bpluser/engine', __dir__)
+APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/bpluser.gemspec

@@ -0,0 +1,38 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "bpluser/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "bpluser"
+  s.version     = Bpluser::VERSION
+  s.authors     = ["Boston Public Library Web Services"]
+  s.email       = ['sanderson@bpl.org', 'bbarber@bpl.org' ]
+  s.homepage    = "http://www.bpl.org"
+  s.summary     = "Shared user access gem of BPL"
+  s.description = "Shared user access gem of BPL"
+
+  s.files         = `git ls-files -z`.split("\x0")
+  s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+
+  s.required_ruby_version = '~> 2.4'
+
+  s.add_dependency "rails", '>= 5', '< 6'
+  s.add_dependency "omniauth", '~> 1.8.1', '< 1.9.0'
+  s.add_dependency "omniauth-ldap", '2.0.0'
+  s.add_dependency "omniauth-facebook", '5.0.0'
+  s.add_dependency "hydra-role-management", '1.0.0'
+  s.add_dependency 'devise', '4.5.0'
+  s.add_dependency 'devise-guests', '0.6.1'
+  s.add_dependency 'omniauth-polaris', '1.0.5'
+
+  s.add_development_dependency 'bundler', '>= 1.3.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'active-fedora', '>= 8.0.1', '< 9'
+  s.add_development_dependency 'hydra-ldap', '0.1.0'
+  s.add_development_dependency 'rspec-rails', '~> 3.8'
+  s.add_development_dependency 'awesome_print'
+  s.add_development_dependency "sqlite3"
+end

data/lib/bpluser/engine.rb

@@ -1,3 +1,4 @@
+require 'devise'
 module Bpluser
   class Engine < ::Rails::Engine
     isolate_namespace Bpluser

data/lib/bpluser/version.rb

@@ -1,3 +1,3 @@
 module Bpluser
-  VERSION = "0.0.26"
+  VERSION = "0.1.12".freeze
 end

data/lib/bpluser.rb

@@ -1,5 +1,15 @@
-require "bpluser/engine"
-
+begin
+  require 'base64'
+  require 'cgi'
+  require 'openssl'
+  require 'rest_client'
+  require 'active_support/concern' unless defined? ActiveSupport::Concern
+  require 'active_fedora' unless defined? ActiveFedora
+  require 'hydra-ldap' unless defined? Hydra::LDAP
+rescue LoadError => e
+  raise "One more more depndencies have not been installed please install the gem referred to in this error #{e.message}"
+end
+require 'bpluser/engine'
 module Bpluser
   autoload :Routes, 'bpluser/routes'
 

data/lib/generators/bpluser/templates/models/user.rb

@@ -1,14 +1,10 @@
-class User < ActiveRecord::Base
-  require 'base64'
-  require 'cgi'
-  require 'openssl'
-  require 'rest_client'
+class User < ApplicationRecord
   # Connects this user object to Hydra behaviors.
   include Hydra::User
   # Connects this user object to Blacklights Bookmarks.
   include Blacklight::User
   # Connects this user object to the BPL omniauth service
-  include Bpluser::User
+  include Bpluser::Concerns::User
   self.table_name = "users"
 
 end

data/lib/tasks/bpluser_tasks.rake

@@ -3,7 +3,7 @@
 #   # Task goes here
 # end
 
-APP_ROOT = File.expand_path("../..", __FILE__)
+# APP_ROOT = File.expand_path("../..", __FILE__)
 
 namespace :bpluser do
 

data/spec/dummy/.ruby-version

@@ -0,0 +1 @@
+2.4.5

data/{test → spec}/dummy/Rakefile

@@ -1,7 +1,6 @@
-#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require_relative 'config/application'
 
-Dummy::Application.load_tasks
+Rails.application.load_tasks

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+//= link my_plugin_manifest.js