- <%= raw t('.prompt', client_name: content_tag(:strong, class: 'text-info') { @pre_auth.client.name }) %> -
+
+
+
+
- <% if @pre_auth.scopes.count > 0 %>
-
-
+
-
- <% end %>
-
- <%= t('.able_to') %>:
++ <%= t('doorkeeper.authorizations.new.title', client_name: @pre_auth.client.name ) %> +
++
+
+ + <%= @pre_auth.client.name %> + <%= t('doorkeeper.authorizations.new.scopes_title') %> +
+-
+
- <%= t('doorkeeper.authorizations.new.scope_1') %> +
- <%= t('doorkeeper.authorizations.new.scope_2') %> +
+ <%= t('doorkeeper.authorizations.new.terms', client_name: @pre_auth.client.name) %> +
+-
-
- <% @pre_auth.scopes.each do |scope| %>
-
- <%= t scope, scope: [:doorkeeper, :scopes] %> - <% end %> -
- <%= form_tag oauth_authorization_path, method: :post do %>
- <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
- <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
- <%= hidden_field_tag :state, @pre_auth.state %>
- <%= hidden_field_tag :response_type, @pre_auth.response_type %>
- <%= hidden_field_tag :scope, @pre_auth.scope %>
- <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success btn-lg btn-block" %>
- <% end %>
+
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bbcfa758..d9f1dd724 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -52,6 +52,18 @@ en:
email_already_taken: "SciNote account with email %{email} alreday exists"
failed_to_save: "Failed to create new user"
+ doorkeeper:
+ authorizations:
+ buttons:
+ authorize: "Authorize"
+ new:
+ head_title: "OAuth authorization"
+ title: "Authorize %{client_name} to connect to your SciNote account"
+ scopes_title: " would like to:"
+ scope_1: "Use basic profile information associated with your SciNote account"
+ scope_2: "Create, read, update, and delete data within SciNote on behalf of your user account using SciNote API."
+ terms: "%{client_name} terms may apply."
+
activerecord:
errors:
models:
+
<%= form_tag oauth_authorization_path, method: :delete do %>
<%= hidden_field_tag :client_id, @pre_auth.client.uid %>
<%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
<%= hidden_field_tag :state, @pre_auth.state %>
<%= hidden_field_tag :response_type, @pre_auth.response_type %>
<%= hidden_field_tag :scope, @pre_auth.scope %>
- <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "btn btn-danger btn-lg btn-block" %>
+ <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %>
+ <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %>
+ <%= submit_tag t('general.cancel'), class: "btn btn-default" %>
<% end %>
-
+
+ <%= form_tag oauth_authorization_path, method: :post do %>
+ <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
+ <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
+ <%= hidden_field_tag :state, @pre_auth.state %>
+ <%= hidden_field_tag :response_type, @pre_auth.response_type %>
+ <%= hidden_field_tag :scope, @pre_auth.scope %>
+ <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge %>
+ <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method %>
+ <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success" %>
+ <% end %>
+
+