firebase_token_auth 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df8895c93fb21c8dfc899c0b626057b41becbf3b4af70a9dbf286938644ee44
-  data.tar.gz: d8dbb7afac6ffad4e028e00f7981b5f2408690b23dcf2c64be838cc2fb4828cb
+  metadata.gz: e9f7a292a94cf420f5dec36b487a4799d6b7031ae638ba19579d352bdf0c05e6
+  data.tar.gz: c42077b8cf9abe2d55168dfc2d6af1819bb05a8ecc7eff381f3268c1ede3d343
 SHA512:
-  metadata.gz: 432891f9eef84e16d0c8f1d8736f8cd44a0732b87b623bb6e2e0064e7c23aa69ac25a8f6031697360d6b60b99a3545caaee0ea55a29161dc2a0f8ce8024f89c7
-  data.tar.gz: 868b4f40be681e90beabee2ccc86eb213623ef8b0f0ac2136d3e6adb546d30814f1d30ba53f0b231cc1d75795726430160a20ff7a5bcb8ac390f6d16e523e40c
+  metadata.gz: 2f3c13851e5724d4aa22eadcf747cc0559616f697a59781c8150d13e4b3813c8934dc633b31a75b4e214a5bed9e7c51435ab415148aefacfffad8ff9ec52c285
+  data.tar.gz: 391369962ace3e9f2b6c85f946fc8a54feddc0c1d503e984aee2452d7c5a0f3499c69adf3c1a8fd1f77aa42a1e50867cc0d622018af6be4fbcd66aa0815bb44b

data/.github/workflows/test.yml

@@ -0,0 +1,56 @@
+name: rspec
+
+on: push
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ 2.4, 2.5, 2.6, 2.7, "3.0" ]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+
+      - name: Configure Bundler
+        run: |
+          gem update --system
+          gem --version
+          gem install -N bundler -v 2
+
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gem-${{ hashFiles(format('{0}{1}', github.workspace, '/Gemfile.lock')) }}
+          restore-keys: ${{ runner.os }}-gem-
+
+      - name: Install ruby dependencies
+        run: |
+          bundle check || bundle install --jobs 4 --retry 3 --path vendor/bundle
+
+      - name: rspec
+        run: |
+          bundle exec rspec
+        env:
+          TEST_UID: ${{ secrets.TEST_UID }}
+          TEST_PROJECT_ID: ${{ secrets.TEST_PROJECT_ID }}
+          TEST_WEB_API_KEY: ${{ secrets.TEST_WEB_API_KEY }}
+          TEST_USER_EMAIL: ${{ secrets.TEST_USER_EMAIL }}
+          GOOGLE_ACCOUNT_TYPE: ${{ secrets.GOOGLE_ACCOUNT_TYPE }}
+          GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+          GOOGLE_CLIENT_EMAIL: ${{ secrets.GOOGLE_CLIENT_EMAIL }}
+          GOOGLE_PRIVATE_KEY: ${{ secrets.GOOGLE_PRIVATE_KEY }}
+
+      - name: slack notification
+        uses: 8398a7/action-slack@v2
+        if: always()
+        with:
+          status: ${{ job.status }}
+          author_name: 'github action firebase_token_auth build'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}

data/README.md

@@ -54,7 +54,7 @@ FirebaseTokenAuth.configure do |config|
   config.project_id = 'your_project_id'
 end
 
-client = Firebase.build
+client = FirebaseTokenAuth.build
 result = client.verify_id_token(id_token)
 
 puts result.uid

data/firebase_token_auth.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Firebase Authentication API wrapper for serverside. It support custom token auth. Of course it has id_token verify feature.'
   spec.homepage      = 'https://github.com/miyataka/firebase_token_auth'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'google-api-client'
+  spec.add_dependency 'google-apis-identitytoolkit_v3'
   spec.add_dependency 'jwt'
 end

data/lib/firebase_token_auth/admin_client.rb

@@ -10,13 +10,13 @@ module FirebaseTokenAuth
     end
 
     def get_account_info(params)
-      request = Google::Apis::IdentitytoolkitV3::GetAccountInfoRequest.new({ **params })
+      request = Google::Apis::IdentitytoolkitV3::GetAccountInfoRequest.new(**params)
       service.get_account_info(request)
     end
 
     def update_existing_account(uid, attributes)
       update_params = { local_id: uid }.merge!(permit_attributes(attributes))
-      request = Google::Apis::IdentitytoolkitV3::SetAccountInfoRequest.new(update_params)
+      request = Google::Apis::IdentitytoolkitV3::SetAccountInfoRequest.new(**update_params)
       service.set_account_info(request)
     end
 
@@ -24,7 +24,7 @@ module FirebaseTokenAuth
 
       def permit_attributes(attr_hash)
         permit_keys = %i[disabled display_name email email_verified password phone_number photo_url multi_factor]
-        attr_hash.filter { |k, _v| permit_keys.include?(k) }
+        attr_hash.select { |k, _v| permit_keys.include?(k) }
       end
   end
 end

data/lib/firebase_token_auth/client.rb

@@ -32,6 +32,7 @@ module FirebaseTokenAuth
       public_key_manager.refresh_publickeys!
       validator.validate(configuration.project_id, decoded_jwt)
       default_options = { algorithm: ALGORITHM, verify_iat: true, verify_expiration: true, exp_leeway: configuration.exp_leeway }
+      raise ValidationError, 'Public key may have expired.' unless public_key_manager.public_keys.include?(public_key_id)
       jwt = JWT.decode(id_token, public_key_manager.public_keys[public_key_id].public_key, true, default_options.merge!(options))
       IdTokenResult.new(jwt[0]['sub'], IdToken.new(jwt[0], jwt[1]))
     end

data/lib/firebase_token_auth/configuration.rb

@@ -29,6 +29,7 @@ module FirebaseTokenAuth
 
       @auth = if json_key_io
                 io = json_key_io.respond_to?(:read) ? json_key_io : File.open(json_key_io)
+                io.rewind if io.respond_to?(:read) 
                 Google::Auth::ServiceAccountCredentials.make_creds(
                   json_key_io: io,
                   scope: scope
@@ -40,11 +41,12 @@ module FirebaseTokenAuth
 
       if json_key_io
         json_io = json_key_io.respond_to?(:read) ? json_key_io : File.open(json_key_io)
+        json_io.rewind if json_key_io.respond_to?(:read) 
         parsed = JSON.parse(json_io.read)
         @private_key = OpenSSL::PKey::RSA.new(parsed['private_key'])
         @client_email = parsed['client_email']
       else
-        @private_key = OpenSSL::PKey::RSA.new(ENV['GOOGLE_PRIVATE_KEY'])
+        @private_key = OpenSSL::PKey::RSA.new(unescape(ENV['GOOGLE_PRIVATE_KEY']))
         @client_email = ENV['GOOGLE_CLIENT_EMAIL']
       end
     end
@@ -52,5 +54,11 @@ module FirebaseTokenAuth
     def configured_for_custom_token?
       json_key_io || (ENV['GOOGLE_PRIVATE_KEY'] && ENV['GOOGLE_CLIENT_EMAIL'])
     end
+
+    def unescape(str)
+      str = str.gsub('\n', "\n")
+      str = str[1..-2] if str.start_with?('"') && str.end_with?('"')
+      str
+    end
   end
 end

data/lib/firebase_token_auth/version.rb

@@ -1,3 +1,3 @@
 module FirebaseTokenAuth
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.3'.freeze
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: firebase_token_auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - miyataka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: google-api-client
+  name: google-apis-identitytoolkit_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -46,6 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -79,14 +80,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Firebase Authentication API wrapper for serverside. It support custom token