firebase 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d72f4bd9c17f8c7d7839cbb1defd919299ca5d32b62c44b31c98f877f5e8b8b9
-  data.tar.gz: 7b0edc9268116110902f07912f5e2f06830e202a651a375c0b800506c17d64db
+  metadata.gz: 49b70b598dec94254a0bbc0891a4d487bdf7e5ad8f21a492caee067eb666ee40
+  data.tar.gz: c85fdf4c54950027cfaa78d7241e2b6917a8db254cb333eeed401530595b721f
 SHA512:
-  metadata.gz: b8c9c29aeccf96d90d88ee18448f29b8ea3d2f269d31230ea8ee8851fb4ae6035f9953351fe1cd430b87a7d03e47a8ab6fec6835568add43f6869a2b56a6faf6
-  data.tar.gz: 821ec1fa4f8279d908356344146452b3e7515242dc936f4077c412adf5084dda4c077ed9b697a753e43888e353fca70b8e9a329dcdfbe277b0ec9373edd41917
+  metadata.gz: 3e254898a633f18cc5c17b47dd2a54df63476359bcd1e628c5da5416d7de3a840c1965019856737a2e039b8e7f4bde9b6b495bbfd0c968bbe7ace6182462de11
+  data.tar.gz: ec683cadd0d79f95c10036ed2e8088a5856abceaf79716639c2b074ee7017412947c333947cebe806c22365d092f894fc1a10fe6d8a48c6d3b2e5c12fa4d3caa

data/README.md

@@ -27,16 +27,25 @@ response.body # => { 'name' => "-INOQPH-aV_psbk3ZXEX" }
 response.raw_body # => '{"name":"-INOQPH-aV_psbk3ZXEX"}'
 ```
 
+### Authentication
 If you have a read-only namespace, you need to authenticate your Firebase client. `firebase-ruby` will attempt to determine if you are using the old or new [authentication method](https://firebase.google.com/docs/database/rest/auth) by whether your auth string is a valid JSON string or not.
 
+#### Using Firebase Database Secret (deprecated)
+```
+# Using Firebase Database Secret (deprecated)
+firebase = Firebase::Client.new(base_uri, db_secret)
+```
+
+#### Using Firebase Admin SDK private key
+Go to the Firebase console and under `Project Settings` -> `Service Accounts` -> `Firebase Admin SDK` click on `GENERATE NEW PRIVATE KEY`. Save the json file and use it like this:
+
 ```ruby
 # Using Firebase Admin SDK private key
+private_key_json_string = File.open('/path/to/your/generated/json').read
 firebase = Firebase::Client.new(base_uri, private_key_json_string)
-
-# Using Firebase Database Secret (deprecated)
-firebase = Firebase::Client.new(base_uri, db_secret)
 ```
 
+
 You can now pass custom query options to firebase:
 
 ```ruby

data/lib/firebase.rb

@@ -14,22 +14,24 @@ module Firebase
         raise ArgumentError.new('base_uri must be a valid https uri')
       end
       base_uri += '/' unless base_uri.end_with?('/')
-      default_header = {
-        'Content-Type' => 'application/json'
-      }
+      @request = HTTPClient.new({
+        :base_url => base_uri,
+        :default_header => {
+          'Content-Type' => 'application/json'
+        }
+      })
       if auth && valid_json?(auth)
-        # Using Admin SDK private key
-        scopes = %w(https://www.googleapis.com/auth/firebase.database https://www.googleapis.com/auth/userinfo.email)
-        credentials = Google::Auth::DefaultCredentials.make_creds(json_key_io: StringIO.new(auth), scope: scopes)
-        default_header = credentials.apply(default_header)
+        # Using Admin SDK service account
+        @credentials = Google::Auth::DefaultCredentials.make_creds(
+          json_key_io: StringIO.new(auth),
+          scope: %w(https://www.googleapis.com/auth/firebase.database https://www.googleapis.com/auth/userinfo.email)
+        )
+        @credentials.apply!(@request.default_header)
+        @expires_at = @credentials.issued_at + 0.95 * @credentials.expires_in
       else
         # Using deprecated Database Secret
-        @auth = auth
+        @secret = auth
       end
-      @request = HTTPClient.new({
-        :base_url => base_uri,
-        :default_header => default_header
-      })
     end
 
     # Writes and returns the data
@@ -66,9 +68,16 @@ module Firebase
       if path[0] == '/'
         raise(ArgumentError.new("Invalid path: #{path}. Path must be relative"))
       end
+
+      if @expires_at && Time.now > @expires_at
+        @credentials.refresh!
+        @credentials.apply! @request.default_header
+        @expires_at = @credentials.issued_at + 0.95 * @credentials.expires_in
+      end
+
       Firebase::Response.new @request.request(verb, "#{path}.json", {
         :body             => (data && data.to_json),
-        :query            => (@auth ? { :auth => @auth }.merge(query) : query),
+        :query            => (@secret ? { :auth => @secret }.merge(query) : query),
         :follow_redirect  => true
       })
     end

data/lib/firebase/version.rb

@@ -0,0 +1,3 @@
+module Firebase
+ VERSION = '0.2.8'.freeze
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: firebase
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Oscar Del Ben
+- Vincent Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -109,6 +110,7 @@ files:
 - lib/firebase.rb
 - lib/firebase/response.rb
 - lib/firebase/server_value.rb
+- lib/firebase/version.rb
 homepage: http://github.com/oscardelben/firebase-ruby
 licenses:
 - MIT