Don't try to update password if not provided

Author: Redande

app/controllers/api/v8/users_controller.rb

@@ -292,11 +292,10 @@ def set_password
         end
 
         def maybe_update_password
-          if @user.password_managed_by_courses_mooc_fi && @user.courses_mooc_fi_user_id.present?
-            return @user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
-          end
-
           if params[:old_password].present? && params[:password].present?
+            if @user.password_managed_by_courses_mooc_fi && @user.courses_mooc_fi_user_id.present?
+              return @user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
+            end
             if !@user.has_password?(params[:old_password])
               @user.errors.add(:old_password, 'incorrect')
             elsif params[:password] != params[:password_repeat]

app/controllers/settings_controller.rb

@@ -86,11 +86,10 @@ def set_email
     end
 
     def maybe_update_password(user, user_params)
-      if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
-        return user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
-      end
-
       if user_params[:old_password].present? || user_params[:password].present?
+        if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
+          return user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
+        end
         if !user.has_password?(user_params[:old_password])
           user.errors.add(:old_password, 'incorrect')
         elsif user_params[:password] != user_params[:password_repeat]

app/controllers/users_controller.rb

@@ -179,11 +179,10 @@ def set_password
     end
 
     def maybe_update_password(user, user_params)
-      if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
-        return user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
-      end
-
       if user_params[:old_password].present? || user_params[:password].present?
+        if user.password_managed_by_courses_mooc_fi && user.courses_mooc_fi_user_id.present?
+          return user.update_password_via_courses_mooc_fi(user_params[:old_password], user_params[:password])
+        end
         if !user.has_password?(user_params[:old_password])
           user.errors.add(:old_password, 'incorrect')
         elsif user_params[:password] != user_params[:password_repeat]