bullet_train 1.3.11 → 1.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e978873b55ca6a15b2b500915937a0eaa092d9bc5a8a8b2f8dc1f10d6ac27f7
-  data.tar.gz: 8756fd456af1bc3f70429c78234175e00d28fbefe04fa9253182831fefb084a3
+  metadata.gz: ff63727028d8970aacd62bb659702ef467d8ee0627935977b444cb49e77f1344
+  data.tar.gz: 5f136b1f3c5c320cfecbcb52103f327fd48e043647e54473db02b2c6c5a2df3e
 SHA512:
-  metadata.gz: 9988ba16cd8b3c98161e4ba478e97f93b87152211592c93b62f4ba898fd6131e3a6abfd3190e0975a9e7ab1bef9fb53b3c0e783d481823dd0e37423fa44f4845
-  data.tar.gz: 42f98d7b289251a81263282265b307e4f3901e8e5379c7b95f4ba4451318e1aa4b9f9b99a1b96a75c0e9aa4ee3cd2afd5c4b82896705e3542bbe63d13b9a0f01
+  metadata.gz: 2d5d9b223e72b434743d32e1e82902d4b9ca5eec1379420d2f5bf8afaeae25987cc10e111aaf7623cd5ad37025fd055e86457dc816b17ba29c519bb4da88f066
+  data.tar.gz: '0539a2acd42bd86c633c1733e89e4bd0837775b5786d15732f0f36bbe07f38c8f3fc395973877d56d7b7948033f945ac89b163e73904fe33cc5a5f2f14821142'

data/app/models/concerns/invitations/base.rb

@@ -9,7 +9,7 @@ module Invitations::Base
 
     accepts_nested_attributes_for :membership
 
-    validates :email, presence: true
+    validates :email, presence: true, uniqueness: {scope: :team}
 
     after_create :set_added_by_membership
     after_create :send_invitation_email

data/app/models/concerns/memberships/base.rb

@@ -21,6 +21,8 @@ module Memberships::Base
     # Image uploading
     has_one_attached :user_profile_photo
 
+    validates :user_email, uniqueness: {scope: :team}
+
     after_destroy do
       # if we're destroying a user's membership to the team they have set as
       # current, then we need to remove that so they don't get an error.

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

@@ -71,7 +71,7 @@ module Users::Base
   def create_default_team
     # This creates a `Membership`, because `User` `has_many :teams, through: :memberships`
     default_team = teams.create(name: I18n.t("teams.new.default_team_name"), time_zone: time_zone)
-    memberships.find_by(team: default_team).update role_ids: [Role.admin.id]
+    memberships.find_by(team: default_team).update(user_email: email, role_ids: [Role.admin.id])
     update(current_team: default_team)
   end
 

data/config/locales/en/invitations.en.yml

@@ -59,6 +59,7 @@ en:
       resent: 'Invitation was successfully resent.'
       resent_error: Sorry, we couldn't find an invitation to resend.
       doesnt_exist: Sorry, but we couldn't find your invitation. Please contact an administrator on the team to have them send you another one.
+      duplicate: 'Sorry, a member with the email %{user_email} has already been invited.'
     values:
       name: 'Invitation to Join %{team_name}'
   account:

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.3.11"
+  VERSION = "1.3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.3.11
+  version: 1.3.12
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard