Resolve merge conflicts

passageidentity · Dec 4, 2023 · 6a25cb7 · 6a25cb7
2 parents 74a195b + 612b07e
commit 6a25cb7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1,791 deletions.
diff --git a/lib/passageidentity/client.rb b/lib/passageidentity/client.rb
@@ -3,6 +3,7 @@
 require_relative "auth"
 require_relative "user_api"
 require_relative "error"
+require_relative "version"
 require "rubygems"
 require_relative "../openapi_client"
 
@@ -79,7 +80,7 @@ def create_magic_link(
       begin
         gemspec = File.join(__dir__, "../../passageidentity.gemspec")
         spec = Gem::Specification.load(gemspec)
-        header_params = { "Passage-Version" => "passage-ruby #{spec.version}" }
+        header_params = { "Passage-Version" => "passage-ruby #{Passage::VERSION}" }
         header_params["Authorization"] = "Bearer #{@api_key}" if @api_key != ""
 
         opts = {}

diff --git a/lib/passageidentity/version.rb b/lib/passageidentity/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Passage
+  VERSION = '0.2.3'
+end