github-authentication 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 232b7d332cfdf5a3b6ec3e6854b13203dcc204c4f242d730ea2a8510bb25164a
-  data.tar.gz: 8715cff617884f40643eb2569704bca0ad3ce306277d0298806e550889d63b3f
+  metadata.gz: fc7a5e8c75f0a6c1eff271d772031e5d18850dd6bb7d2387908d5186558e1396
+  data.tar.gz: fdd8a299c44fa0d0a4336af31d0568ab0b6f9d71111fa0fa3a3157b04a9356c7
 SHA512:
-  metadata.gz: ab1d75961e37a620932f1cefe273c00bd95e96332368a13268b868114649d1d8b96c4133770adb898c4a2c1a3502d7c16fab3e840671cc7f90064d89ce6835c1
-  data.tar.gz: 8ab8c0af8067b378f0a981173ff3e5ea53728c65cf6264a8ebeecd6fe8c30d75b739d89ec9aed893c292950bdc414ac2be46fe065eac48c722dbbbce98329f36
+  metadata.gz: cef00e4c97906f4e6a988ec830ed5462a3f146365b2abebdd0284fee99e243c5ca5db618642eb7fffb004d24080fce2294a2875043fbe947d01c70a751177466
+  data.tar.gz: 4fe79c4825cb493039a315aaeda5f982616bee4b411909d931ef7e20938a55b5b0f1b5ea99781b02e2c1f17cba6ae4af950659a73e8b2661f15fc087a0c459f5

data/.github/workflows/tests.yml

@@ -14,7 +14,6 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
           bundler-cache: true
 
       - name: Lint Ruby
@@ -27,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0', '3.1', '3.2' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2', '3.3' ]
     steps:
       - uses: actions/checkout@v4
 
@@ -41,6 +40,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          bundler: latest
 
       - name: Run Ruby tests
         run: |

data/.rubocop.yml

@@ -2,7 +2,6 @@ inherit_gem:
   rubocop-shopify: rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
   CacheRootDirectory: tmp/rubocop-cache
   UseCache: true
 

data/.ruby-version

@@ -0,0 +1 @@
+3.3.0

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+### Next
+
+...
+
+### 1.2.0
+- Support multi-org credentials (https://github.com/Shopify/github-authentication/pull/34)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    github-authentication (1.1.0)
+    github-authentication (1.2.0)
       jwt (~> 2.2)
 
 GEM
@@ -31,36 +31,36 @@ GEM
     hashdiff (1.0.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     language_server-protocol (3.17.0.3)
     minitest (5.20.0)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     mutex_m (0.2.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     public_suffix (5.0.4)
     racc (1.7.3)
     rainbow (3.1.1)
     rake (13.1.0)
-    regexp_parser (2.8.2)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
-    rubocop (1.57.2)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-shopify (2.14.0)
       rubocop (~> 1.51)
     ruby-progressbar (1.13.0)
@@ -76,7 +76,9 @@ GEM
       hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
+  arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -91,4 +93,4 @@ DEPENDENCIES
   webmock (~> 3.8)
 
 BUNDLED WITH
-   2.4.21
+   2.3.8

data/exe/git-credential-github-app

@@ -14,11 +14,16 @@ end
 
 case ARGV[0]
 when "get"
+  description = $stdin.each_line.map { |line| line.split("=", 2).map(&:strip) }.to_h
+  org = description.fetch("path", "").split("/").first
+  environment = GithubAuthentication::Environment.new(org: org)
+
   exit_status = GithubAuthentication::GitCredentialHelper.new(
-    pem: File.read(ENV.fetch("GITHUB_APP_KEYFILE")),
-    app_id: ENV.fetch("GITHUB_APP_ID"),
-    installation_id: ENV.fetch("GITHUB_APP_INSTALLATION_ID"),
-    storage: ActiveSupport::Cache::FileStore.new(ENV.fetch("GITHUB_APP_CREDENTIAL_STORAGE_PATH")),
+    pem: environment.pem,
+    app_id: environment.app_id,
+    installation_id: environment.installation_id,
+    storage: environment.storage,
+    description: description,
   ).handle_get
   exit(exit_status)
 when "store"

data/github-authentication.gemspec

@@ -37,6 +37,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency("jwt", "~> 2.2")
 
+  spec.required_ruby_version = ">= 2.7.0"
+
   spec.add_development_dependency("activesupport")
   spec.add_development_dependency("minitest", "~> 5.0")
   spec.add_development_dependency("mocha", "~> 2")

data/lib/github_authentication/environment.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "active_support/core_ext/object/blank.rb"
+
+module GithubAuthentication
+  class Environment
+    def initialize(org:, env: ENV)
+      @org = org.presence
+      @env = env
+    end
+
+    def pem
+      File.read(resolve("GITHUB_APP_KEYFILE"))
+    end
+
+    def app_id
+      resolve("GITHUB_APP_ID")
+    end
+
+    def installation_id
+      resolve("GITHUB_APP_INSTALLATION_ID")
+    end
+
+    def storage
+      ActiveSupport::Cache::FileStore.new(resolve("GITHUB_APP_CREDENTIAL_STORAGE_PATH"))
+    end
+
+    private
+
+    def resolve(suffix)
+      if @org
+        @env["#{@org.upcase}_#{suffix}"] || @env.fetch(suffix)
+      else
+        @env.fetch(suffix)
+      end
+    end
+  end
+end

data/lib/github_authentication/git_credential_helper.rb

@@ -2,19 +2,17 @@
 
 module GithubAuthentication
   class GitCredentialHelper
-    def initialize(pem:, installation_id:, app_id:, storage: nil, stdin: $stdin)
+    def initialize(pem:, installation_id:, app_id:, description:, storage: nil)
       @pem = pem
       @installation_id = installation_id
       @app_id = app_id
+      @description = description
       @storage = storage
-      @stdin = stdin
     end
 
     def handle_get
-      description = parse_stdin
-
-      unless description["protocol"] == "https" && description["host"] == "github.com"
-        warn("Unsupported description: #{description}")
+      unless @description["protocol"] == "https" && @description["host"] == "github.com"
+        warn("Unsupported description: #{@description}")
         return 2
       end
 
@@ -32,12 +30,6 @@ module GithubAuthentication
       10 * 60
     end
 
-    def parse_stdin
-      # Credential description is written to STDIN in line delimited key=value form,
-      # see https://git-scm.com/docs/git-credential#IOFMT
-      @stdin.each_line.map { |line| line.split("=", 2).map(&:strip) }.to_h
-    end
-
     def provider
       @provider ||= Provider.new(
         generator: generator,

data/lib/github_authentication/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GithubAuthentication
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/github_authentication.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "github_authentication/version"
+require "github_authentication/environment"
 require "github_authentication/generator"
 require "github_authentication/provider"
 require "github_authentication/cache"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: github-authentication
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Frederik Dudzik
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -147,6 +146,8 @@ files:
 - ".github/workflows/tests.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -162,6 +163,7 @@ files:
 - lib/github-authentication.rb
 - lib/github_authentication.rb
 - lib/github_authentication/cache.rb
+- lib/github_authentication/environment.rb
 - lib/github_authentication/generator.rb
 - lib/github_authentication/generator/app.rb
 - lib/github_authentication/generator/personal.rb
@@ -179,7 +181,6 @@ metadata:
   homepage_uri: https://github.com/Shopify/github-authentication
   source_code_uri: https://github.com/Shopify/github-authentication
   allowed_push_host: https://rubygems.org
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -187,15 +188,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key: 
+rubygems_version: 3.7.1
 specification_version: 4
 summary: GitHub Authetication
 test_files: []