bpluser 0.0.18 → 0.0.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/bpluser/users/registrations_controller.rb +6 -1
  3. data/app/models/bpluser/folder.rb +1 -1
  4. data/lib/bpluser/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a184b0220732712ea2ca33ba036030b536d974e4
4
- data.tar.gz: d85e0ab34d54d4886dd00837728f6abdb6ab5fa8
3
+ metadata.gz: f5167d7380a5a17ec2c522616b387c0d56321bc8
4
+ data.tar.gz: 7ad647948b54a9f126b546587d295ab569680f12
5
5
  SHA512:
6
- metadata.gz: 7a72efada4fce7d24dcd7481e523f606c0f4147c841a3c0bf818d1bfcc85d1002213f6bb069a79b871ba690089ac618fe9d1981bbea16b4aa14bbcdb2250a32c
7
- data.tar.gz: 5d887691378eeac07aae08741e9e26d163ec0ba7fbeb8c0deefd9bf4475dcf95aa685462e3cf15a2eaea44af3f831b32df94725d4dbfd4f635e6dea88e999d58
6
+ metadata.gz: bcd7a8723eb698341927164ee157ce8354db8b909b493b1230f2a148052db2071d050465276425ec1a0eb813422604a184fe414ce40d2d019e66c0e51831ffe6
7
+ data.tar.gz: 922b50e86f9a6061a12b768a8cc69b95971a43b5c0462161bbfbd902a44cdeea6b2951b91650613e2fc929e44e874d46411e3b6c1e83da543794f977928c4855
data/app/controllers/bpluser/users/registrations_controller.rb CHANGED
@@ -18,7 +18,12 @@ module Bpluser::Users::RegistrationsController
18
18
  params[:user][:uid] = params[:user][:email]
19
19
  params[:user][:username] = params[:user][:uid]
20
20
  params[:user][:display_name] = params[:user][:first_name] + " " + params[:user][:last_name]
21
- super
21
+ if User.where(:provider => params[:user][:provider], :uid => params[:user][:email]).present?
22
+ flash[:notice] = "This email address of #{params[:user][:email]} already has an account. Please sign in below or click the \"Forgot your password?\" link."
23
+ redirect_to new_user_session_path
24
+ else
25
+ super
26
+ end
22
27
  end
23
28
 
24
29
 
data/app/models/bpluser/folder.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Bpluser
2
2
  class Folder < ActiveRecord::Base
3
3
 
4
- belongs_to :user
4
+ belongs_to :user, polymorphic: true
5
5
  has_many :folder_items, :dependent => :destroy, :class_name => "Bpluser::FolderItem"
6
6
 
7
7
  validates :user_id, :presence => true
data/lib/bpluser/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Bpluser
2
- VERSION = "0.0.18"
2
+ VERSION = "0.0.19"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bpluser
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.18
4
+ version: 0.0.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Boston Public Library Web Services
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-21 00:00:00.000000000 Z
11
+ date: 2016-05-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails