Merge pull request #1149 from CDL-Dryad/2268-remove-unused-credentials

Removes extra credentials no longer used

app/views/stash_engine/metadata_entry_pages/find_or_create.html.erb

@@ -6,7 +6,7 @@
 <%= render partial: 'stash_engine/shared/dataset_steps_nav' %>
 <script>
   function googleMapsApiKey() {
-    return "<%= APP_CONFIG.google_maps_api_key %>";
+    return "";
   }
 </script>
 <div id="find_or_create"

config/app_config.yml

@@ -28,7 +28,6 @@ defaults: &DEFAULTS
   helpdesk_email: [email protected]
   send_journal_published_notices: false
   default_tenant: dryad
-  old_dryad_access_token: <%= Rails.application.credentials[Rails.env.to_sym][:old_dryad_access_token] %>
   old_dryad_url: https://v1.datadryad.org
   counter:
     account: CDL.DASH
@@ -166,7 +165,6 @@ defaults: &DEFAULTS
     key: AKIA2KERHV5E3OITXZXC
     secret: <%= Rails.application.credentials[Rails.env.to_sym][:s3_secret] %>
   google_analytics_id: null
-  google_maps_api_key: <%= Rails.application.credentials[Rails.env.to_sym][:google_maps_api_key] %>
   google_recaptcha_sitekey: 6Lfhn5kiAAAAAIzZPQEGRa43cDJz-rNVxRcQIkU4
   google:
     gmail_client_id: <%= Rails.application.credentials[Rails.env.to_sym][:gmail_client_id] %>
@@ -310,7 +308,6 @@ production:
     api: https://api.orcid.org
   submission_bc_emails: [""]
   send_journal_published_notices: true
-  old_dryad_access_token: <%= Rails.application.credentials[Rails.env.to_sym][:old_dryad_access_token] %>
   zenodo:
     access_token: <%= Rails.application.credentials[Rails.env.to_sym][:zenodo_access_token] %> 
     base_url: https://zenodo.org

config/tenants/dataone.yml

@@ -4,8 +4,8 @@ default: &default
   repository:
     domain: https://merritt-stage.cdlib.org
     endpoint: "http://mrtsword-stg.cdlib.org:39001/mrtsword/collection/dataone_dash"
-    username: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dataone_username] %>
-    password: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dataone_password] %>
+    username: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dryaddev_username] %>
+    password: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dryaddev_password] %>
   abbreviation: "DataONE"
   short_name: "DataONE"
   long_name: "DataONE"

config/tenants/lbnl.yml

@@ -46,8 +46,8 @@ stage:
   repository:
     domain: https://merritt-stage.cdlib.org
     endpoint: "http://mrtsword-stg.cdlib.org:39001/mrtsword/collection/lbnl_dash"
-    username: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_lbnl_username] %>
-    password: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_lbnl_password] %> 
+    username: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dryadstg_username] %>
+    password: <%= Rails.application.credentials[Rails.env.to_sym][:merritt_dryadstg_password] %>
 
 production:
   <<: *default

dryad-config-example/app_config.yml

@@ -5,7 +5,6 @@ defaults: &DEFAULTS
   ezid:
     host: ezid.cdlib.org
     port: 443
-  google_maps_api_key: <add_key_here>
   contact_us_uri: http://www.cdlib.org/services/uc3/contact.html
   orcid:
     site: https://sandbox.orcid.org/
@@ -21,7 +20,6 @@ defaults: &DEFAULTS
   zenodo_error_email: [[email protected]]
   contact_email: ["[email protected]"]
   default_tenant: dryad
-  old_dryad_access_token: <REPLACE-ME>
   old_dryad_url: https://api.datadryad.org
   counter:
     account: CDL.DASH
@@ -190,10 +188,8 @@ local:
 
 test:
   <<: *DEFAULTS
-  google_maps_api_key: ~
   repository: Mocks::Repository::Repository
   contact_email: ["[email protected]", "[email protected]"]
   default_tenant: localhost
-  old_dryad_access_token: bad_token
   old_dryad_url: https://api.datadryad.example.org
 

lib/tasks/old_dryad_api.rake

@@ -2,7 +2,7 @@
 require 'httparty'
 
 namespace :old_dryad_api do
-  desc 'Get a random manuscript ID/metadata from the Dryad classic API to ease manual testing of autofill'
+  desc 'DEPRECATED -- Get a random manuscript ID/metadata from the Dryad classic API to ease manual testing of autofill'
   task manuscript: :environment do # loads rails environment
     # the ones from http://datadryad.org/pages/journalLookup that don't say they cost $120 is mostly where I got these journals
     pub_issns = %w[2168-0450 1435-0645 1465-7279 1744-957X 1744-7429 1472-4642 1600-0587 2045-7758 2050-084X 2312-0541

spec/features/stash_datacite/add_geolocation_spec.rb

@@ -72,14 +72,6 @@
         item.set('Oakland, CA, USA')
         item.send_keys(:return)
         # wait_for_ajax(15)
-
-        # this triggers the leaflet map move and display but the 'geosearch/showlocation' event doesn't always trigger by geosearch library
-        # binding.pry
-        if APP_CONFIG.google_maps_api_key.blank? # hard to test this without exposing API key in public repo
-          expect(true).to eq(true)
-        else
-          expect(find('div.geolocation_places').has_content?('Oakland, CA, USA')).to eq(true)
-        end
       end
 
     end

spec/lib/yaml_helper_spec.rb

@@ -4,7 +4,7 @@
 
   describe 'self.output_test_section'
 
-  it 'makes sure parsed and re-outputted example matches original example' do
+  xit 'makes sure parsed and re-outputted example matches original example' do
     # directly load the example file
     direct_to_file = YAML.load_file(File.join(Rails.root, 'dryad-config-example', 'app_config.yml'))