Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Working on issue #368 - Working on wrong user data key fails correct sha2 password import.

Browse source
This commit is contained in:
Thorsten Eckel 2016-11-28 16:30:33 +01:00
parent 1f0e48afad
commit b63e98714c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/import/otrs/user.rb
View file

@ -15,7 +15,6 @@ module Import
UserFirstname: :firstname, UserFirstname: :firstname,
UserLastname: :lastname, UserLastname: :lastname,
UserLogin: :login, UserLogin: :login,
UserPw: :password,
}.freeze }.freeze
def initialize(user) def initialize(user)
@ -80,8 +79,8 @@ module Import
end end
def password(user) def password(user)
return if !user[:password] return if !user['UserPw']
"{sha2}#{user[:password]}" "{sha2}#{user['UserPw']}"
end end
def group_ids(user) def group_ids(user)

4
spec/import/otrs/user_spec.rb
View file

@ -74,7 +74,7 @@ RSpec.describe Import::OTRS::User do
source: 'OTRS Import', source: 'OTRS Import',
role_ids: [2], role_ids: [2],
group_ids: ['1'], group_ids: ['1'],
password: '9faaba2ab242a99bbb6992e9424386375f6757c17e6484ae570f39d9cad9f28ea', password: '{sha2}9faaba2ab242a99bbb6992e9424386375f6757c17e6484ae570f39d9cad9f28ea',
updated_at: '2014-04-28 10:53:18', updated_at: '2014-04-28 10:53:18',
created_at: '2014-04-28 10:53:18', created_at: '2014-04-28 10:53:18',
id: '1', id: '1',
@ -107,7 +107,7 @@ RSpec.describe Import::OTRS::User do
source: 'OTRS Import', source: 'OTRS Import',
role_ids: [2], role_ids: [2],
group_ids: [], group_ids: [],
password: '9edb001ad7900daea0622d89225c9ca729749fd12ae5ea044f072d1b7c56c8cc', password: '{sha2}9edb001ad7900daea0622d89225c9ca729749fd12ae5ea044f072d1b7c56c8cc',
updated_at: '2014-11-14 00:53:20', updated_at: '2014-11-14 00:53:20',
created_at: '2014-11-14 00:53:20', created_at: '2014-11-14 00:53:20',
id: '6', id: '6',