Move the "mv" invalid destination user check into the runner.

[mailshears.git] / lib / mv / mv_runner.rb

diff --git a/lib/mv/mv_runner.rb b/lib/mv/mv_runner.rb
index d2a7c5ba01d4664882a14b9b539f76f1f578d709..ee762e1e70cf4198c1630b3404973d20c75ac264 100644 (file)
--- a/lib/mv/mv_runner.rb
+++ b/lib/mv/mv_runner.rb
@@ -12,6 +12,12 @@ class MvRunner
       raise NotImplementedError.new('Only users can be moved.')
     end
 
       raise NotImplementedError.new('Only users can be moved.')
     end
 

+    # Handle this once so we don't have to do it in every plugin.
+    if not dst.include?('@') then
+      msg = "the destination user #{dst} is not valid"
+      raise InvalidUserError.new(msg)
+    end
+

     begin
       src_description = plugin.describe_user(src)
       plugin.mv_user(src, dst)
     begin
       src_description = plugin.describe_user(src)
       plugin.mv_user(src, dst)