Skip to content

Commit 602a53a

Browse files
authored
Remove code not longer needed (#2019)
1 parent f621101 commit 602a53a

File tree

10 files changed

+14
-72
lines changed

10 files changed

+14
-72
lines changed

app/controllers/welcome_controller.rb

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,5 @@ def index
1111
end
1212
end
1313

14-
def help
15-
# Piggybacking on this page to pass custom HTTP headers to Mediaflux
16-
# in a very controlled scenario.
17-
root_ns = Rails.configuration.mediaflux["api_root_collection_namespace"]
18-
parent_collection = Rails.configuration.mediaflux["api_root_collection_name"]
19-
@test_path = Pathname.new(root_ns).join(parent_collection)
20-
@test_http_headers = false
21-
unless current_user.nil?
22-
@test_http_headers = params["http-headers"] == "true"
23-
request = if @test_http_headers
24-
Mediaflux::AssetExistRequest.new(session_token: current_user.mediaflux_session, path: @test_path, session_user: current_user)
25-
else
26-
Mediaflux::AssetExistRequest.new(session_token: current_user.mediaflux_session, path: @test_path)
27-
end
28-
@test_path_exist = request.exist?
29-
end
30-
end
14+
def help; end
3115
end

app/models/mediaflux/actor_self_describe_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module Mediaflux
33
class ActorSelfDescribeRequest < Request
44
# Constructor
55
# @param session_token [String] the API token for the authenticated session
6-
def initialize(session_token:, session_user: nil)
7-
super(session_token: session_token, session_user: session_user)
6+
def initialize(session_token:)
7+
super(session_token: session_token)
88
end
99

1010
# Specifies the Mediaflux service to use

app/models/mediaflux/asset_exist_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ module Mediaflux
33
class AssetExistRequest < Request
44
# Constructor
55
# @param session_token [String] the API token for the authenticated session
6-
def initialize(session_token:, path:, session_user: nil)
7-
super(session_token: session_token, session_user: session_user)
6+
def initialize(session_token:, path:)
7+
super(session_token: session_token)
88
@path = path
99
end
1010

app/models/mediaflux/request.rb

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,10 @@ def self.find_or_create_http_client
4747
# @param file [File] any upload file required for the POST request
4848
# @param session_token [String] the API token for the authenticated session
4949
# @param http_client [Net::HTTP::Persistent] HTTP client for transmitting requests to the Mediaflux server API
50-
def initialize(file: nil, session_token: nil, http_client: nil, session_user: nil)
50+
def initialize(file: nil, session_token: nil, http_client: nil)
5151
@http_client = http_client || self.class.find_or_create_http_client
5252
@file = file
5353
@session_token = session_token
54-
@session_user = session_user
5554
end
5655

5756
# Resolves the HTTP request against the Mediaflux API
@@ -154,8 +153,6 @@ def build_http_request(name:, form_file: nil)
154153
request = self.class.build_post_request
155154

156155
log_xml_request(xml_payload)
157-
set_authentication_headers(request)
158-
159156
if form_file.nil?
160157
request["Content-Type"] = "text/xml; charset=utf-8"
161158
request.body = xml_payload(name:)
@@ -181,13 +178,5 @@ def log_xml_request(xml_payload)
181178
Rails.logger.debug(xml_payload.gsub(password_element.to_s, "<password>***</password>"))
182179
end
183180
end
184-
185-
# Authentication code to push a few custom HTTP headers to Mediaflux
186-
# Eventually the `session_user` will need to be an object that provides the timeout value.
187-
def set_authentication_headers(request)
188-
return if @session_user.nil?
189-
190-
request["mediaflux.sso.user"] = @session_user.uid
191-
end
192181
end
193182
end

app/models/mediaflux/script_file_list_init_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class ScriptFileListInitRequest < Request
44
# Constructor
55
# @param session_token [String] the API token for the authenticated session
66
# @param path [String] path to the collection we want the list of files for
7-
def initialize(session_token:, path:, session_user: nil)
8-
super(session_token: session_token, session_user: session_user)
7+
def initialize(session_token:, path:)
8+
super(session_token: session_token)
99
@path = path
1010
end
1111

app/models/mediaflux/script_file_list_iterate_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class ScriptFileListIterateRequest < Request
44
# Constructor
55
# @param session_token [String] the API token for the authenticated session
66
# @param iterator [Int] the iterator returned by ScriptFileListInitRequest
7-
def initialize(session_token:, iterator:, session_user: nil)
8-
super(session_token: session_token, session_user: session_user)
7+
def initialize(session_token:, iterator:)
8+
super(session_token: session_token)
99
@iterator = iterator
1010
end
1111

app/models/mediaflux/script_make_executable_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ class ScriptMakeExecutableRequest < Request
44
# Constructor
55
# @param session_token [String] the API token for the authenticated session
66
# @param path [String] full path to the script to mark as executable
7-
def initialize(session_token:, path:, session_user: nil)
8-
super(session_token: session_token, session_user: session_user)
7+
def initialize(session_token:, path:)
8+
super(session_token: session_token)
99
@path = path
1010
end
1111

app/models/mediaflux/script_upload_request.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ class ScriptUploadRequest < Request
66
# @param namespace [String] namespace where the script will be saved
77
# @param name [String] name of the script
88
# @param url [String] URL where the content of the script will be fetched from
9-
def initialize(session_token:, namespace:, name:, url:, session_user: nil)
10-
super(session_token: session_token, session_user: session_user)
9+
def initialize(session_token:, namespace:, name:, url:)
10+
super(session_token: session_token)
1111
@namespace = namespace
1212
@name = name
1313
@url = url

app/views/welcome/help.html.erb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
<p>TigerData is still under construction, and you are not registered as a tester at this time.</p>
22

33
<p>If you have any questions, please contact the team at <%= link_to("[email protected]", "mailto:[email protected]") %>.</p>
4-
5-
<% if current_user %>
6-
<h3>HTTP headers test</h3>
7-
<p>Custom HTTP headers: <%= @test_http_headers %> </p>
8-
<p>User: <%= current_user.uid %> </p>
9-
<p>Path: <%= @test_path %></p>
10-
<p>Exist?: <%= @test_path_exist %></p>
11-
<% end %>

spec/models/mediaflux/asset_exist_request_headers_spec.rb

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)