diff --git a/app/helpers/dams_objects_helper.rb b/app/helpers/dams_objects_helper.rb index 6b196c26e..be2474b4b 100644 --- a/app/helpers/dams_objects_helper.rb +++ b/app/helpers/dams_objects_helper.rb @@ -663,7 +663,7 @@ def encrypt_stream_name( pid, fid, ip ) #--- def secure_token(field_data, obj_id, cmp_id, base_url) - file_name = grab_file_name(field_data, cmp_id) + file_name = audio_video_file_name(field_data, cmp_id) return nil unless file_name end_time = secure_token_end_time token_hash = secure_token_hash(end_time, file_name, obj_id, base_url) @@ -687,7 +687,7 @@ def secure_token_hash(end_time, file_name, obj_id, base_url) token_params = token_params.sort stream = base_url.sub(%r{.*?\/}, '') obj_path = obj_id.scan(/.{1,2}/).join('/') - hash_in = "#{stream}#{obj_path}/20775-#{obj_id}-#{file_name}?#{token_params.join('&')}" + hash_in = "#{stream}#{obj_path}/#{ark_naan}-#{obj_id}-#{file_name}?#{token_params.join('&')}" hash_out = Digest::SHA2.new(256).digest(hash_in.to_s) hash_out = Base64.encode64(hash_out).to_s.strip matchers = { '+' => '-', '/' => '_' } @@ -705,10 +705,10 @@ def secure_token_hash(end_time, file_name, obj_id, base_url) #--- def secure_token_base_url(field_data, obj_id, cmp_id, base_url) - file_name = grab_file_name(field_data, cmp_id) + file_name = audio_video_file_name(field_data, cmp_id) return nil unless file_name obj_path = obj_id.scan(/.{1,2}/).join('/') - "#{base_url}#{obj_path}/20775-#{obj_id}-#{file_name}".html_safe + "#{base_url}#{obj_path}/#{ark_naan}-#{obj_id}-#{file_name}".html_safe end #--- @@ -719,7 +719,7 @@ def secure_token_base_url(field_data, obj_id, cmp_id, base_url) # @return string or nil #--- - def grab_file_name(field_data, cmp_id) + def audio_video_file_name(field_data, cmp_id) return nil unless field_data field_data.each do |datum| files = JSON.parse(datum) @@ -730,6 +730,8 @@ def grab_file_name(field_data, cmp_id) end end + def ark_naan() Rails.configuration.id_namespace.sub(%r{.*ark:\/}, '')[0..4] end + #--- # Creates Wowza Token End Time # diff --git a/spec/helpers/dams_object_helper_spec.rb b/spec/helpers/dams_object_helper_spec.rb index 18e7f0c7c..f5412d5df 100644 --- a/spec/helpers/dams_object_helper_spec.rb +++ b/spec/helpers/dams_object_helper_spec.rb @@ -22,7 +22,7 @@ it 'builds secure token base URL' do base_url = helper.secure_token_base_url(@field_data, @obj_id, @cmp_id, Rails.configuration.secure_token_audio_baseurl) - expect(base_url).to include "#{Rails.configuration.secure_token_audio_baseurl}xy/76/12/55/7h/20775-xy7612557h-0-2.mp3" + expect(base_url).to include "#{Rails.configuration.secure_token_audio_baseurl}xy/76/12/55/7h/#{helper.ark_naan}-xy7612557h-0-2.mp3" end end end \ No newline at end of file