diff --git a/app/models/user.rb b/app/models/user.rb --- a/app/models/user.rb +++ b/app/models/user.rb @@ -67,11 +67,6 @@ user = find_by_login(login) if user return user if user.authenticated?(password) - if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password) - user.password = password - user.save - return user - end end end @@ -83,48 +78,6 @@ end end - def authenticated_by_pop3?(password) - Net::POP3.enable_ssl - pop = Net::POP3.new('pops.it.chula.ac.th') - authen = true - begin - pop.start(login, password) - pop.finish - return true - rescue - return false - end - end - - def authenticated_by_cucas?(password) - url = URI.parse('https://www.cas.chula.ac.th/cas/api/?q=studentAuthenticate') - appid = '41508763e340d5858c00f8c1a0f5a2bb' - appsecret ='d9cbb5863091dbe186fded85722a1e31' - post_args = { - 'appid' => appid, - 'appsecret' => appsecret, - 'username' => login, - 'password' => password - } - - #simple call - begin - http = Net::HTTP.new('www.cas.chula.ac.th', 443) - http.use_ssl = true - result = [ ] - http.start do |http| - req = Net::HTTP::Post.new('/cas/api/?q=studentAuthenticate') - param = "appid=#{appid}&appsecret=#{appsecret}&username=#{login}&password=#{password}" - resp = http.request(req,param) - result = JSON.parse resp.body - end - return true if result["type"] == "beanStudent" - rescue - return false - end - return false - end - def admin? self.roles.detect {|r| r.name == 'admin' } end @@ -351,7 +304,7 @@ def uniqueness_of_email_from_activated_users user = User.activated_users.find_by_email(self.email) if user and (user.login != self.login) - self.errors.add_to_base("Email has already been taken") + self.errors.add(:base,"Email has already been taken") end end @@ -362,7 +315,7 @@ :order => 'created_at DESC') if open_user and open_user.created_at and (open_user.created_at > Time.now.gmtime - 5.minutes) - self.errors.add_to_base("There are already unactivated registrations with this e-mail address (please wait for 5 minutes)") + self.errors.add(:base,"There are already unactivated registrations with this e-mail address (please wait for 5 minutes)") end end