collavre_github 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d2aaf8fc69f915117cc6d8e60795cff69e4e89d356c32a5208d66d887916c4
-  data.tar.gz: 2ad91c75b03292b131b9a2d101f81e5352ccfe97c33247cddca9305087fe9f2a
+  metadata.gz: 198ebcc760561f4ac05a67a9218db8e327bc4655cb89d412f10a5e674e2a18ed
+  data.tar.gz: 2ef18344c5388d0573baf3164c71ff99c891380e1c79b65284d69c8df3722221
 SHA512:
-  metadata.gz: 23fcf2ea9ce240dfc2733a386effa67edab5c707ddffadf8470be025b8f31d78f5c60e90c3db3e42088f7030bcaa6735995b304e692a0c56eac56b28e4de8bb2
-  data.tar.gz: dcbe67b5f301ee175d10c50b3a095965d663d52c8ad502b7aa89cd2ef9b11171a5ed4f8bc4b68cede2758aadd05b2dd2e1394bf487578d29a3bdb71fad5e159a
+  metadata.gz: ae9f937c945668c02e65e7befc7b9ada33990db0723cb32497a1526bdd601b812575408c398d5e6e34c3afe48b5a7b0d729a5ab9e63a5530f18d5dffc53f6097
+  data.tar.gz: 7486890574e6f60b3644885f0dc8f2de2b406725985df31547745b6130fbc3d17961500f9a2245b074342744c3d5d00632e9c2430fbd3b0987e30c276a3a3367

data/app/controllers/collavre_github/auth_controller.rb

@@ -21,7 +21,38 @@ module CollavreGithub
       account.avatar_url = auth.info.image
       account.save!
 
-      redirect_to collavre.creatives_path, notice: I18n.t("collavre_github.auth.connected")
+      creative_id = session.delete(:github_creative_id)
+      if creative_id.present?
+        redirect_to setup_auth_path(creative_id: creative_id)
+      else
+        redirect_to collavre.creatives_path, notice: I18n.t("collavre_github.auth.connected")
+      end
+    end
+
+    def setup
+      @creative_id = params[:creative_id]
+      unless @creative_id.present?
+        render plain: I18n.t("collavre_github.integration.missing_creative"), status: :bad_request
+        return
+      end
+
+      @creative = Collavre::Creative.find_by(id: @creative_id)
+      unless @creative
+        render plain: I18n.t("collavre_github.integration.missing_creative"), status: :not_found
+        return
+      end
+
+      unless @creative.has_permission?(Current.user, :admin)
+        render plain: I18n.t("collavre_github.errors.forbidden"), status: :forbidden
+        return
+      end
+
+      render layout: false
+    end
+
+    def store_creative
+      session[:github_creative_id] = params[:creative_id]
+      head :ok
     end
   end
 end

data/app/controllers/collavre_github/webhooks_controller.rb

@@ -28,30 +28,12 @@ module CollavreGithub
 
       content = format_github_event(event, payload)
 
-      comment = creative.comments.create!(
+      creative.comments.create!(
         user: nil,
         content: content,
         private: false
       )
-
-      # Dispatch event for AI Agent routing
-      Collavre::SystemEvents::Dispatcher.dispatch("comment_created", {
-        comment: {
-          id: comment.id,
-          content: comment.content,
-          user_id: nil
-        },
-        creative: {
-          id: creative.id,
-          description: creative.description
-        },
-        topic: {
-          id: comment.topic_id
-        },
-        chat: {
-          content: comment.content
-        }
-      })
+      # Dispatch handled by Comment#after_create_commit (skipped for system messages with user: nil)
     end
 
     def format_github_event(event, payload)

data/app/services/collavre_github/client.rb

@@ -1,7 +1,12 @@
 module CollavreGithub
   class Client
+    MOCK_SERVER_DEFAULT = "http://localhost:4567"
+
     def initialize(account)
-      @client = Octokit::Client.new(access_token: account.token)
+      options = { access_token: account.token }
+      api_endpoint = resolve_api_endpoint
+      options[:api_endpoint] = api_endpoint if api_endpoint.present?
+      @client = Octokit::Client.new(options)
       @client.auto_paginate = true
     end
 
@@ -106,5 +111,15 @@ module CollavreGithub
     private
 
     attr_reader :client
+
+    # Use GITHUB_API_ENDPOINT env var if set, otherwise fall back to mock server
+    # in development when no real GitHub credentials are configured.
+    def resolve_api_endpoint
+      return ENV["GITHUB_API_ENDPOINT"] if ENV["GITHUB_API_ENDPOINT"].present?
+
+      if Rails.env.development? && ENV["GITHUB_CLIENT_ID"].blank?
+        MOCK_SERVER_DEFAULT
+      end
+    end
   end
 end

data/app/views/collavre_github/auth/setup.html.erb

@@ -0,0 +1,389 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="csrf-token" content="<%= form_authenticity_token %>">
+  <title><%= t('collavre_github.integration.title') %></title>
+  <style>
+    * { box-sizing: border-box; margin: 0; padding: 0; }
+    body {
+      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+      background: #f5f5f5;
+      color: #333;
+      padding: 2em;
+      line-height: 1.5;
+    }
+    .wizard-container {
+      max-width: 520px;
+      margin: 0 auto;
+      background: #fff;
+      border-radius: 12px;
+      box-shadow: 0 2px 12px rgba(0,0,0,0.1);
+      padding: 2em;
+    }
+    h2 { margin-bottom: 0.5em; font-size: 1.3em; }
+    .step { display: none; }
+    .step.active { display: block; }
+    .step-subtext { color: #666; margin-bottom: 1em; font-size: 0.95em; }
+    .list-box {
+      max-height: 280px;
+      overflow-y: auto;
+      border: 1px solid #ddd;
+      border-radius: 8px;
+      padding: 0.5em;
+      margin-bottom: 1em;
+    }
+    .list-item {
+      display: flex;
+      align-items: center;
+      gap: 0.5em;
+      padding: 0.5em 0.4em;
+      cursor: pointer;
+      border-radius: 4px;
+    }
+    .list-item:hover { background: #f0f0f0; }
+    .list-item input { flex-shrink: 0; }
+    .btn {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0.6em 1.2em;
+      border-radius: 6px;
+      border: 1px solid #ccc;
+      background: #fff;
+      cursor: pointer;
+      font-size: 0.95em;
+      transition: background 0.15s;
+    }
+    .btn:hover { background: #f0f0f0; }
+    .btn-primary { background: #2563eb; color: #fff; border-color: #2563eb; }
+    .btn-primary:hover { background: #1d4ed8; }
+    .btn-primary:disabled { background: #93c5fd; cursor: not-allowed; }
+    .footer { display: flex; justify-content: space-between; margin-top: 1.5em; }
+    .footer-right { display: flex; gap: 0.5em; margin-left: auto; }
+    .error-msg { color: #dc2626; font-weight: 600; margin: 0.5em 0; display: none; }
+    .success-msg { color: #16a34a; font-weight: 600; margin: 0.5em 0; text-align: center; }
+    .loading { text-align: center; padding: 2em; color: #999; }
+    .summary-list { padding-left: 1.2em; }
+    .summary-list li { margin-bottom: 0.3em; }
+    .webhook-detail { margin-top: 0.3em; font-size: 0.85em; }
+    .webhook-detail code { background: #f1f5f9; padding: 0.2em 0.4em; border-radius: 3px; word-break: break-all; }
+    .close-btn { margin-top: 1em; width: 100%; }
+  </style>
+</head>
+<body>
+  <div class="wizard-container" id="wizard"
+       data-creative-id="<%= @creative_id %>"
+       data-success-message="<%= t('collavre_github.integration.saved') %>"
+       data-webhook-url-label="<%= t('collavre_github.integration.webhook_url_label') %>"
+       data-webhook-secret-label="<%= t('collavre_github.integration.webhook_secret_label') %>"
+       data-no-orgs="<%= t('collavre_github.setup.no_orgs') %>"
+       data-no-repos="<%= t('collavre_github.setup.no_repos') %>"
+       data-load-orgs-error="<%= t('collavre_github.setup.load_orgs_error') %>"
+       data-load-repos-error="<%= t('collavre_github.setup.load_repos_error') %>"
+       data-save-error="<%= t('collavre_github.setup.save_error') %>">
+    <h2><%= t('collavre_github.integration.title') %></h2>
+
+    <!-- Step 1: Organization -->
+    <div class="step active" id="step-organization">
+      <p class="step-subtext"><%= t('collavre_github.integration.choose_org') %></p>
+      <div id="org-list" class="list-box">
+        <div class="loading"><%= t('collavre_github.setup.loading', default: 'Loading...') %></div>
+      </div>
+    </div>
+
+    <!-- Step 2: Repositories -->
+    <div class="step" id="step-repositories">
+      <p class="step-subtext"><%= t('collavre_github.integration.choose_repo') %></p>
+      <div id="repo-list" class="list-box">
+        <div class="loading"><%= t('collavre_github.setup.loading', default: 'Loading...') %></div>
+      </div>
+    </div>
+
+    <!-- Step 3: Summary -->
+    <div class="step" id="step-summary">
+      <p class="step-subtext"><%= t('collavre_github.integration.summary') %></p>
+      <p id="webhook-instructions" class="step-subtext" style="display:none;"><%= t('collavre_github.integration.webhook_instructions') %></p>
+      <ul id="summary-repos" class="summary-list"></ul>
+      <p id="summary-empty" style="display:none;color:#999;"><%= t('collavre_github.integration.summary_empty') %></p>
+    </div>
+
+    <!-- Step 4: Done -->
+    <div class="step" id="step-done">
+      <p class="success-msg"><%= t('collavre_github.integration.saved') %></p>
+      <button type="button" id="close-btn" class="btn btn-primary close-btn"><%= t('collavre_github.setup.close', default: 'Close') %></button>
+    </div>
+
+    <div id="wizard-error" class="error-msg"></div>
+
+    <div class="footer" id="wizard-footer">
+      <button type="button" id="prev-btn" class="btn" style="display:none;"><%= t('app.previous', default: 'Previous') %></button>
+      <div class="footer-right">
+        <button type="button" id="next-btn" class="btn btn-primary" disabled><%= t('app.next', default: 'Next') %></button>
+        <button type="button" id="finish-btn" class="btn btn-primary" style="display:none;"><%= t('app.finish', default: 'Finish') %></button>
+      </div>
+    </div>
+  </div>
+
+  <script>
+    (function() {
+      var wizard = document.getElementById('wizard');
+      var creativeId = wizard.dataset.creativeId;
+      var successMessage = wizard.dataset.successMessage;
+      var webhookUrlLabel = wizard.dataset.webhookUrlLabel;
+      var webhookSecretLabel = wizard.dataset.webhookSecretLabel;
+      var noOrgsMsg = wizard.dataset.noOrgs;
+      var noReposMsg = wizard.dataset.noRepos;
+      var loadOrgsError = wizard.dataset.loadOrgsError;
+      var loadReposError = wizard.dataset.loadReposError;
+      var saveErrorMsg = wizard.dataset.saveError;
+
+      var steps = ['organization', 'repositories', 'summary', 'done'];
+      var currentStepIndex = 0;
+      var selectedOrg = null;
+      var selectedRepos = new Set();
+      var webhookDetails = {};
+
+      var prevBtn = document.getElementById('prev-btn');
+      var nextBtn = document.getElementById('next-btn');
+      var finishBtn = document.getElementById('finish-btn');
+      var errorEl = document.getElementById('wizard-error');
+      var footer = document.getElementById('wizard-footer');
+
+      function csrfToken() {
+        return document.querySelector('meta[name="csrf-token"]')?.content;
+      }
+
+      function showStep(index) {
+        currentStepIndex = index;
+        steps.forEach(function(s, i) {
+          var el = document.getElementById('step-' + s);
+          if (el) el.className = 'step' + (i === index ? ' active' : '');
+        });
+
+        if (steps[index] === 'done') {
+          footer.style.display = 'none';
+          return;
+        }
+        footer.style.display = 'flex';
+
+        prevBtn.style.display = index > 0 ? 'inline-flex' : 'none';
+
+        if (steps[index] === 'summary') {
+          nextBtn.style.display = 'none';
+          finishBtn.style.display = 'inline-flex';
+          updateSummary();
+        } else {
+          nextBtn.style.display = 'inline-flex';
+          finishBtn.style.display = 'none';
+          nextBtn.disabled = (steps[index] === 'organization' && !selectedOrg);
+        }
+      }
+
+      function showError(msg) {
+        errorEl.textContent = msg;
+        errorEl.style.display = 'block';
+      }
+
+      function clearError() {
+        errorEl.textContent = '';
+        errorEl.style.display = 'none';
+      }
+
+      function loadOrganizations() {
+        var orgList = document.getElementById('org-list');
+        orgList.innerHTML = '<div class="loading">Loading...</div>';
+
+        fetch('/github/account/organizations', { headers: { Accept: 'application/json' } })
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            var orgs = data.organizations || [];
+            orgList.innerHTML = '';
+            if (!orgs.length) {
+              orgList.innerHTML = '<p style="padding:0.5em;color:#999;">' + noOrgsMsg + '</p>';
+              return;
+            }
+            orgs.forEach(function(org) {
+              var label = document.createElement('label');
+              label.className = 'list-item';
+
+              var input = document.createElement('input');
+              input.type = 'radio';
+              input.name = 'org';
+              input.value = org.login;
+              input.addEventListener('change', function() {
+                selectedOrg = org.login;
+                nextBtn.disabled = false;
+              });
+
+              var span = document.createElement('span');
+              span.textContent = org.name || org.login;
+
+              label.appendChild(input);
+              label.appendChild(span);
+              orgList.appendChild(label);
+            });
+          })
+          .catch(function() {
+            orgList.innerHTML = '';
+            showError(loadOrgsError);
+          });
+      }
+
+      function loadRepositories() {
+        var repoList = document.getElementById('repo-list');
+        repoList.innerHTML = '<div class="loading">Loading...</div>';
+
+        var params = new URLSearchParams({ organization: selectedOrg });
+        if (creativeId) params.append('creative_id', creativeId);
+
+        fetch('/github/account/repositories?' + params.toString(), { headers: { Accept: 'application/json' } })
+          .then(function(r) { return r.json(); })
+          .then(function(data) {
+            var repos = data.repositories || [];
+            repoList.innerHTML = '';
+            if (!repos.length) {
+              repoList.innerHTML = '<p style="padding:0.5em;color:#999;">' + noReposMsg + '</p>';
+              return;
+            }
+            repos.forEach(function(repo) {
+              var label = document.createElement('label');
+              label.className = 'list-item';
+
+              var input = document.createElement('input');
+              input.type = 'checkbox';
+              input.value = repo.full_name;
+              input.checked = selectedRepos.has(repo.full_name) || repo.selected;
+              if (input.checked) selectedRepos.add(repo.full_name);
+              input.addEventListener('change', function() {
+                if (input.checked) {
+                  selectedRepos.add(repo.full_name);
+                } else {
+                  selectedRepos.delete(repo.full_name);
+                }
+              });
+
+              var span = document.createElement('span');
+              span.textContent = repo.full_name;
+
+              label.appendChild(input);
+              label.appendChild(span);
+              repoList.appendChild(label);
+            });
+          })
+          .catch(function() {
+            repoList.innerHTML = '';
+            showError(loadReposError);
+          });
+      }
+
+      function updateSummary() {
+        var summaryList = document.getElementById('summary-repos');
+        var summaryEmpty = document.getElementById('summary-empty');
+        var instructions = document.getElementById('webhook-instructions');
+        summaryList.innerHTML = '';
+
+        var repos = Array.from(selectedRepos);
+        if (!repos.length) {
+          summaryEmpty.style.display = 'block';
+          if (instructions) instructions.style.display = 'none';
+          return;
+        }
+        summaryEmpty.style.display = 'none';
+        if (instructions) instructions.style.display = 'block';
+
+        repos.forEach(function(fullName) {
+          var li = document.createElement('li');
+          var strong = document.createElement('strong');
+          strong.textContent = fullName;
+          li.appendChild(strong);
+
+          var details = webhookDetails[fullName];
+          if (details) {
+            if (details.url) {
+              var urlDiv = document.createElement('div');
+              urlDiv.className = 'webhook-detail';
+              urlDiv.innerHTML = '<span style="font-weight:600;">' + webhookUrlLabel + ': </span><code>' + details.url + '</code>';
+              li.appendChild(urlDiv);
+            }
+            if (details.secret) {
+              var secretDiv = document.createElement('div');
+              secretDiv.className = 'webhook-detail';
+              secretDiv.innerHTML = '<span style="font-weight:600;">' + webhookSecretLabel + ': </span><code>' + details.secret + '</code>';
+              li.appendChild(secretDiv);
+            }
+          }
+          summaryList.appendChild(li);
+        });
+      }
+
+      function saveSelection() {
+        clearError();
+        var payload = { repositories: Array.from(selectedRepos) };
+
+        fetch('/github/creatives/' + creativeId + '/integration', {
+          method: 'PATCH',
+          headers: {
+            'Content-Type': 'application/json',
+            'X-CSRF-Token': csrfToken()
+          },
+          body: JSON.stringify(payload)
+        })
+          .then(function(r) { return r.json().then(function(body) { return { ok: r.ok, body: body }; }); })
+          .then(function(result) {
+            if (!result.ok) {
+              showError(result.body.error || saveErrorMsg);
+              return;
+            }
+            webhookDetails = result.body.webhooks || {};
+
+            // Notify parent window and show done step
+            notifyParent();
+            showStep(steps.indexOf('done'));
+          })
+          .catch(function() {
+            showError(saveErrorMsg);
+          });
+      }
+
+      function notifyParent() {
+        try {
+          if (window.opener) {
+            window.opener.postMessage({ type: 'githubConnected' }, window.location.origin);
+          }
+        } catch (e) {
+          // Ignore cross-origin errors
+        }
+      }
+
+      // Navigation
+      prevBtn.addEventListener('click', function() {
+        clearError();
+        if (currentStepIndex > 0) {
+          showStep(currentStepIndex - 1);
+          if (steps[currentStepIndex] === 'repositories') loadRepositories();
+        }
+      });
+
+      nextBtn.addEventListener('click', function() {
+        clearError();
+        var nextIndex = currentStepIndex + 1;
+        showStep(nextIndex);
+        if (steps[nextIndex] === 'repositories') loadRepositories();
+      });
+
+      finishBtn.addEventListener('click', function() {
+        saveSelection();
+      });
+
+      document.getElementById('close-btn').addEventListener('click', function() {
+        window.close();
+      });
+
+      // Initial load
+      loadOrganizations();
+    })();
+  </script>
+</body>
+</html>

data/config/locales/en.yml

@@ -23,6 +23,14 @@ en:
       summary: "The following repositories will be linked to this Creative:"
       webhook_instructions: "Configure each repository with the webhook details below."
       summary_empty: "No repositories selected."
+    setup:
+      loading: "Loading..."
+      close: "Close"
+      no_orgs: "No organizations found."
+      no_repos: "No repositories found."
+      load_orgs_error: "Failed to load organizations."
+      load_repos_error: "Failed to load repositories."
+      save_error: "Failed to save integration."
     auth:
       login_first: "Please log in first to connect your GitHub account"
       connected: "GitHub account connected successfully"

data/config/locales/ko.yml

@@ -23,6 +23,14 @@ ko:
       summary: "다음 저장소가 이 Creative에 연동됩니다:"
       webhook_instructions: "각 저장소에 아래 웹훅 정보를 설정하세요."
       summary_empty: "선택된 저장소가 없습니다."
+    setup:
+      loading: "불러오는 중..."
+      close: "닫기"
+      no_orgs: "조직을 찾을 수 없습니다."
+      no_repos: "저장소를 찾을 수 없습니다."
+      load_orgs_error: "조직 목록을 불러오지 못했습니다."
+      load_repos_error: "저장소 목록을 불러오지 못했습니다."
+      save_error: "연동 저장에 실패했습니다."
     auth:
       login_first: "GitHub 계정을 연결하려면 먼저 로그인하세요"
       connected: "GitHub 계정이 연결되었습니다"

data/config/routes.rb

@@ -4,6 +4,10 @@ CollavreGithub::Engine.routes.draw do
   post "webhook", to: "webhooks#create", as: :webhook
   post "webhooks", to: "webhooks#create"
 
+  # OAuth setup flow (popup wizard after callback)
+  get "auth/setup", to: "auth#setup", as: :setup_auth
+  post "auth/store_creative", to: "auth#store_creative", as: :store_creative_auth
+
   # Account endpoints
   resource :account, only: [ :show ] do
     get :organizations

data/db/migrate/20260219095224_remove_github_gemini_prompt_from_creatives.rb

@@ -0,0 +1,5 @@
+class RemoveGithubGeminiPromptFromCreatives < ActiveRecord::Migration[8.1]
+  def change
+    remove_column :creatives, :github_gemini_prompt, :text
+  end
+end

data/lib/collavre_github/version.rb

@@ -1,3 +1,3 @@
 module CollavreGithub
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/tasks/mock_server.rake

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+namespace :collavre_github do
+  desc "Start GitHub API mock server for development (port: GITHUB_MOCK_PORT, default 4567)"
+  task :mock_server do
+    load CollavreGithub::Engine.root.join("script/mock_server.rb")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre_github
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Collavre
@@ -75,6 +75,7 @@ files:
 - app/services/collavre_github/tools/github_pr_details_service.rb
 - app/services/collavre_github/tools/github_pr_diff_service.rb
 - app/services/collavre_github/webhook_provisioner.rb
+- app/views/collavre_github/auth/setup.html.erb
 - app/views/collavre_github/integrations/_modal.html.erb
 - config/locales/en.yml
 - config/locales/ko.yml
@@ -82,10 +83,12 @@ files:
 - db/migrate/20250925000000_create_github_integrations.rb
 - db/migrate/20250927000000_add_webhook_secret_to_github_repository_links.rb
 - db/migrate/20250928105957_add_github_gemini_prompt_to_creatives.rb
+- db/migrate/20260219095224_remove_github_gemini_prompt_from_creatives.rb
 - db/seeds.rb
 - lib/collavre_github.rb
 - lib/collavre_github/engine.rb
 - lib/collavre_github/version.rb
+- lib/tasks/mock_server.rake
 homepage: https://collavre.com
 licenses:
 - AGPL