fix user creation when specifying both unique_id and path

test plan:
* set the root account to have a custom "Login label"
* create a user through the account new user dialog
 with a login id and an email
* the email should be saved on the user

closes #CNVS-36237

Change-Id: Ifd5d12ee9b78e37a886d0dd66f54f05f2223387a
Reviewed-on: https://gerrit.instructure.com/108305
Tested-by: Jenkins
Reviewed-by: Simon Williams <simon@instructure.com>
QA-Review: Deepeeca Soundarrajan <dsoundarrajan@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>

Author: maneframe

app/controllers/users_controller.rb

@@ -2285,9 +2285,10 @@ def create_user
         includes << 'confirmation_url' if value_to_boolean(cc_params[:confirmation_url])
       end
 
-    elsif EmailAddressValidator.valid?(params[:pseudonym][:unique_id])
+    else
       cc_type = CommunicationChannel::TYPE_EMAIL
       cc_addr = params[:pseudonym].delete(:path) || params[:pseudonym][:unique_id]
+      cc_addr = nil unless EmailAddressValidator.valid?(cc_addr)
     end
 
     if params[:user]

spec/controllers/users_controller_spec.rb

@@ -519,6 +519,12 @@
           expect(p.user).to be_pre_registered
         end
 
+        it "should create users with non-email pseudonyms and an email" do
+          post 'create', format: 'json', account_id: account.id, pseudonym: { unique_id: 'testid', path: 'testemail@example.com' }, user: { name: 'test' }
+          expect(response).to be_success
+          p = Pseudonym.where(unique_id: 'testid').first
+          expect(p.user.email).to eq "testemail@example.com"
+        end
 
         it "should not require acceptance of the terms" do
           post 'create', :account_id => account.id, :pseudonym => { :unique_id => 'jacob@instructure.com' }, :user => { :name => 'Jacob Fugal' }