Merge branch 'develop' into 'remove-avatar-header'

[akkoma] / lib / pleroma / web / templates / o_auth / o_auth / show.html.eex

diff --git a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
index 8b69c30335cba0b8e88ea522587c8c8383e9937c..b17142ff8ffd066c8f6579d87de3616066fe1b3e 100644 (file)
--- a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
@@ -18,7 +18,6 @@
   <%= hidden_input f, :name, value: @params["name"] %>
   <%= hidden_input f, :password, value: @params["password"] %>
   <br>
-
 <% else %>
   <div class="input">
     <%= label f, :name, "Username" %>
@@ -29,31 +28,16 @@
     <%= password_input f, :password %>
   </div>
   <%= submit "Log In" %>
-  <div class="scopes-input">
-    <%= label f, :scope, "The following permissions will be granted" %>
-    <div class="scopes">
-      <%= for scope <- @available_scopes do %>
-        <%# Note: using hidden input with `unchecked_value` in order to distinguish user's empty selection from `scope` param being omitted %>
-        <%= if scope in @scopes do %>
-          <div class="scope">
-            <%= checkbox f, :"scope_#{scope}", value: scope in @scopes && scope, checked_value: scope, unchecked_value: "", name: "authorization[scope][]" %>
-            <%= label f, :"scope_#{scope}", String.capitalize(scope) %>
-            <%= if scope in @scopes && scope do %>
-              <%= String.capitalize(scope) %>
-            <% end %>
-          </div>
-        <% else %>
-          <%= checkbox f, :"scope_#{scope}", value: scope in @scopes && scope, checked_value: scope, unchecked_value: "", name: "authorization[scope][]" %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
+  <%= render @view_module, "_scopes.html", Map.merge(assigns, %{form: f}) %>
 <% end %>
 
-<%= render @view_module, "_scopes.html", Map.merge(assigns, %{form: f}) %>
-
 <%= hidden_input f, :client_id, value: @client_id %>
 <%= hidden_input f, :response_type, value: @response_type %>
 <%= hidden_input f, :redirect_uri, value: @redirect_uri %>
 <%= hidden_input f, :state, value: @state %>
 <% end %>
+
+<%= if Pleroma.Config.oauth_consumer_enabled?() do %>
+  <%= render @view_module, Pleroma.Web.Auth.Authenticator.oauth_consumer_template(), assigns %>
+<% end %>
+