gdrivestrg 0.0.7 → 0.0.8

data/lib/gdrivestrg/gdrivestrg.rb

@@ -46,15 +46,16 @@ class GdriveStrg < CloudStrg::CloudStorage
     elsif params[:error] # User denied the oauth grant
       puts "Denied: #{params[:error]}"
     else
-      if params[:refresh_token] and params[:access_token] and params[:expires_in]
-        session[:gdrive_access_token] = params[:access_token]
-        # user.gdrive_access_token = @client.authorization.access_token
+      if params[:refresh_token] and params[:expires_in]
         user_params.refresh_token = params[:refresh_token]
         user_params.expires_in = params[:expires_in]
         user_params.save()
         user_params.issued_at = user_params.updated_at
         user_params.save()
       end
+      if params[:access_token]
+        session[:gdrive_access_token] = params[:access_token]
+      end
       @client.authorization.update_token!(:access_token => session[:gdrive_access_token] , #:access_token => user_params.access_token, 
                                      :refresh_token => user_params.refresh_token, 
                                      :expires_in => user_params.expires_in, 

data/lib/gdrivestrg/gdrivestrg.rb~

@@ -46,15 +46,16 @@ class GdriveStrg < CloudStrg::CloudStorage
     elsif params[:error] # User denied the oauth grant
       puts "Denied: #{params[:error]}"
     else
-      if params[:refresh_token] and params[:access_token] and params[:expires_in]
-        session[:gdrive_access_token] = params[:access_token]
-        # user.gdrive_access_token = @client.authorization.access_token
+      if params[:refresh_token] and params[:expires_in]
         user_params.refresh_token = params[:refresh_token]
         user_params.expires_in = params[:expires_in]
         user_params.save()
         user_params.issued_at = user_params.updated_at
         user_params.save()
       end
+      if params[:access_token]
+        session[:gdrive_access_token] = params[:access_token]
+      end
       @client.authorization.update_token!(:access_token => session[:gdrive_access_token] , #:access_token => user_params.access_token, 
                                      :refresh_token => user_params.refresh_token, 
                                      :expires_in => user_params.expires_in, 
@@ -71,7 +72,7 @@ class GdriveStrg < CloudStrg::CloudStorage
           end
         else
           begin
-            @client.execute!(:api_method => @auth_api.userinfo.get)
+            r = @client.execute!(:api_method => @auth_api.userinfo.get)
           rescue Exception => e
             session.delete(:gdrive_access_token)
             session = requestAccessToken(session, user_params)
@@ -152,7 +153,7 @@ class GdriveStrg < CloudStrg::CloudStorage
       return result.data[:id]
     else
       puts "An error occurred: #{result.data['error']['message']}"
-      return false
+      return nil
     end
 
   end

data/lib/gdrivestrg/version.rb

@@ -1,3 +1,3 @@
 module Gdrivestrg
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gdrivestrg
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails