collavre_slack 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d470cccf0cf90daff6918a44ff263700803a3a51114003be481d51fc38431f9
-  data.tar.gz: 63c5cbebe3fd89218f494a41530e190d1ba85ca419e1baccc45914a40c6995aa
+  metadata.gz: 8700d4cf3be0ac6d384a5d4860da91cffb2216951c2689e480103d833100dac1
+  data.tar.gz: 050735120aa672d534ec4473aa83e7996e0b1e688d0581bccbd93a1a3d5a4eef
 SHA512:
-  metadata.gz: 982316ca1c8c573d38b8f5c95003da48503153067be902844c9462458df362b46d6c2cc9188134d20cec78426355058ded4a54d155e17e3e966eef16a7646ba5
-  data.tar.gz: 5252ff282030eba366c99c0dbc9c11bb356c824fd65b505d37d0234b51d15fb35be6b68de435713ecd5739573963f0fa5fa689eb09a8cf08113a2132aee476c9
+  metadata.gz: 301365a9d7c37b398a393ddf9aafc80a77352fbff14b006ee25deccf7f5b8dc04a64ff26922e850a009988c9dc9e8f8a2c56fd13aaae82f44942ef2298720b6f
+  data.tar.gz: 627a82d5443d629fd14080ade5af31b634d8bf3682803a0725bed22d1e1e22d0c7ea7d071f312c12a424527a419d04875824ff778d74a5dddebf95186d206177

data/app/javascript/collavre_slack.js

@@ -1,5 +1,6 @@
 import { filterChannels, reconcileSelection, buildChannelViewModels } from './slack_channel_list.js';
 import { csrfToken, showError, clearError, updateStepVisibility, openOAuthPopup, fetchWithCsrf, setupModalClose } from 'collavre/modules/integration_wizard';
+import { alertDialog, confirmDialog } from 'collavre/lib/utils/dialog';
 
 let slackIntegrationInitialized = false;
 
@@ -152,7 +153,7 @@ if (!slackIntegrationInitialized) {
         deleteBtn.textContent = modal.dataset.deleteButtonLabel || 'Remove';
         deleteBtn.style.cssText = 'padding:0.25em 0.5em;font-size:0.8em;';
         deleteBtn.addEventListener('click', function () {
-          performDeleteLink(link);
+          performDeleteLink(link, deleteBtn);
         });
 
         li.appendChild(channelInfo);
@@ -189,10 +190,9 @@ if (!slackIntegrationInitialized) {
       }
     }
 
-    function performDeleteLink(link) {
-      if (!confirm(modal.dataset.deleteConfirm)) return;
+    async function performDeleteLink(link, btn) {
+      if (!(await confirmDialog(modal.dataset.deleteConfirm, { danger: true }))) return;
 
-      const btn = event.target;
       btn.disabled = true;
       btn.textContent = '...';
       clearError(errorEl);
@@ -334,7 +334,7 @@ if (!slackIntegrationInitialized) {
     openBtn.addEventListener('click', function () {
       creativeId = this.dataset.creativeId;
       if (!creativeId) {
-        alert(modal.dataset.noCreative);
+        alertDialog(modal.dataset.noCreative);
         return;
       }
       modal.style.display = 'flex';

data/config/initializers/collavre_slack.rb

@@ -1,7 +1,27 @@
+# Register Slack OAuth keys with the IntegrationSettings registry so the admin
+# UI can surface them and `Collavre::IntegrationSettings::Resolver` can serve
+# values via the DB > ENV > default precedence. Wrapped in `to_prepare` so
+# definitions re-register on code reload in development.
+Rails.application.config.to_prepare do
+  if defined?(Collavre::IntegrationSettings::Registry)
+    Collavre::IntegrationSettings::Registry.instance.register(
+      :slack_client_id,      category: "slack", sensitive: false, requires_restart: true
+    )
+    Collavre::IntegrationSettings::Registry.instance.register(
+      :slack_client_secret,  category: "slack", sensitive: true,  requires_restart: true
+    )
+    Collavre::IntegrationSettings::Registry.instance.register(
+      :slack_signing_secret, category: "slack", sensitive: true,  requires_restart: true
+    )
+    Collavre::IntegrationSettings::Registry.instance.register(
+      :slack_redirect_uri,   category: "slack", sensitive: false, requires_restart: true
+    )
+  end
+end
+
+# Scopes still come from ENV (not registered as a managed integration setting
+# in Phase 1). OAuth credentials are now resolved lazily by Configuration via
+# the Resolver, so they are no longer assigned here.
 CollavreSlack.configure do |config|
-  config.client_id = ENV.fetch("SLACK_CLIENT_ID", config.client_id)
-  config.client_secret = ENV.fetch("SLACK_CLIENT_SECRET", config.client_secret)
-  config.signing_secret = ENV.fetch("SLACK_SIGNING_SECRET", config.signing_secret)
-  config.redirect_uri = ENV.fetch("SLACK_REDIRECT_URI", config.redirect_uri)
   config.scopes = ENV.fetch("SLACK_SCOPES", config.scopes)
 end

data/lib/collavre_slack/configuration.rb

@@ -1,13 +1,51 @@
 module CollavreSlack
+  # Slack engine configuration.
+  #
+  # OAuth credential getters (`client_id`, `client_secret`, `signing_secret`,
+  # `redirect_uri`) resolve through `Collavre::IntegrationSettings::Resolver`,
+  # which honors the DB > ENV > registered default precedence. Writers are
+  # preserved so tests and explicit `CollavreSlack.configure` overrides keep
+  # working: an explicitly-assigned value short-circuits the resolver.
+  #
+  # Fallback to plain `ENV[...]` when the resolver is not usable:
+  #   - `integration_settings` table missing (db:create, db:schema:load,
+  #     assets:precompile, fresh installs)
+  #   - DB connection not established
+  #   - `Collavre::IntegrationSettings` API not present in the installed
+  #     core `collavre` gem (e.g. `USE_COLLAVRE_GEM=true` pinned to a
+  #     version predating this feature)
   class Configuration
-    attr_accessor :client_id, :client_secret, :signing_secret, :redirect_uri, :scopes
+    RESOLVER_KEYS = {
+      client_id:      { registry: :slack_client_id,      env: "SLACK_CLIENT_ID" },
+      client_secret:  { registry: :slack_client_secret,  env: "SLACK_CLIENT_SECRET" },
+      signing_secret: { registry: :slack_signing_secret, env: "SLACK_SIGNING_SECRET" },
+      redirect_uri:   { registry: :slack_redirect_uri,   env: "SLACK_REDIRECT_URI" }
+    }.freeze
+
+    attr_writer :client_id, :client_secret, :signing_secret, :redirect_uri
+    attr_accessor :scopes
 
     def initialize
-      @client_id = ENV.fetch("SLACK_CLIENT_ID", "")
-      @client_secret = ENV.fetch("SLACK_CLIENT_SECRET", "")
-      @signing_secret = ENV.fetch("SLACK_SIGNING_SECRET", "")
-      @redirect_uri = ENV.fetch("SLACK_REDIRECT_URI", "")
       @scopes = ENV.fetch("SLACK_SCOPES", "chat:write,channels:read,channels:history,groups:read,im:read,mpim:read,users:read,users:read.email,reactions:read,reactions:write")
     end
+
+    RESOLVER_KEYS.each do |attr, meta|
+      define_method(attr) do
+        ivar = instance_variable_get(:"@#{attr}")
+        return ivar unless ivar.nil?
+
+        resolve_setting(meta[:registry], meta[:env])
+      end
+    end
+
+    private
+
+    def resolve_setting(registry_key, env_var)
+      return ENV[env_var] unless defined?(Collavre::IntegrationSettings::Resolver)
+
+      Collavre::IntegrationSettings::Resolver.get(registry_key)
+    rescue ActiveRecord::StatementInvalid, ActiveRecord::ConnectionNotEstablished
+      ENV[env_var]
+    end
   end
 end

data/lib/collavre_slack/version.rb

@@ -1,3 +1,3 @@
 module CollavreSlack
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_slack
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Collavre