GRN2-107: Add office365 auth (#616)

* add office365 auth

* Delete conflicting file
This commit is contained in:
shawn-higgins1
2019-07-09 13:54:15 -04:00
committed by Jesus Federico
parent 40b05b1626
commit fc18976b6d
22 changed files with 53 additions and 43 deletions

View File

@ -1,5 +1,7 @@
# frozen_string_literal: true
require 'office365'
# List of supported Omniauth providers.
Rails.application.config.providers = []
@ -10,19 +12,14 @@ Rails.application.config.omniauth_ldap = ENV['LDAP_SERVER'].present? && ENV['LDA
ENV['LDAP_PASSWORD'].present?
Rails.application.config.omniauth_twitter = ENV['TWITTER_ID'].present? && ENV['TWITTER_SECRET'].present?
Rails.application.config.omniauth_google = ENV['GOOGLE_OAUTH2_ID'].present? && ENV['GOOGLE_OAUTH2_SECRET'].present?
Rails.application.config.omniauth_microsoft_office365 = ENV['OFFICE365_KEY'].present? &&
ENV['OFFICE365_SECRET'].present?
Rails.application.config.omniauth_office365 = ENV['OFFICE365_KEY'].present? &&
ENV['OFFICE365_SECRET'].present?
# If LDAP is enabled, override and disable allow_user_signup.
Rails.application.config.allow_user_signup = false if Rails.application.config.omniauth_ldap
SETUP_PROC = lambda do |env|
provider = env['omniauth.strategy'].options[:name]
if provider == "google"
SessionsController.helpers.google_omniauth_hd env, ENV['GOOGLE_OAUTH2_HD']
else
SessionsController.helpers.omniauth_options env
end
SessionsController.helpers.omniauth_options env
end
# Setup the Omniauth middleware.
@ -59,10 +56,11 @@ Rails.application.config.middleware.use OmniAuth::Builder do
name: 'google',
setup: SETUP_PROC
end
if Rails.configuration.omniauth_microsoft_office365
Rails.application.config.providers << :microsoft_office365
if Rails.configuration.omniauth_office365
Rails.application.config.providers << :office365
provider :microsoft_office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET']
provider :office365, ENV['OFFICE365_KEY'], ENV['OFFICE365_SECRET'],
setup: SETUP_PROC
end
end
end

View File

@ -155,7 +155,7 @@ ar:
password_different_notice: تأكيد كلمة المرور غير متطابق.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recording:
email: " البريد الإلكتروني للتسجيل"

View File

@ -284,7 +284,7 @@ de_DE:
password_different_notice: Passwortbestätigung ist nicht zutreffend.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -300,7 +300,7 @@ en:
password_different_notice: Password Confirmation does not match.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -284,7 +284,7 @@ es:
password_different_notice: La confirmación de password no coincide
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -284,7 +284,7 @@ es_MX:
password_different_notice: La confirmación de password no coincide
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -283,7 +283,7 @@ fa_IR:
password_different_notice: تاییدیه رمز عبور با رمز ارائه شده مطابقت ندارد.
provider:
google: گوگل
microsoft_office365: افیس 365
office365: افیس 365
twitter: توییتر
recaptcha:
errors:

View File

@ -155,7 +155,7 @@ fr:
password_different_notice: La confirmation du mot de passe ne correspond pas.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recording:
email: Envoyer l'enregistrement par Email

View File

@ -155,7 +155,7 @@ hi_IN:
password_different_notice: पासवर्ड की पुष्टि मेल नहीं खाती।
provider:
google: गूगल
microsoft_office365: ऑफिस 365
office365: ऑफिस 365
twitter: ट्विटर
recording:
email: ईमेल रिकॉर्डिंग

View File

@ -283,7 +283,7 @@ hu_HU:
password_different_notice: A két új jelszó eltér egymástól.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -284,7 +284,7 @@ it:
password_different_notice: La conferma della password non coincide.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -155,7 +155,7 @@ pt:
password_different_notice: A Confirmação de Senha não corresponde a Senha inserida acima.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recording:
email: Enviar Gravação por E-mail

View File

@ -155,7 +155,7 @@ pt_BR:
password_different_notice: A confirmação de senha não confere.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recording:
email: Enviar link da gravação por e-mail

View File

@ -131,7 +131,7 @@ ru_RU:
password_different_notice: Подтверждение пароля не совпадает.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recording:
email: Отправить ссылку на запись

View File

@ -219,7 +219,7 @@ vi_VN:
password_different_notice: Xác nhận mật khẩu không khớp.
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors:

View File

@ -283,7 +283,7 @@ zh_CN:
password_different_notice: 两次新密码不一致。
provider:
google: Google
microsoft_office365: Office 365
office365: Office 365
twitter: Twitter
recaptcha:
errors: