From a36072e8f1ecf60ed5987f9e73a0f040f929ade1 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Tue, 18 Aug 2020 09:07:16 +0800 Subject: [PATCH] Delete mail validate for bind action --- app/controllers/oauth/educoder_controller.rb | 4 ++-- app/forms/oauth_educoder_form.rb | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/oauth/educoder_controller.rb b/app/controllers/oauth/educoder_controller.rb index dea6e2482..a803adbb6 100644 --- a/app/controllers/oauth/educoder_controller.rb +++ b/app/controllers/oauth/educoder_controller.rb @@ -2,11 +2,11 @@ class Oauth::EducoderController < Oauth::BaseController def bind begin login = params[:login] - mail = params[:mail] + mail = params[:mail] || nil callback_url = params[:callback_url] token = params[:token] - ::OauthEducoderForm.new({login: login, token: token, mail: mail, callback_url: callback_url}).validate! + ::OauthEducoderForm.new({login: login, token: token, callback_url: callback_url}).validate! open_user= OpenUsers::Educoder.find_by(uid: login) diff --git a/app/forms/oauth_educoder_form.rb b/app/forms/oauth_educoder_form.rb index cfb00726b..f8222cfa0 100644 --- a/app/forms/oauth_educoder_form.rb +++ b/app/forms/oauth_educoder_form.rb @@ -1,11 +1,10 @@ class OauthEducoderForm include ActiveModel::Model - attr_accessor :login, :token, :mail, :callback_url + attr_accessor :login, :token, :callback_url validates :login, presence: true validates :token, presence: true - validates :mail, presence: true validates :callback_url, presence: true validate :check_callback_url!