ruby-office365 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09f37ce4e6f4c9db6d9e1f12d1b53508fc7dcd9b5efa204582a7164764905796'
-  data.tar.gz: f5cdfb070ba62cfbd96e81f801e3e2dc8f5584115338ad85c92d9dae86710e6b
+  metadata.gz: 86ee47df4ac96c36024adb5c0595afa78889dc9659aebcdbdf01a59e407a0db9
+  data.tar.gz: 42ab9271c0d32b6035ad9caecc837137774bde57d0894fd49f34782d8c0f1f1b
 SHA512:
-  metadata.gz: 8bb8b810b6aa38e89b2e906e3e7dffcfc63291edd0687dade41f41e7e9a7d3e1ff0f546f5e63ec5339fbe439ed75a06cbc48b11bfc38d8eb7dd45ee4535d6ebb
-  data.tar.gz: 505e05289637208d656904933e93e8123f3fc0355988cc23edbab27830627f24bb894a441ad389405bccbd733cd91641138310c28eb80a54a26695e9ad1511f0
+  metadata.gz: 8dd5a3b6d974b91bf6c2846b1b9b3f433fcc1abe11d6dfc85f3fe3a7b023313db0079b6056a1e27d3d8a36506a434a4ef0e45f327f4d2dd25b0416f681ff5906
+  data.tar.gz: fc2997832814ec584184584546ca7443841914191056f5fd3c080017cf21b273a05f9dd5612b928ad7570fb3cbc202ff0cbaba01e86a62b250c409f1e87776b9

data/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`

data/Gemfile.lock

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

data/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

data/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

data/lib/office365/models.rb

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

data/lib/office365/rest/request.rb

@@ -16,37 +16,41 @@ module Office365
       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 @@ module Office365
       def dev_developement?
         debug
       end
+
+      def post_headers
+        {
+          "Content-Type" => "application/x-www-form-urlencoded"
+        }
+      end
     end
   end
 end

data/lib/office365/rest/token.rb

@@ -23,13 +23,20 @@ module Office365
       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

data/lib/office365/version.rb

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

data/lib/office365.rb

@@ -8,13 +8,14 @@ require "office365/rest"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-office365
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Encore Shao
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -113,6 +113,7 @@ files:
 - lib/office365.rb
 - lib/office365/client.rb
 - lib/office365/models.rb
+- lib/office365/models/access_token.rb
 - lib/office365/models/calendar.rb
 - lib/office365/models/concerns/base.rb
 - lib/office365/models/contact.rb