ruby-office365 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2c2997d3d775d3450dd11a6774e3edee59fc22b307b85b7d525ac561cd19eeb
-  data.tar.gz: 02bf02e037717417d889e4a81bbead7ead87210390adfb57f9d1643d851b905e
+  metadata.gz: 86ee47df4ac96c36024adb5c0595afa78889dc9659aebcdbdf01a59e407a0db9
+  data.tar.gz: 42ab9271c0d32b6035ad9caecc837137774bde57d0894fd49f34782d8c0f1f1b
 SHA512:
-  metadata.gz: e33d6e7f5d01292a86ecfd6dd70b432f8d4ed88cccdc427a2c09a0c9506610242444a1f49bf48f1c95a306213c7d11d995af5dabcb0fc76073749ea8d0aca14a
-  data.tar.gz: 707cd85b26cf08352590ae658cc76f981b0cca8a8c3ded186d44cc712e4ee334bf6ef59bc89ac5097f33441e4ea4c49f7f306dcd51d87d300832650fe25bdeb2
+  metadata.gz: 8dd5a3b6d974b91bf6c2846b1b9b3f433fcc1abe11d6dfc85f3fe3a7b023313db0079b6056a1e27d3d8a36506a434a4ef0e45f327f4d2dd25b0416f681ff5906
+  data.tar.gz: fc2997832814ec584184584546ca7443841914191056f5fd3c080017cf21b273a05f9dd5612b928ad7570fb3cbc202ff0cbaba01e86a62b250c409f1e87776b9

data/.rubocop.yml

@@ -20,3 +20,6 @@ Style/Documentation:
 
 Metrics/BlockLength:
   Max: 150
+
+Metrics/MethodLength:
+  Max: 50

data/CHANGELOG.md

@@ -21,4 +21,11 @@
 
 - Integrate REST API to get contacts
   - get profile `client.contacts`
-  - get contacts data with next link `client.contacts({next_link: 'xxx'})`
+  - get contacts data with next link `client.contacts({next_link: 'xxx'})`
+
+## [0.1.5] - (2022-10-27)
+
+- Generate URLs for token and able to refresh token
+  - get authorize URL `client.authorize_url`
+  - get token URL `client.token_url`
+  - be able to refresh token `client.refresh_token!`

data/Gemfile.lock

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

data/README.md

@@ -132,6 +132,18 @@ irb(main):018:0> response[:results][0].as_json
 }
 ```
 
+**Refresh User Token**
+
+```ruby
+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
 
 Copyright (c) 2022 Encore Shao. See LICENSE for details.

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

@@ -3,29 +3,41 @@
 module Office365
   module REST
     module Token
-      def token_refresh
-        args = {
-          refresh_token: refresh_token,
+      def authorize_url
+        base_uri = [LOGIN_HOST, "/#{tenant_id}/oauth2/v2.0/authorize"].join
+        azure_params = {
           client_id: client_id,
           client_secret: client_secret,
-          grant_type: "refresh_token"
-        }
+          scope: Office365::SCOPE,
+          response_type: "code",
+          response_mode: "query",
+          redirect_uri: redirect_uri,
+          state: SecureRandom.hex
+        }.to_query
 
-        post(oauth_client.token_url, args)
+        [base_uri, "?", azure_params].join
       end
 
-      private
+      def token_url
+        [LOGIN_HOST, "/#{tenant_id}/oauth2/v2.0/token"].join
+      end
 
-      def oauth_client
-        @oauth_client ||= OAuth2::Client.new(
-          client_id,
-          client_secret,
-          authorize_url: AUTHORIZE_URL,
-          site: LOGIN_HOST,
-          token_url: TOKEN_URL,
-          redirect_uri: redirect_uri
+      def refresh_token!
+        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
 end

data/lib/office365/version.rb

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

data/lib/office365.rb

@@ -8,15 +8,14 @@ require "office365/rest"
 require "office365/models"
 
 module Office365
-  API_HOST      = "https://graph.microsoft.com"
-  LOGIN_HOST    = "https://login.microsoftonline.com/"
+  class Error < StandardError; end
+  class InvalidAuthenticationTokenError < StandardError; end
+  class InvaliRequestError < StandardError; end
 
-  AUTHORIZE_URL = "common/oauth2/authorize"
-  TOKEN_URL     = "common/oauth2/token"
+  API_HOST      = "https://graph.microsoft.com"
   API_VERSION   = "v1.0"
-  SCOPE         = "User.read Calendars.read Mail.ReadBasic Contacts.Read"
 
-  class Error < StandardError; end
-  class InvalidAuthenticationTokenError < StandardError; end
+  LOGIN_HOST    = "https://login.microsoftonline.com"
+  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.3
+  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