Raise error

app/controllers/admin/organizations_controller.rb

@@ -57,6 +57,9 @@ def create
       flash[:error] = "Failed to create Organization."
       render :new
     end
+  rescue => e
+    flash[:error] = e
+    render :new
   end
 
   def show

app/controllers/admin/users_controller.rb

@@ -41,8 +41,8 @@ def create
       resource: Organization.find(user_params[:organization_id]))
     flash[:notice] = "Created a new user!"
     redirect_to admin_users_path
-  rescue
-    flash[:error] = "Failed to create user"
+  rescue => e
+    flash[:error] = "Failed to create user: #{e}"
     render "admin/users/new"
   end
 

app/controllers/organizations_controller.rb

@@ -28,6 +28,8 @@ def invite_user
       roles: [Role::ORG_USER],
       resource: Organization.find(params[:org]))
     redirect_to organization_path, notice: "User invited to organization!"
+  rescue => e
+    redirect_to organization_path, alert: e.message
   end
 
   def resend_user_invitation

app/controllers/partners/users_controller.rb

@@ -36,6 +36,9 @@ def create
         flash[:error] = user.errors.full_messages.join("")
         redirect_to new_partners_user_path
       end
+    rescue => e
+      flash[:error] = e.message
+      redirect_to new_partners_user_path
     end
 
     private

app/services/partner_invite_service.rb

@@ -17,6 +17,8 @@ def call
       roles: [Role::PARTNER],
       resource: partner,
       force: @force)
+  rescue => e
+    errors.add(:base, e.message)
   end
 
   attr_reader :partner

app/services/user_invite_service.rb

@@ -11,7 +11,9 @@ def self.invite(email:, resource:, name: nil, roles: [], force: false)
     user = User.find_by(email: email)
 
     # return if user already has all the roles we're trying to add
-    return if !force && user && roles.all? { |role| user.has_role?(role, resource) }
+    if !force && user && roles.all? { |role| user.has_role?(role, resource) }
+      raise "User already has the requested role!"
+    end
 
     if user
       add_roles(user, resource: resource, roles: roles)

spec/services/user_invite_service_spec.rb

@@ -9,9 +9,11 @@
       User.create!(name: "Some Name", email: "email@email.com", password: "blahblah!")
     end
 
-    it "should not reinvite the existing user" do
-      expect { described_class.invite(email: "email@email.com", resource: @organization) }
-        .not_to change { ActionMailer::Base.deliveries.count }
+    it "should raise an error when reinviting an existing user with the same role" do
+      expect {
+        expect { described_class.invite(email: "email@email.com", resource: @organization) }
+          .to raise_error("User already has the requested role!")
+      }.not_to change { ActionMailer::Base.deliveries.count }
       expect(UserMailer).not_to have_received(:role_added)
     end