diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-02-04 05:42:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-04 05:42:13 +0100 |
| commit | 26f21fd5a03b1c6407cd81c58481288d06958ad3 (patch) | |
| tree | ef7cf0e00f4bfddfff65d4c28d38fe082ec6de37 /app/views/auth | |
| parent | 9da81a16391edfcbda9c748dcd519fb3ebd765e5 (diff) | |
CAS + SAML authentication feature (#6425)
* Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales
Diffstat (limited to 'app/views/auth')
| -rw-r--r-- | app/views/auth/confirmations/finish_signup.html.haml | 14 | ||||
| -rw-r--r-- | app/views/auth/sessions/new.html.haml | 9 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/views/auth/confirmations/finish_signup.html.haml b/app/views/auth/confirmations/finish_signup.html.haml new file mode 100644 index 000000000..4b5161d6b --- /dev/null +++ b/app/views/auth/confirmations/finish_signup.html.haml @@ -0,0 +1,14 @@ +- content_for :page_title do + = t('auth.confirm_email') + += simple_form_for(current_user, as: 'user', url: finish_signup_path, html: { role: 'form'}) do |f| + - if @show_errors && current_user.errors.any? + #error_explanation + - current_user.errors.full_messages.each do |msg| + = msg + %br + + = f.input :email + + .actions + = f.submit t('auth.confirm_email'), class: 'button' diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml index 3edb0d2d4..1c3a0b6b4 100644 --- a/app/views/auth/sessions/new.html.haml +++ b/app/views/auth/sessions/new.html.haml @@ -14,4 +14,13 @@ .actions = f.button :button, t('auth.login'), type: :submit +- if devise_mapping.omniauthable? and resource_class.omniauth_providers.any? + .simple_form.alternative-login + %h4= t('auth.or_log_in_with') + + .actions + - resource_class.omniauth_providers.each do |provider| + = link_to omniauth_authorize_path(resource_name, provider), class: "button button-#{provider}" do + = t("auth.providers.#{provider}", default: provider.to_s.chomp("_oauth2").capitalize) + .form-footer= render 'auth/shared/links' |