rodauth-oauth 0.7.4 → 0.9.1

data/lib/generators/rodauth/oauth/templates/app/views/rodauth/oauth_applications.html.erb

@@ -1,7 +1,7 @@
 <% oauth_applications_ds = rodauth.scope.instance_variable_get(:@oauth_applications) %>
 <% apps_count = oauth_applications_ds.count %>
 <div class="btn-group" role="group" aria-label="Buttons">
-  <%= link_to "New Oauth Application",  "#{rodauth.oauth_applications_path}/new", class: "btn btn-secondary" %>
+  <%= link_to rodauth.new_oauth_application_page_title, "#{rodauth.oauth_applications_path}/new", class: "btn btn-secondary" %>
 </div>
 <% if apps_count.zero? %>
   <p>No oauth applications yet!</p>
@@ -9,9 +9,9 @@
   <table class="table">
     <thead>
       <tr>
-        <th scope="col">Client ID (<%= apps_count %>)</th>
-        <th scope="col">Name</th>
-        <th scope="col">Homepage</th>
+        <th scope="col"><%= rodauth.oauth_application_client_id_label %> (<%= apps_count %>)</th>
+        <th scope="col"><%= rodauth.oauth_application_name_label %></th>
+        <th scope="col"><%= rodauth.oauth_application_homepage_url_label %></th>
         <th scope="col"></th>
       </tr>
     </thead>
@@ -21,9 +21,10 @@
           <td><%= application[rodauth.oauth_applications_client_id_column] %></td>
           <td><%= application[rodauth.oauth_applications_name_column] %></td>
           <td><%= application[rodauth.oauth_applications_homepage_url_column] %></td>
-          <td><%= link_to "Show",  rodauth.oauth_application_path(application[rodauth.oauth_applications_id_column]) %></td>
+          <td><%= link_to "Show", rodauth.oauth_application_path(application[rodauth.oauth_applications_id_column]) %></td>
         </tr>
       <% end %>
     </tbody>
   </table>
+  <%= rodauth.oauth_management_pagination_links(oauth_applications_ds) %>
 <% end %>

data/lib/generators/rodauth/oauth/templates/app/views/rodauth/oauth_tokens.html.erb

@@ -1,38 +1,35 @@
-<% oauth_tokens_ds = rodauth.scope.instance_variable_get(:@oauth_tokens) %>
-<% tokens_count = oauth_tokens_ds.count %>
+<% oauth_tokens = rodauth.scope.instance_variable_get(:@oauth_tokens) %>
+<% tokens_count = oauth_tokens.count %>
 <% if tokens_count.zero? %>
   <p>No oauth tokens yet!</p>
 <% else %>
   <table class="table">
     <thead>
       <tr>
-        <th scope="col">Token</th>
-        <th scope="col">Refresh Token</th>
-        <th scope="col">Expires in</th>
-        <th scope="col">Revoked at</th>
-        <th scope="col">Scopes</th>
+        <th scope="col"><=% rodauth.oauth_applications_name_label %></th>
+        <th scope="col"><=% rodauth.oauth_tokens_token_label %></th>
+        <th scope="col"><=% rodauth.oauth_tokens_refresh_token_label %></th>
+        <th scope="col"><=% rodauth.oauth_tokens_expires_in_label %></th>
+        <th scope="col"><=% rodauth.oauth_tokens_scopes_label %></th>
         <th scope="col"><span class="badge badge-pill badge-dark"><%= tokens_count %></span>
       </tr>
     </thead>
     <tbody>
-      <% oauth_tokens_ds.each do |application| %>
+      <% oauth_tokens.each do |oauth_token| %>
         <tr>
+          <td><%= oauth_token[rodauth.oauth_applications_name_column] %></td>
           <td><code class="token"><%= oauth_token[rodauth.oauth_tokens_token_column] %></code></td>
           <td><code class="token"><%= oauth_token[rodauth.oauth_tokens_refresh_token_column] %></code></td>
           <td><%= oauth_token[rodauth.oauth_tokens_expires_in_column] %></td>
-          <td><%= oauth_token[rodauth.oauth_tokens_revoked_at_column] %></td>
           <td><%= oauth_token[rodauth.oauth_tokens_scopes_column] %></td>
           <td>
-            <% if !oauth_token[rodauth.oauth_tokens_revoked_at_column] %>
-              <%= form_tag rodauth.revoke_path, method: :post do %>
-                <%= hidden_field_tag :token_type_hint, "access_token" %>
-                <%= hidden_field_tag :token, oauth_token[rodauth.oauth_tokens_token_column] %>
-                <%= submit_tag "Revoke", class: "btn btn-danger" %>
-              <% end %>
+            <%= form_tag rodauth.oauth_token_path(oauth_token[rodauth.oauth_tokens_id_column]), method: :post do %>
+              <%= submit_tag rodauth.oauth_token_revoke_button, class: "btn btn-danger" %>
             <% end %>
           </td>
         </tr>
       <% end %>
     </tbody>
   </table>
+  <%= rodauth.oauth_management_pagination_links(oauth_tokens) %>
 <% end %>

data/lib/generators/rodauth/oauth/templates/db/migrate/create_rodauth_oauth.rb

@@ -11,6 +11,23 @@ class CreateRodauthOauth < ActiveRecord::Migration<%= migration_version %>
       t.string :client_secret, null: false, index: { unique: true }
       t.string :scopes, null: false
       t.datetime :created_at, null: false, default: -> { "CURRENT_TIMESTAMP" }
+      # extra params
+      # t.string :token_endpoint_auth_method, null: true
+      # t.string :grant_types, null: true
+      # t.string :response_types, null: true
+      # t.string :client_uri, null: true
+      # t.string :logo_uri, null: true
+      # t.string :tos_uri, null: true
+      # t.string :policy_uri, null: true
+      # t.string :jwks_uri, null: true
+      # t.string :jwks, null: true
+      # t.string :contacts, null: true
+      # t.string :software_id, null: true
+      # t.string :software_version, null: true
+      # JWT/OIDC per application signing verification
+      # t.text :jwt_public_key, null: true
+      # RP-initiated logout
+      # t.string :post_logout_redirect_uri, null: false
     end
 
     create_table :oauth_grants do |t|
@@ -19,6 +36,7 @@ class CreateRodauthOauth < ActiveRecord::Migration<%= migration_version %>
       t.integer :oauth_application_id
       t.foreign_key :oauth_applications, column: :oauth_application_id
       t.string :code, null: false
+      t.index(%i[oauth_application_id code], unique: true)
       t.datetime :expires_in, null: false
       t.string :redirect_uri
       t.datetime :revoked_at
@@ -31,7 +49,9 @@ class CreateRodauthOauth < ActiveRecord::Migration<%= migration_version %>
       # t.string :code_challenge_method
       # uncomment to use OIDC nonce
       # t.string :nonce
-      t.index(%i[oauth_application_id code], unique: true)
+      # device code grant
+      # t.string :user_code, null: true, unique: true
+      # t.datetime :last_polled_at, null: true
     end
 
     create_table :oauth_tokens do |t|