1+ # frozen_string_literal: true
2+
13class Member < ActiveRecord ::Base
24 self . primary_key = :medlem_id
35
4- has_many :members_roles , : dependent => :destroy
5- has_many :roles , : through => :members_roles
6+ has_many :members_roles , dependent : :destroy
7+ has_many :roles , through : :members_roles
68
7- attr_accessor :passord if %w( production staging ) . include? Rails . env
9+ attr_accessor :passord if %w[ production staging ] . include? Rails . env
810
911 validates_presence_of :fornavn , :etternavn , :mail , :telefon
1012
11- if Rails . env . development?
12- validates_presence_of :passord
13- end
13+ validates_presence_of :passord if Rails . env . development?
1414
1515 def firstname
1616 fornavn
@@ -25,7 +25,7 @@ def full_name
2525 end
2626
2727 def self . authenticate ( member_id_or_email , password )
28- if %w( production staging ) . include? Rails . env
28+ if %w[ production staging ] . include? Rails . env
2929 authenticate_production member_id_or_email , password
3030 else
3131 authenticate_development member_id_or_email , password
@@ -37,22 +37,20 @@ def self.authenticate(member_id_or_email, password)
3737 def self . authenticate_production ( member_id_or_email , password )
3838 Rails . logger . silence do # Prevents passwords from showing up in the logs.
3939 member_id = connection . select_value sanitize_sql ( [
40- " SELECT * FROM sett_lim_utvidet_medlemsinfo(?, ?)" ,
41- member_id_or_email . to_s ,
42- password
40+ ' SELECT * FROM sett_lim_utvidet_medlemsinfo(?, ?)' ,
41+ member_id_or_email . to_s ,
42+ password
4343 ] )
44- unless member_id . nil?
45- Member . find member_id
46- end
44+ Member . find member_id unless member_id . nil?
4745 end
4846 end
4947
5048 def self . authenticate_development ( member_id_or_email , password )
5149 # There are no SQL standard for lower case search,
5250 # and that's why there's no help from ruby or rails.
5351 member = Member . find_by_medlem_id ( member_id_or_email ) ||
54- Member . where ( " lower(mail) = ?" , member_id_or_email . downcase ) . first
52+ Member . where ( ' lower(mail) = ?' , member_id_or_email . downcase ) . first
5553
56- member if member and member . passord == password
54+ member if member && ( member . passord == password )
5755 end
5856end
0 commit comments