From 47ca093b4179ee0ba1935fb49d0cdfceb0fe57ba Mon Sep 17 00:00:00 2001
From: louispt1 <louisparkestalbot1@gmail.com>
Date: Mon, 11 Nov 2024 14:24:06 +0100
Subject: [PATCH] Saving changes before migrating computers

---
 app/controllers/application_controller.rb |  9 ---------
 config/settings.yml                       | 10 +++++-----
 lib/myetm/staff_applications.rb           |  5 +++--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2574b78..874c08a 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -94,14 +94,5 @@ def render_not_found(thing = nil)
     )
 
     true
-
-  # Returns the Faraday client which should be used to communicate with ETEngine. This contains the
-  # user authentication token if the user is logged in.
-  #   def engine_client
-    # if current_user
-    #   identity_session.access_token.http_client
-    # else
-    #   Identity.http_client
-    # end
   end
 end
diff --git a/config/settings.yml b/config/settings.yml
index 28317de..750f344 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -30,16 +30,16 @@ etsource_lazy_load_dataset: true
 # http://beta.et-model.com/pages/refresh_gqueries
 client_refresh_url:
 
-# TODO: Fix this config
+# TODO: Fix this to fetch from ENV
 etmodel:
-  uri: localhost:3001
+  uri: http://localhost:3001
 etengine:
-  uri: localhost:3000
+  uri: http://localhost:3000
 collections:
-  uri: localhost:3005
+  uri: http://localhost:3005
 myetm:
   iss: my-etm
-  uri: localhost:3002
+  uri: http://localhost:3002
 
 
 # set to true if the server won't have online access. this disables Sentry,
diff --git a/lib/myetm/staff_applications.rb b/lib/myetm/staff_applications.rb
index 24f3493..79927aa 100644
--- a/lib/myetm/staff_applications.rb
+++ b/lib/myetm/staff_applications.rb
@@ -32,7 +32,7 @@ def etengine
           run_command: 'bundle exec rails server -p %<port>s',
           config_path: 'config/settings.local.yml',
           config_content: <<~YAML,
-            api_url: %<myetm_url>s
+            idp_url: %<myetm_url>s
 
             identity:
               client_id: %<uid>s
@@ -54,7 +54,8 @@ def etmodel
           run_command: 'bundle exec rails server -p %<port>s',
           config_path: 'config/settings.local.yml',
           config_content: <<~YAML,
-            api_url: %<myetm_url>s
+            idp_url: %<myetm_url>s
+            ete_url: %<etengine_url>s
 
             identity:
               client_id: %<uid>s