card-mod-api_key 0.18.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3d04c154b09f2b34aa5e7a2e6dc2c48e84a0d6d92e450ac403134d94c006301
-  data.tar.gz: d03b3ecd584543aa03cc0cce4785da0e35e3a25057ef9c236fc79511075ed3e0
+  metadata.gz: 15db9a982ab055593f8e9dac2599b6857c762b0772b7648020f540223376ebfe
+  data.tar.gz: 30f2f9638803d2d8d0883e6ddcff220ab16232024738dd6c5a4bb5ccf28f2b20
 SHA512:
-  metadata.gz: a7c81c58ed38d2ef7ff63e7e8333837c98c481430e4fe4400a8b42d5e3f5469ddc9bcb3bf58508ba276a407a058de5c106b494678551de77d2da130dee25ab8d
-  data.tar.gz: 4caa281191c4954fe041e0e2fa7c84d3ce9c11642c475bd699bce1ab59aa7d0724f4d3948c09d4b121fcc351d64f4578c98161064b4c79af11ed514953a9bfc7
+  metadata.gz: 9b5cfd45ee243631f68cf623ea25c1348e2a504c4e1531cde918c41081b999f601420aad17313fa2d4dd9bd46994c987e82b04acc1c3ca20f45a41bd68192fdf
+  data.tar.gz: d4a21aa95d8568bf7e4682716e83e1d184cf14b2bde89d665e17aae9026752bbbc03bd8feb0485b74b7374abe2c9e8038a9596c5fcca5ede0cd2274a29bdc9e5

data/assets/style/api_key_style.scss

@@ -1,8 +1,4 @@
-.api-key-core {
-  display: flex;
-  width: 100%;
-  justify-content: space-between;
-  padding: 1em;
+.api-key-top {
   .current-api-key {
     width: 50%;
     input {

data/config/locales/de.yml

@@ -8,4 +8,3 @@ de:
   api_key_generating: "API-Schlüssel wird erzeugt"
   api_key_taken: "API-Schlüssel vergeben"
   api_key_get_jwt_token: "ein JWT-Token abrufen"
-  api_key_no_key: "Kein Schlüssel."

data/config/locales/en.yml

@@ -8,4 +8,3 @@ en:
   api_key_generating: "Generating API Key"
   api_key_taken: "API Key taken"
   api_key_get_jwt_token: "get a JWT token"
-  api_key_no_key: "No key."

data/lib/card/auth/api_key.rb

@@ -31,8 +31,12 @@ class Card
         find_account_by :api_key, api_key.strip
       end
 
-      def api_act?
-        Env.controller&.try(:authenticators)&.values&.compact.present?
+      def api_keys
+        Env.controller&.try(:authenticators)&.values&.compact
+      end
+
+      def api_request?
+        api_keys.present?
       end
     end
   end

data/set/right/api_key/core.haml

@@ -1,11 +1,6 @@
-.api-key-core
-  .current-api-key
+.api-key-core.p-1
+  .api-key-top.d-flex.my-2.py-3.border-bottom.justify-content-between.w-100
     - if card.content.present?
-      %label{ for: :current_api_key }
-        = t :api_key_label
-
-      = text_field_tag :current_api_key, card.content, readonly: true
-    - else
-      %em= t('api_key_no_key')
-  .api-key-generate-button
-    = render_generate_button
+      = render core_top_view
+  .api-key-buttons.d-flex.my-2.py-3.justify-content-between.w-100
+    = render_buttons

data/set/right/api_key/current.haml

@@ -0,0 +1,5 @@
+.current-api-key.nodblclick
+  %label{ for: :current_api_key }
+    = t :api_key_label
+
+  = text_field_tag :current_api_key, card.content, readonly: true

data/set/right/api_key.rb

@@ -68,9 +68,9 @@ end
 
 format :html do
   view :core, unknown: true, template: :haml
-  view(:content, unknown: true) { super() }
+  view :current, unknown: true, template: :haml
 
-  %i[titled titled_content].each do |viewname|
+  %i[titled titled_content content].each do |viewname|
     view(viewname, unknown: true) { super() }
   end
 
@@ -78,17 +78,38 @@ format :html do
     link_to t(:api_key_get_jwt_token), path: { format: :json, view: :token }
   end
 
+  view :buttons, perms: :update, unknown: true do
+    render_generate_button
+  end
+
   view :generate_button, perms: :update, unknown: true do
-    text = card.content.present? ? t(:api_key_regenerate) : t(:api_key_generate)
     card_form :update do
       [
-        hidden_tags(card: { trigger: :generate_api_key }),
-        submit_button(text: text, disable_with: t(:api_key_generating))
+        hidden_tags(generate_button_hidden_tags),
+        submit_button(text: generate_button_text,
+                      situation: generate_button_situation,
+                      disable_with: t(:api_key_generating))
       ]
     end
   end
 
+  def generate_button_hidden_tags
+    { card: { trigger: :generate_api_key } }
+  end
+
+  def generate_button_text
+    card.content.present? ? t(:api_key_regenerate) : t(:api_key_generate)
+  end
+
+  def generate_button_situation
+    :primary
+  end
+
   def input_type
     :text_field
   end
+
+  def core_top_view
+    :current
+  end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-api_key
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Gerry Gleason
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +17,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 description: ''
 email:
 - info@decko.org
@@ -59,6 +58,7 @@ files:
 - set/right/account.rb
 - set/right/api_key.rb
 - set/right/api_key/core.haml
+- set/right/api_key/current.haml
 homepage: https://decko.org
 licenses:
 - GPL-3.0-or-later
@@ -70,7 +70,6 @@ metadata:
   documentation_url: http://docs.decko.org/
   card-mod: api_key
   card-mod-group: gem-defaults
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,15 +77,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: API Keys and JWT Tokens for Decko
 test_files: []