FIX: user api key for webcal generation

app/controllers/discourse_events/api_keys_controller.rb

@@ -6,32 +6,26 @@ class DiscourseEvents::ApiKeysController < ApplicationController
 
   before_action :ensure_logged_in
 
-=begin
-  As soon as a new client_id is passed for the same API key, the key record
-  will be updated to contain the new client_id automatically.
-  See Auth::DefaultCurrentUserProvider#lookup_user_api_user_and_update_key
-
-  This means that rate limits could be exceeded in some cases.
-  TODO: Instead we should allow a unique key to be created for each client.
-=end
   def index
-    key =
-      UserApiKey.create! attributes.reverse_merge(
-                           scopes: [
-                             UserApiKeyScope.new(
-                               name: "#{APPLICATION_NAME}:#{DiscourseEvents::USER_API_KEY_SCOPE}",
-                             ),
-                           ],
-                           # client_id has a unique constraint
-                           client_id: SecureRandom.uuid,
-                         )
-
-    render json: [{ key: key.key, client_id: key.client_id }]
-  end
-
-  private
+    client = nil
+    key = nil
+    ActiveRecord::Base.transaction do
+      client = UserApiKeyClient.find_by(application_name: APPLICATION_NAME)
+      client =
+        UserApiKeyClient.create!(
+          application_name: APPLICATION_NAME,
+          client_id: SecureRandom.uuid,
+        ) if client.blank?
+      key =
+        UserApiKey.create!(
+          user_api_key_client_id: client.id,
+          user_id: current_user.id,
+          scopes: [
+            UserApiKeyScope.new(name: "#{APPLICATION_NAME}:#{DiscourseEvents::USER_API_KEY_SCOPE}"),
+          ],
+        )
+    end
 
-  def attributes
-    { application_name: APPLICATION_NAME, user_id: current_user.id, revoked_at: nil }
+    render json: [{ key: key.key, client_id: client.client_id }]
   end
 end

assets/javascripts/discourse/lib/date-utilities.js

@@ -371,11 +371,9 @@ function eventLabel(event, args = {}) {
     if (siteSettings.events_deadlines && event.deadline) {
       deadline = true;
       const countdownIconPending =
-        siteSettings.events_deadlines_countdown_icon_pending ||
-        "hourglass-half";
+        siteSettings.events_deadlines_countdown_icon_pending || "hourglass";
       const countdownIconpastDue =
-        siteSettings.events_deadlines_countdown_icon_passed_due ||
-        "hourglass-end";
+        siteSettings.events_deadlines_countdown_icon_passed_due || "hourglass";
       const countdownIcon = pastDue
         ? countdownIconpastDue
         : countdownIconPending;

config/settings.yml

@@ -83,10 +83,10 @@ plugins:
     default: false
     client: true
   events_deadlines_countdown_icon_pending:
-    default: "hourglass-half"
+    default: "hourglass"
     client: true
   events_deadlines_countdown_icon_passed_due:
-    default: "hourglass-end"
+    default: "hourglass"
     client: true
   events_verbose_auth_logs:
     default: false

plugin.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 # name: discourse-events
 # about: Allows you to manage events in Discourse
-# version: 0.9.4
+# version: 0.9.5
 # authors: Angus McLeod
 # contact_emails: angus@angus.blog
 # url: https://github.com/angusmcleod/discourse-events
@@ -43,8 +43,6 @@
 register_svg_icon "rss"
 register_svg_icon "fingerprint"
 register_svg_icon "floppy-disk"
-register_svg_icon "hourglass-half"
-register_svg_icon "hourglass-end"
 register_svg_icon "video"
 
 require_relative "lib/discourse_events_timezone_default_site_setting.rb"

spec/requests/discourse_events/api_keys_controller_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+describe DiscourseEvents::ApiKeysController do
+  fab!(:user) { Fabricate(:user, admin: true) }
+
+  before { sign_in(user) }
+
+  it "returns an api key" do
+    get "/discourse-events/api-keys.json"
+    expect(response.status).to eq(200)
+    expect(response.parsed_body["api_keys"].first["key"]).to be_present
+    expect(response.parsed_body["api_keys"].first["client_id"]).to be_present
+  end
+end