navi_email_sync 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb62f60b851990be4456f7c89b54fcd92c4587f44834d44ee8c07d6865a6d02
-  data.tar.gz: 2eed53dfc8a715dc761f7dbf022b15b68d7293839f22e17088d5512c35fd0e29
+  metadata.gz: 0b1adf63fea9de38a1b9d436bf203145a525649937e2fd40f5a02a91e6b9447e
+  data.tar.gz: b23865f07b4813281998e695e13ff00f9bd737ff516cbcd4f4bbb6f3f0b3702d
 SHA512:
-  metadata.gz: 0215a6efc370348c3638f1cd2a8932923b4e2ccd808cf1c022c7ddc23c6fcb07a68bf0435381c336990e9a5b5217d35446144b7a7d874a9dd00d54e38328aaff
-  data.tar.gz: cb26d6604fa0d92c1d4a86e83634f6b74a988fec726b554e2cae6e108388807b7b0e8f65a31a1f8f9c16dfcc07eaa645947f22f156f751e2291c1999193fb34c
+  metadata.gz: 03d65abca7c01fae9757740e392402e05625b85afc710fce25b27a29563f9adfc59a069ffce6caa0bb700627acf210014b9914873bc5704fb0c92bb00c4d3374
+  data.tar.gz: 01c925f82dde2da7b0f21133e441754195c4021a82988fcaf060c976c2c191bade12133d1143722e7cb408d16ccab0a394b72b7014b20ec40f56e456decbc2f8

data/lib/gmail_client.rb

@@ -29,6 +29,8 @@ module GmailClient
 
   attr_accessor :total_emails
 
+  attr_accessor :auth_client
+
   @logglyTag
 
   def logger
@@ -69,20 +71,23 @@ module GmailClient
     @service.authorization = cred
   end
 
-  def init_apis_cloud client_path, scope, token, expires
+  def init_apis_cloud client_path, scope, token, type = "code"
     client_secrets = Google::APIClient::ClientSecrets.load client_path
-    auth_client = client_secrets.to_authorization
-    auth_client.client_secret = nil
-
-    auth_client.update!(
-        :scope => scope,
-        :access_token => token, :expires_in => expires)
-
-    client_opts = JSON.parse(auth_client.to_json)
+    @auth_client = client_secrets.to_authorization
+    @auth_client.update!(:scope => scope,
+                        :redirect_uri => "postmessage")
+    if(type == "code")
+      @auth_client.code = token
+    else
+      @auth_client.grant_type = "refresh_token"
+      @auth_client.refresh_token = token
+    end
 
+    @auth_client.refresh!
+    # @auth_client.client_secret = nil
     @service = Google::Apis::GmailV1::GmailService.new
     @service.client_options.application_name = APPLICATION_NAME
-    @service.authorization = Signet::OAuth2::Client.new(client_opts)
+    @service.authorization = Signet::OAuth2::Client.new(JSON.parse(@auth_client.to_json))
   end
 
   def authorization_url
@@ -101,8 +106,13 @@ module GmailClient
       begin
         # fetch all the email contents
         # data = imap.uid_fetch(message_id, "RFC822")
-        result = @service.get_user_message('me', message_id)
+        if @auth_client.expired?
+          @auth_client.grant_type = "refresh_token"
+          @auth_client.refresh!
+          @service.authorization = Signet::OAuth2::Client.new(JSON.parse(@auth_client.to_json))
+        end
 
+        result = @service.get_user_message('me', message_id)
 
         process_email_block.call result, i, i == @message_ids.length-1, message_id
 

data/lib/navi_client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: navi_email_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sanjib
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-25 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler