Use new OIDC environment variables

Author: bqqbarbhg

app/controllers/application_controller.rb

@@ -50,8 +50,8 @@ def force_authenticate_and_redirect_back
       if current_user
         refresh_token = session["ll_oidc_refresh_token"]
         if refresh_token && !@reauthenticated
-          client = OAuth2::Client.new(ENV["LL_OIDC_CLIENT_ID"], ENV["LL_OIDC_CLIENT_SECRET"],
-                                      site: ENV["LL_OIDC_HOST"],
+          client = OAuth2::Client.new(ENV["LAYERS_OIDC_CLIENT_ID"], ENV["LAYERS_OIDC_CLIENT_SECRET"],
+                                      site: ENV["LAYERS_API_URI"],
                                       token_url: "/o/oauth2/token")
           token = client.get_token({
             client_id: client.id,

config/initializers/bearer_authentication.rb

@@ -37,8 +37,8 @@ def try_log_in(token)
   end
 
   def authenticate!
-    client = OAuth2::Client.new(ENV["LL_OIDC_CLIENT_ID"], ENV["LL_OIDC_CLIENT_SECRET"],
-                                site: ENV["LL_OIDC_HOST"],
+    client = OAuth2::Client.new(ENV["LAYERS_OIDC_CLIENT_ID"], ENV["LAYERS_OIDC_CLIENT_SECRET"],
+                                site: ENV["LAYERS_API_URI"],
                                 token_url: "/o/oauth2/token")
 
     token = OAuth2::AccessToken.new(client, bearer,

config/initializers/devise.rb

@@ -240,8 +240,8 @@
   # up on your models and hooks.
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
   if Rails.env.production?
-    config.omniauth :learning_layers_oidc, ENV['LL_OIDC_CLIENT_ID'],
-      ENV['LL_OIDC_CLIENT_SECRET'], scope: 'openid,email,profile,offline_access'
+    config.omniauth :learning_layers_oidc, ENV['LAYERS_OIDC_CLIENT_ID'],
+      ENV['LAYERS_OIDC_CLIENT_SECRET'], scope: 'openid,email,profile,offline_access'
   else
     config.omniauth :developer
   end

config/initializers/learning_layers_oidc_omniauth.rb

@@ -5,7 +5,7 @@ module Strategies
     class LearningLayersOidc < OmniAuth::Strategies::OAuth2
       option :name, "learning_layers_oidc"
       option :client_options,
-        site: ENV["LL_OIDC_HOST"],
+        site: ENV["LAYERS_API_URI"],
         authorize_url: "/o/oauth2/authorize",
         token_url: "/o/oauth2/token"