bpluser 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a184b0220732712ea2ca33ba036030b536d974e4
-  data.tar.gz: d85e0ab34d54d4886dd00837728f6abdb6ab5fa8
+  metadata.gz: f5167d7380a5a17ec2c522616b387c0d56321bc8
+  data.tar.gz: 7ad647948b54a9f126b546587d295ab569680f12
 SHA512:
-  metadata.gz: 7a72efada4fce7d24dcd7481e523f606c0f4147c841a3c0bf818d1bfcc85d1002213f6bb069a79b871ba690089ac618fe9d1981bbea16b4aa14bbcdb2250a32c
-  data.tar.gz: 5d887691378eeac07aae08741e9e26d163ec0ba7fbeb8c0deefd9bf4475dcf95aa685462e3cf15a2eaea44af3f831b32df94725d4dbfd4f635e6dea88e999d58
+  metadata.gz: bcd7a8723eb698341927164ee157ce8354db8b909b493b1230f2a148052db2071d050465276425ec1a0eb813422604a184fe414ce40d2d019e66c0e51831ffe6
+  data.tar.gz: 922b50e86f9a6061a12b768a8cc69b95971a43b5c0462161bbfbd902a44cdeea6b2951b91650613e2fc929e44e874d46411e3b6c1e83da543794f977928c4855

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

@@ -18,7 +18,12 @@ 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]
-      super
+      if User.where(:provider => params[:user][:provider], :uid => params[:user][:email]).present?
+        flash[:notice] = "This email address of #{params[:user][:email]} already has an account. Please sign in below or click the \"Forgot your password?\" link."
+        redirect_to new_user_session_path
+      else
+        super
+      end
     end
 
 

data/app/models/bpluser/folder.rb

@@ -1,7 +1,7 @@
 module Bpluser
   class Folder < ActiveRecord::Base
 
-    belongs_to :user
+    belongs_to :user, polymorphic: true
     has_many :folder_items, :dependent => :destroy, :class_name => "Bpluser::FolderItem"
 
     validates :user_id, :presence => true

data/lib/bpluser/version.rb

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

metadata

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