signet-rails 0.0.5 → 0.0.6

data/lib/signet/rails/builder.rb

@@ -28,6 +28,23 @@ module Signet
 	combined_options[:persist_attrs] ||= [:refresh_token, :access_token, :expires_in, :issued_at]
 	combined_options[:name] ||= :google
 
+	# is this a login-based OAuth2 adapter? If so, the callback will be used to identify a
+	# user and create one if necessary
+	# Options: :login, :webserver
+	combined_options[:type] = :login
+
+	# name of hash-behaving attribute on our wrapper that contains credentials
+	# keyed by :name
+	# {
+        #   "google": {
+        #     "uid": "012345676789abcde",
+        #     "refresh_token": "my_first_refresh_token",
+        #     "access_token": "my_first_access_token",
+        #     "expires_in": 123
+        #   }
+        # }
+	combined_options[:storage_attr] ||= :signet
+
 	# TODO: see https://developers.google.com/accounts/docs/OAuth2Login#authenticationuriparameters
 	combined_options[:approval_prompt] ||= 'auto'
 
@@ -41,29 +58,50 @@ module Signet
 	# whether we handle the persistence of the auth callback or simply pass-through
 	combined_options[:handle_auth_callback] ||= true
 
-	# method to get the persistence object when creating a client via the factory
+	# The following lambda will be used when creating a new client in a factory
+	# to get the persistence object 
 	combined_options[:extract_from_env] ||= lambda do |env, client|
-	  u = nil
+	  oac = nil
 	  session = env['rack.session']
 	  if !!session && !!session[:user_id]
 	    begin
 	      u = User.find(session[:user_id])
+	      oac = u.o_auth2_credentials.where(name: combined_options[:name]).first
 	    rescue ActiveRecord::RecordNotFound => e
 	    end
 	  end
-	  u
+	  oac
 	end
 
-	# when on an auth_callback, how do we get the persistence object from the id?
+	# The following lambda will be used when handling the callback from the oauth server
+	# In this flow we might not yet have established a session... need to handle two
+	# flows, one for login, one not
+	# when on a login auth_callback, how do we get the persistence object from the JWT?
 	combined_options[:extract_by_oauth_id] ||= lambda do |id, client|
-	  u = nil
+	  oac = nil
 	  begin
-	    u = User.where(uid: id).first_or_initialize(
-	      refresh_token: client.refresh_token
-	    )
+	    u = nil
+	    if combined_options[:type] == :login
+	      u = User.first_or_initialize(uid: id)
+	      u.save
+	    else
+	      session = env['rack.session']
+	      if !!session && !!session[:user_id]
+		begin
+		  u = User.find(session[:user_id])
+		rescue ActiveRecord::RecordNotFound => e
+		end
+	      else
+		raise "Expected to be able to find user in session"
+	      end
+	    end
+
+	    oac = u.o_auth2_credentials.first_or_initialize(name: combined_options[:name])
+
 	  rescue ActiveRecord::RecordNotFound => e
 	  end
-	  u
+
+	  oac
 	end
 
 	combined_options[:persistence_wrapper] ||= :active_record

data/lib/signet/rails/handler.rb

@@ -63,18 +63,32 @@ module Signet
       end
 
       def persist_token_state wrapper, client
+	if not wrapper.obj.respond_to?(options[:storage_attr])
+	  raise "Persistence object does not support the storage attribute #{options[:storage_attr]}"
+	end
+
+	if (store_hash = wrapper.obj.method(options[:storage_attr]).call).nil?
+	  store_hash = wrapper.obj.method("#{options[:storage_attr]}=").call({})
+	end
+
 	for i in options[:persist_attrs]
-	  if client.respond_to?(i) && wrapper.obj.respond_to?(i.to_s+'=')
+	  if client.respond_to?(i) 
 	    # only transfer the value if it is non-nil
-	    wrapper.obj.method(i.to_s+'=').call(client.method(i).call) unless client.method(i).call.nil?
+	    store_hash[i.to_s] = client.method(i).call unless client.method(i).call.nil?
 	  end
 	end
       end
 
       def load_token_state wrapper, client
-	for i in options[:persist_attrs]
-	  if wrapper.obj.respond_to?(i) && client.respond_to?(i.to_s+'=')
-	    client.method(i.to_s+'=').call(wrapper.obj.method(i).call)
+	if not wrapper.obj.respond_to?(options[:storage_attr])
+	  raise "Persistence object does not support the storage attribute #{options[:storage_attr]}"
+	end
+
+	if not (store_hash = wrapper.obj.method(options[:storage_attr]).call).nil?
+	  for i in options[:persist_attrs]
+	    if client.respond_to?(i.to_s+'=')
+	      client.method(i.to_s+'=').call(store_hash[i.to_s])
+	    end
 	  end
 	end
       end

data/lib/signet/rails/version.rb

@@ -1,5 +1,5 @@
 module Signet
   module Rails
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: signet-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler