firebase_token_auth 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df8895c93fb21c8dfc899c0b626057b41becbf3b4af70a9dbf286938644ee44
-  data.tar.gz: d8dbb7afac6ffad4e028e00f7981b5f2408690b23dcf2c64be838cc2fb4828cb
+  metadata.gz: 95fc13633c155f179c4a74a48826b61348bfeafe06a05c985fc4239c41d1a5e1
+  data.tar.gz: 9645adc249d87ba2be7b38edc9dd941be199e048658ea680ff6c8614457ed98b
 SHA512:
-  metadata.gz: 432891f9eef84e16d0c8f1d8736f8cd44a0732b87b623bb6e2e0064e7c23aa69ac25a8f6031697360d6b60b99a3545caaee0ea55a29161dc2a0f8ce8024f89c7
-  data.tar.gz: 868b4f40be681e90beabee2ccc86eb213623ef8b0f0ac2136d3e6adb546d30814f1d30ba53f0b231cc1d75795726430160a20ff7a5bcb8ac390f6d16e523e40c
+  metadata.gz: eb9d1699aa73a7c4bb49adaa31b3af9b0b0f779f7b495ec148aeebe47fe9bc37f541a5747ef84608b995694cc7c4e8fc8ecc081cf1c13ae265a9171de305b17a
+  data.tar.gz: e716f21df00f2c90571243d4e4ef9df978552ad39b9a2729a6452ae98fb164f9d6dd039ce7b3239ebd495aebd7e6c5156f4a1058e01dd905b1fc04abafb79a37

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: actions/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/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

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/configuration.rb

@@ -44,7 +44,7 @@ module FirebaseTokenAuth
         @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 +52,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.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: firebase_token_auth
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - miyataka
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -46,6 +46,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -79,7 +80,7 @@ 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:
   - - ">="