FEATURE: Add enabled setting, and some refactoring

Author: davidtaylorhq

config/locales/client.en.yml

@@ -0,0 +1,7 @@
+en:
+ js:
+ login:
+ oidc:
+ name: "OpenID Connect"
+ title: "with OpenID Connect"
+ message: "Authenticating with OpenID Connect"

config/locales/server.en.yml

@@ -1,5 +1,6 @@
 en:
  site_settings:
+ openid_connect_enabled: Enable OpenID Connect authentication. Customize user interface text <a href='%{base_path}/admin/customize/site_texts?q=js.login.oidc'>here</a>
  openid_connect_discovery_document: "OpenID Connect discovery document URL. Normally located at 'https://your.domain/.well-known/openid-configuration'"
  openid_connect_client_id: "OpenID Connect client ID"
  openid_connect_client_secret: "OpenID Connect client secret"

config/settings.yml

@@ -1,4 +1,6 @@
 plugins:
+ openid_connect_enabled:
+ default: false
  openid_connect_discovery_document:
  default: ""
  openid_connect_client_id:

plugin.rb

@@ -14,11 +14,8 @@ def match_by_email
 
  def after_authenticate(auth_token)
  # puts "after authenticate ", auth_token.to_json
-
  result = Auth::Result.new
 
- result.authenticator_name = "OpenID Connect"
-
  result.extra_data = {
  provider: auth_token[:provider],
  uid: auth_token[:uid],
@@ -27,10 +24,10 @@ def after_authenticate(auth_token)
  credentials: auth_token[:credentials]
  }
 
- data = auth_token[:info]
- result.email = email = data[:email]
- result.name = name = "#{data[:first_name]} #{data[:last_name]}"
- result.username = data[:nickname]
+ info = auth_token[:info]
+ result.email = email = info[:email]
+ result.name = name = "#{info[:first_name]} #{info[:last_name]}"
+ result.username = info[:nickname]
 
  association = UserAssociatedAccount.find_by(provider_name: auth_token[:provider], provider_uid: auth_token[:uid])
 
@@ -64,7 +61,7 @@ def name
  end
 
  def enabled?
- true
+ SiteSetting.openid_connect_enabled
  end
 
  def register_middleware(omniauth)
@@ -97,6 +94,5 @@ def register_middleware(omniauth)
  end
 end
 
-auth_provider title: 'with OpenID Connect',
- authenticator: OpenIDConnectAuthenticator.new(),
+auth_provider authenticator: OpenIDConnectAuthenticator.new(),
  full_screen_login: true