Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting

to the API

6 files changed, 28 insertions, 32 deletions

diff --git a/app/views/doorkeeper/authorizations/error.html.haml b/app/views/doorkeeper/authorizations/error.html.haml
deleted file mode 100644
index cb97ae170..000000000
--- a/app/views/doorkeeper/authorizations/error.html.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-.prompt= t('doorkeeper.authorizations.error.title')
-
-#error_explanation
-  = @pre_auth.error_response.body[:error_description]
diff --git a/app/views/doorkeeper/authorizations/new.html.haml b/app/views/doorkeeper/authorizations/new.html.haml
deleted file mode 100644
index 91d71cc01..000000000
--- a/app/views/doorkeeper/authorizations/new.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-.prompt= raw t('.prompt', client_name: "<strong class=\"prompt-highlight\">#{ @pre_auth.client.name }</strong>")
-
-/- if @pre_auth.scopes.count > 0
-/  .scope-permission-prompt
-/    %p= t('.able_to')
-
-/    %ul.scope-permissions
-/      - @pre_auth.scopes.each do |scope|
-/        %li= t scope, scope: [:doorkeeper, :scopes]
-
-.actions
-  = 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
-    = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
-
-  = 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
-    = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
diff --git a/app/views/doorkeeper/authorizations/show.html.haml b/app/views/doorkeeper/authorizations/show.html.haml
deleted file mode 100644
index 44638318b..000000000
--- a/app/views/doorkeeper/authorizations/show.html.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-.prompt= t('.title')
-%code.copypasteable= params[:code]
diff --git a/app/views/oauth/authorizations/error.html.haml b/app/views/oauth/authorizations/error.html.haml
new file mode 100644
index 000000000..ee72d9740
--- /dev/null
+++ b/app/views/oauth/authorizations/error.html.haml
@@ -0,0 +1,2 @@
+.flash-message#error_explanation
+  = @pre_auth.error_response.body[:error_description]
diff --git a/app/views/oauth/authorizations/new.html.haml b/app/views/oauth/authorizations/new.html.haml
new file mode 100644
index 000000000..ba5d426f5
--- /dev/null
+++ b/app/views/oauth/authorizations/new.html.haml
@@ -0,0 +1,25 @@
+.oauth-prompt
+  %h2
+    Application
+    %strong=@pre_auth.client.name
+    requests access to your account
+
+  %p
+    It will be able to
+    = @pre_auth.scopes.map { |scope| t(scope, scope: [:doorkeeper, :scopes]) }.map { |s| "<strong>#{s}</strong>"}.to_sentence.html_safe
+
+= form_tag oauth_authorization_path, method: :post, class: 'simple_form' 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
+  = button_tag t('doorkeeper.authorizations.buttons.authorize'), type: :submit
+
+= form_tag oauth_authorization_path, method: :delete, class: 'simple_form' 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
+  = button_tag t('doorkeeper.authorizations.buttons.deny'), type: :submit, class: 'negative'
diff --git a/app/views/oauth/authorizations/show.html.haml b/app/views/oauth/authorizations/show.html.haml
new file mode 100644
index 000000000..d1a3e1f81
--- /dev/null
+++ b/app/views/oauth/authorizations/show.html.haml
@@ -0,0 +1 @@
+%code= params[:code]