From 375e1fee8337217a1a54e3aafe1e1a2b699e7077 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 17 Jul 2020 17:04:10 +0800 Subject: [PATCH] Remove Email Regex --- app/tasks/check_gitea_user.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/tasks/check_gitea_user.rb b/app/tasks/check_gitea_user.rb index eb2888672..5a9e7296a 100644 --- a/app/tasks/check_gitea_user.rb +++ b/app/tasks/check_gitea_user.rb @@ -7,14 +7,15 @@ class CheckGiteaUser all_users = User.select(:id, :gitea_token, :gitea_uid, :mail, :type,:login,:platform).where(type: "User", gitea_token: [nil, ""], gitea_uid: [nil, ""]) if all_users.present? new_password = "12345678" + # EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/i all_users.each do |user| begin SyncLog.sync_log("=====check_user_login_is:#{user.login}======") - EMAIL_REGEX = /^[a-zA-Z0-9_\-.]+@[a-zA-Z0-9_\-.]+(\.[a-zA-Z0-9_-]+)+$/ + user_mail = user&.mail.present? ? user.mail : "#{user.login}@example.com" - unless user_mail.match(EMAIL_REGEX).present? - user_mail = "#{user.login}@example.com" - end + # unless user_mail.match(EMAIL_REGEX).present? + # user_mail = "#{user.login}@example.com" + # end ActiveRecord::Base.transaction do interactor = Gitea::RegisterInteractor.call({username: user.login, email: user_mail, password: new_password}) if interactor.success?