feat: fixing bug for refresh token

Author: Encore Shao

CHANGELOG.md

@@ -23,7 +23,7 @@
   - get profile `client.contacts`
   - get contacts data with next link `client.contacts({next_link: 'xxx'})`
 
-## [0.1.4] - (2022-10-26)
+## [0.1.5] - (2022-10-27)
 
 - Generate URLs for token and able to refresh token
   - get authorize URL `client.authorize_url`

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-office365 (0.1.4)
+    ruby-office365 (0.1.5)
       faraday
       faraday_middleware
 

README.md

@@ -135,7 +135,13 @@ irb(main):018:0> response[:results][0].as_json
 **Refresh User Token**
 
 ```ruby
-irb(main):005:0> client.refresh_token!
+irb(main):005:0> response = client.refresh_token!
+irb(main):005:0> response.scope
+=> "openid User.Read profile email"
+irb(main):005:0> response.access_token
+=> "eyJ0eXAiOiJKV1QiLCJub25jZSI6ImFDYUladFJ6M3RSc3dFaktxUHdGbF9kVlFmbjJabG85Mjlkb2xaeFBhZm8iLCJhbGciOiJSUzI1NiIsIng1dCI6IjJaUXBKM1VwYmpBWVhZR2FYRUpsOGxWMFRPSSIsImtpZCI6IjJaUXBKM1VwYmpBWVhZR2FYRUpsOGxWMFRPSSJ9..."
+irb(main):005:0> response.refresh_token
+=> "0.ARgA7EiQdLv1qECnFqPfrznKsT9ERYaGfG9Ki5WzQtEllj8YAJk.AgABAAEAAAD--DLA3VO7QrddgJg7WevrAgDs_wQA9P-Q1ODlBsrdZi-5s2mfLtEsavBgiEhGcz1KEf26fMrGFU3LM_og5l6wjSAtQ83XHLuje0_KYGol26_LGV_uH0F1MwCFR1N3ctwg4_...."
 ```
 
 ## Copyright

bin/console

@@ -8,8 +8,8 @@ require "office365"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+# require "irb"
+# IRB.start(__FILE__)

lib/office365.rb

@@ -8,13 +8,14 @@
 require "office365/models"
 
 module Office365
+  class Error < StandardError; end
+  class InvalidAuthenticationTokenError < StandardError; end
+  class InvaliRequestError < StandardError; end
+
   API_HOST      = "https://graph.microsoft.com"
   API_VERSION   = "v1.0"
 
   LOGIN_HOST    = "https://login.microsoftonline.com"
-  SCOPE         = "User.read Calendars.read Mail.ReadBasic Contacts.Read"
-
-  class Error < StandardError; end
-  class InvalidAuthenticationTokenError < StandardError; end
+  SCOPE         = "offline_access User.read Calendars.read Mail.ReadBasic Contacts.Read"
   # Your code goes here...
 end

lib/office365/models.rb

@@ -10,5 +10,6 @@ module Models
     autoload :Owner,              "office365/models/owner"
     autoload :EmailAddress,       "office365/models/email_address"
     autoload :Contact,            "office365/models/contact"
+    autoload :AccessToken,        "office365/models/access_token"
   end
 end

lib/office365/models/access_token.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Office365
+  module Models
+    class AccessToken < Base
+      # attr_accessor :token_type, :scope, :expires_in, :ext_expires_in, :access_token, :refresh_token
+    end
+  end
+end

lib/office365/rest/request.rb

@@ -16,37 +16,41 @@ def initialize(access_token, debug: false)
       end
 
       def get(uri, args: {})
-        r_uri = URI(uri.start_with?("https") ? uri : (Office365::API_HOST + uri))
+        req_url = URI(uri.start_with?("https") ? uri : (Office365::API_HOST + uri))
 
-        response = Faraday.new(url: [r_uri.scheme, "://", r_uri.hostname].join, headers: headers) do |faraday|
+        response = Faraday.new(url: [req_url.scheme, "://", req_url.hostname].join, headers: headers) do |faraday|
           faraday.adapter Faraday.default_adapter
           faraday.response :json
           faraday.response :logger, ::Logger.new($stdout), bodies: true if dev_developement?
-        end.get(r_uri.request_uri, *args)
+        end.get(req_url.request_uri, *args)
 
-        resp_body = response.body
-        return resp_body if response.status == 200
-        raise InvalidAuthenticationTokenError, resp_body.dig("error", "message") if response.status == 401
-
-        raise Error, resp_body["error"]
+        parse_respond(response)
       end
 
       def post(uri, args)
-        response = Faraday.new(url: Office365::API_HOST, headers: headers) do |faraday|
+        req_url = URI(uri.start_with?("https") ? uri : (Office365::API_HOST + uri))
+
+        response = Faraday.new(url: [req_url.scheme, "://", req_url.hostname].join, headers: post_headers) do |faraday|
           faraday.adapter Faraday.default_adapter
           faraday.response :json
           faraday.response :logger, ::Logger.new($stdout), bodies: true if dev_developement?
-        end.post(uri, args)
+        end.post(req_url.request_uri, args.to_query)
+
+        parse_respond(response)
+      end
 
+      private
+
+      def parse_respond(response)
         resp_body = response.body
+
         return resp_body if response.status == 200
         raise InvalidAuthenticationTokenError, resp_body.dig("error", "message") if response.status == 401
+        raise InvaliRequestError, resp_body["error_description"] if response.status == 400
 
         raise Error, resp_body["error"]
       end
 
-      private
-
       def headers
         {
           "Content-Type" => "application/json",
@@ -57,6 +61,12 @@ def headers
       def dev_developement?
         debug
       end
+
+      def post_headers
+        {
+          "Content-Type" => "application/x-www-form-urlencoded"
+        }
+      end
     end
   end
 end

lib/office365/rest/token.rb

@@ -23,13 +23,20 @@ def token_url
       end
 
       def refresh_token!
-        post(token_url, {
-               refresh_token: refresh_token,
-               client_id: client_id,
-               client_secret: client_secret,
-               grant_type: "refresh_token",
-               scope: Office365::SCOPE
-             })
+        Models::AccessToken.new(
+          Request.new(nil, debug: debug).post(token_url, token_params)
+        )
+      end
+
+      private
+
+      def token_params
+        {
+          refresh_token: refresh_token,
+          client_id: client_id,
+          client_secret: client_secret,
+          grant_type: "refresh_token"
+        }
       end
     end
   end

lib/office365/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Office365
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end