Merge branch 'main' into device-grant

obl-ong · Jan 28, 2024 · 9c2e629 · 9c2e629
2 parents c515c87 + 105b03e
commit 9c2e629
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/javascript/application.js b/app/javascript/application.js
@@ -1,3 +1,4 @@
 import "controllers"
 import "@hotwired/turbo-rails"
 import "selectlist"
+import("selectlist")
diff --git a/app/javascript/controllers/formselect_controller.js b/app/javascript/controllers/formselect_controller.js
@@ -1,4 +1,5 @@
 import { Controller } from "@hotwired/stimulus";
+import "selectlist";
 
 export default class extends Controller {
   static targets = [ "select" ]

diff --git a/app/views/doorkeeper/authorizations/new.html.erb b/app/views/doorkeeper/authorizations/new.html.erb
@@ -26,6 +26,7 @@
         <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %>
         <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %>
         <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %>
+        <%= hidden_field_tag :nonce, @pre_auth.nonce %>
         <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %>
         <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %>
         <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success btn-lg btn-block" %>
@@ -37,6 +38,7 @@
         <%= hidden_field_tag :response_type, @pre_auth.response_type, id: nil %>
         <%= hidden_field_tag :response_mode, @pre_auth.response_mode, id: nil %>
         <%= hidden_field_tag :scope, @pre_auth.scope, id: nil %>
+        <%= hidden_field_tag :nonce, @pre_auth.nonce %>
         <%= hidden_field_tag :code_challenge, @pre_auth.code_challenge, id: nil %>
         <%= hidden_field_tag :code_challenge_method, @pre_auth.code_challenge_method, id: nil %>
         <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "btn btn-danger btn-lg btn-block" %>
@@ -128,4 +130,4 @@
     background-color: var(--bg) !important;
     border: 2px solid var(--winter-sky);
   }
-</style>
+</style>
diff --git a/config/importmap.rb b/config/importmap.rb
@@ -7,4 +7,4 @@
 pin "@github/webauthn-json/browser-ponyfill", to: "https://ga.jspm.io/npm:@github/[email protected]/dist/esm/webauthn-json.browser-ponyfill.js"
 pin "url-safe-base64", to: "https://ga.jspm.io/npm:[email protected]/src/index.js"
 pin_all_from "app/javascript"
-pin "selectlist", to: "https://esm.sh/[email protected]"
+pin "selectlist", to: "https://esm.sh/[email protected]", preload: true