simple_google_auth 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3be05a3ee1f2374ce780737daef9cb56a16208d
-  data.tar.gz: 2bd1495e1adef6c8027a61fd37f80469e990315f
+  metadata.gz: 17bdbddcd052da79050cd43d146b6ba3070a808d
+  data.tar.gz: 565fffa60eaef47bb69710a1830ee4315e73bf59
 SHA512:
-  metadata.gz: 07aed60cb224718a359da987b7694944564b26a38fe44a465847b7ba1ed846e8f693056f6efeb65f944580258194b2ed2f46bc99b8306e991a99df5ea5a92dd0
-  data.tar.gz: c338b514a61fdfd0d842d677784434656b3685d09a20d5fc65c0eb20eb1779b4cc71c8ef9ddcdc173ad0da3586c13b169893aeeb3f859142358384a3079ad392
+  metadata.gz: a83902d120549033da2bd08cd155e4f419dd9e512ef9a3a9240a654c3238119b36d9818feacdcdc8fcdd85ed8d2cb22a08e5df4a2fa0d7102c493e2360c85730
+  data.tar.gz: 08e7e440d0c2c27142c7229e1cc88d9a26df65d4ce3ff7d45f3e2195e495a4cef5136c81b08d42cd2acf4517b8cda8b02d73e749c3f04dbf30ff8a3606ae7b23

data/lib/simple_google_auth.rb

@@ -14,7 +14,12 @@ module SimpleGoogleAuth
     :state_session_key_name,
     :data_session_key_name,
     :request_parameters
-  )
+  ) do
+    def get_or_call(attribute)
+      value = send(attribute)
+      value.respond_to?(:call) ? value.call : value
+    end
+  end
 
   mattr_accessor :config
   self.config = Config.new
@@ -26,7 +31,7 @@ module SimpleGoogleAuth
   def self.uri(state)
     query = config.request_parameters.merge(
       response_type: "code",
-      client_id:     config.client_id,
+      client_id:     config.get_or_call(:client_id),
       redirect_uri:  config.redirect_uri,
       state:         state
     )

data/lib/simple_google_auth/receiver.rb

@@ -8,11 +8,11 @@ module SimpleGoogleAuth
 
       ensure_params_are_correct(request, config)
       auth_data = obtain_authentication_data(request.params["code"], config)
-      id_data = decode_id_data(auth_data)
+      id_data = decode_id_data(auth_data.delete("id_token"))
 
       raise Error, "Authentication failed" unless config.authenticate.call(id_data)
 
-      request.session[config.data_session_key_name] = id_data
+      request.session[config.data_session_key_name] = id_data.merge(auth_data)
 
       path = request.session[config.state_session_key_name][32..-1]
       path = "/" if path.blank?
@@ -54,8 +54,8 @@ module SimpleGoogleAuth
       request = Net::HTTP::Post.new(uri.request_uri)
       request.set_form_data(
         code: code,
-        client_id: config.client_id,
-        client_secret: config.client_secret,
+        client_id: config.get_or_call(:client_id),
+        client_secret: config.get_or_call(:client_secret),
         redirect_uri: config.redirect_uri,
         grant_type: "authorization_code"
       )
@@ -66,10 +66,10 @@ module SimpleGoogleAuth
       JSON.parse(response.body)
     end
 
-    def decode_id_data(auth_data)
-      id_data_64 = auth_data["id_token"].split(".")[1]
+    def decode_id_data(id_data)
+      id_data_64 = id_data.split(".")[1]
       id_data_64 << "=" until id_data_64.length % 4 == 0
-      id_data = JSON.parse(Base64.decode64(id_data_64))
+      JSON.parse(Base64.decode64(id_data_64))
     end
   end
 end

data/lib/simple_google_auth/version.rb

@@ -1,3 +1,3 @@
 module SimpleGoogleAuth
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: simple_google_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
 description: An extremely easy way to protect your site by requiring Google logins
@@ -32,15 +32,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.md
-- Rakefile
 - config/routes.rb
-- lib/simple_google_auth.rb
 - lib/simple_google_auth/controller.rb
 - lib/simple_google_auth/engine.rb
 - lib/simple_google_auth/receiver.rb
 - lib/simple_google_auth/version.rb
+- lib/simple_google_auth.rb
+- MIT-LICENSE
+- Rakefile
+- README.md
 homepage: https://github.com/mogest/simple_google_auth
 licenses:
 - MIT
@@ -51,17 +51,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Super simple Google authentication for your Rails site