| @@ -2,11 +2,11 @@ class Oauth::EducoderController < Oauth::BaseController | |||||
| def bind | def bind | ||||
| begin | begin | ||||
| login = params[:login] | login = params[:login] | ||||
| mail = params[:mail] | |||||
| mail = params[:mail] || nil | |||||
| callback_url = params[:callback_url] | callback_url = params[:callback_url] | ||||
| token = params[:token] | 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) | open_user= OpenUsers::Educoder.find_by(uid: login) | ||||
| @@ -1,11 +1,10 @@ | |||||
| class OauthEducoderForm | class OauthEducoderForm | ||||
| include ActiveModel::Model | include ActiveModel::Model | ||||
| attr_accessor :login, :token, :mail, :callback_url | |||||
| attr_accessor :login, :token, :callback_url | |||||
| validates :login, presence: true | validates :login, presence: true | ||||
| validates :token, presence: true | validates :token, presence: true | ||||
| validates :mail, presence: true | |||||
| validates :callback_url, presence: true | validates :callback_url, presence: true | ||||
| validate :check_callback_url! | validate :check_callback_url! | ||||