restiny 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9250ce97e7698687ee6cc64362dc0ff0cfe222115a544f60290dbccbfa4255b
-  data.tar.gz: a33846e9b1a017a1a357f0ea51aeaa74f71d296d02f61f1a1da68a89bcf90498
+  metadata.gz: 2d5b81f9aadd44def19fb9af625b26692992457edaf57eeba97b46896f26e032
+  data.tar.gz: f058584408a167934ae67f9e8c160f75e542f80558446ee312fa2ce34b763ace
 SHA512:
-  metadata.gz: 06d7bfcdd5a4263a4ac1db64ab4c55bf6986378fe5fa1a592616a2d03662f15f3cce91398b40a2fe3a03e2950c9eb8005bc64202980d1c4d41c4be54c82014d7
-  data.tar.gz: 7ec6297618ebaa28d3ef6f1ba5b96761a7beb04911201c2f80dd63aa671b48a072d0df9d4e26525ec962379245cbed3ff2d404b8d78efc541233eb0d9d8e12a4
+  metadata.gz: 5b737a79ec4728c34106b701db09f654c9d642cfd62b3ff311501a70afcf954f07ad92f0d1282c9a59686bffef568ef2b1fb5466e97cd267b389c1634c28b742
+  data.tar.gz: 99c7c3c4519a6a539a11a2970f18a38443ee4a9587b6df980cb74b03e425f1ce134e48c075af0d5b8d29339e086310eda6c44ac352e0b4daf80997923fded98b

data/lib/faraday/destiny/api.rb

@@ -7,11 +7,10 @@ module Faraday
 
     class Api < Middleware
       def on_complete(env)
-        return if env["response_body"].empty?
+        return if env["response_body"].empty? || !env["response_body"].dig("ErrorCode")
 
-        payload = JSON.parse(env["response_body"])
-        if payload["ErrorCode"] == 1
-          env[:body] = payload.dig("Response")
+        if env["response_body"]["ErrorCode"] == 1
+          env[:body] = env["response_body"].dig("Response")
           return
         end
 
@@ -25,9 +24,7 @@ module Faraday
             ::Restiny::Error
           end
 
-        raise klass.new(payload["Message"], payload["ErrorStatus"])
-      rescue JSON::ParserError
-        raise ::Restiny::ResponseError.new("Unable to parse API response")
+        raise klass.new(env["response_body"]["Message"], env["response_body"]["ErrorStatus"])
       end
     end
   end

data/lib/faraday/destiny/auth.rb

@@ -0,0 +1,21 @@
+require "faraday"
+require "restiny/errors"
+
+module Faraday
+  module Restiny
+    Faraday::Response.register_middleware(destiny_auth: "Faraday::Restiny::Auth")
+
+    class Auth < Middleware
+      def on_complete(env)
+        return if env["response_body"].empty? || env["url"].to_s !~ /oauth/
+
+        if env["response_body"]["error"]
+          raise ::Restiny::AuthenticationError.new(
+                  env["response_body"]["error_description"],
+                  env["response_body"]["error"]
+                )
+        end
+      end
+    end
+  end
+end

data/lib/restiny/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Restiny
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/restiny.rb

@@ -10,6 +10,7 @@ require "restiny/manifest"
 require "faraday"
 require "faraday/follow_redirects"
 require "faraday/destiny/api"
+require "faraday/destiny/auth"
 require "securerandom"
 
 module Restiny
@@ -30,7 +31,7 @@ module Restiny
     params = { response_type: "code", client_id: @oauth_client_id, state: @oauth_state }
     params[:redirect_url] = redirect_url unless redirect_url.nil?
 
-    connection.build_url(BUNGIE_URL + "/en/oauth/authorize", params).to_s
+    auth_connection.build_url(BUNGIE_URL + "/en/oauth/authorize/", params).to_s
   end
 
   def request_access_token(code:, redirect_url: nil)
@@ -39,17 +40,13 @@ module Restiny
     params = { code: code, grant_type: "authorization_code", client_id: @oauth_client_id }
     params[:redirect_url] = redirect_url unless redirect_url.nil?
 
-    connection.post(
-      "app/oauth/token",
-      params,
-      "Content-Type" => "application/x-www-form-urlencoded"
-    ).body
+    auth_post("app/oauth/token/", params)
   end
 
   # Manifest methods
 
   def get_manifest_url(locale: "en")
-    result = connection.get("Destiny2/Manifest/").body.dig("mobileWorldContentPaths", locale)
+    result = api_get("Destiny2/Manifest/").dig("mobileWorldContentPaths", locale)
     BUNGIE_URL + result
   end
 
@@ -71,7 +68,7 @@ module Restiny
     url += type_url if type_url
     url += "?components=#{components.join(",")}"
 
-    connection.get(url).body
+    api_get(url)
   end
 
   def get_character_profile(character_id:, membership_id:, membership_type:, components:)
@@ -79,7 +76,7 @@ module Restiny
       membership_id: membership_id,
       membership_type: membership_type,
       components: components,
-      type_url: "Character/#{character_id}"
+      type_url: "Character/#{character_id}/"
     )
   end
 
@@ -88,7 +85,7 @@ module Restiny
       membership_id: membership_id,
       membership_type: membership_type,
       components: components,
-      type_url: "Item/#{item_id}"
+      type_url: "Item/#{item_id}/"
     )
   end
 
@@ -96,8 +93,7 @@ module Restiny
 
   def get_user_memberships_by_id(membership_id, membership_type: Platform::ALL)
     raise Restiny::InvalidParamsError.new("Please provide a membership ID") if membership_id.nil?
-
-    connection.get("User/GetMembershipsById/#{membership_id}/#{membership_type}/").body
+    api_get("User/GetMembershipsById/#{membership_id}/#{membership_type}/")
   end
 
   def search_player_by_bungie_name(name, membership_type: Platform::ALL)
@@ -106,19 +102,33 @@ module Restiny
       raise Restiny::InvalidParamsError.new("You must provide a valid Bungie name")
     end
 
-    connection.post(
+    api_post(
       "Destiny2/SearchDestinyPlayerByBungieName/#{membership_type}/",
-      displayName: display_name,
-      displayNameCode: display_name_code
-    ).body
+      params: {
+        displayName: display_name,
+        displayNameCode: display_name_code
+      }
+    )
   end
 
   def search_users_by_global_name(name:, page: 0)
-    connection.post("User/Search/GlobalName/#{page}", displayNamePrefix: name).body
+    api_post("User/Search/GlobalName/#{page}/", params: { displayNamePrefix: name })
   end
 
   # General request methods
 
+  def api_get(url, params: {})
+    api_connection.get(url, params, token_header).body
+  end
+
+  def api_post(url, params: {})
+    api_connection.post(url, params, token_header).body
+  end
+
+  def auth_post(url, params)
+    auth_connection.post(url, params, "Content-Type" => "application/x-www-form-urlencoded").body
+  end
+
   private
 
   def check_oauth_client_id
@@ -126,24 +136,37 @@ module Restiny
   end
 
   def default_headers
-    {
-      "User-Agent": "restiny v#{Restiny::VERSION}",
-      "X-API-KEY": @api_key,
-      "Content-Type": "application/json"
-    }
+    { "User-Agent": "restiny v#{Restiny::VERSION}" }
   end
 
-  def connection
+  def api_connection
     raise Restiny::InvalidParamsError.new("You need to set an API key") unless @api_key
 
-    headers = default_headers
-    headers["authorization"] = "Bearer #{@oauth_token}" if @oauth_token
+    @connection ||=
+      Faraday.new(
+        url: API_BASE_URL,
+        headers: default_headers.merge("X-API-KEY": @api_key)
+      ) do |faraday|
+        faraday.request :url_encoded
+        faraday.request :json
+        faraday.response :follow_redirects
+        faraday.response :destiny_api
+        faraday.response :json
+      end
+  end
+
+  def auth_connection
+    @auth_connection ||=
+      Faraday.new(url: API_BASE_URL, headers: default_headers) do |faraday|
+        faraday.request :url_encoded
+        faraday.request :json
+        faraday.response :follow_redirects
+        faraday.response :destiny_auth
+        faraday.response :json
+      end
+  end
 
-    Faraday.new(url: API_BASE_URL, headers: headers) do |faraday|
-      faraday.request :url_encoded
-      faraday.request :json
-      faraday.response :follow_redirects
-      faraday.response :destiny_api
-    end
+  def token_header
+    {}.tap { |headers| headers["authorization"] = "Bearer #{@oauth_token}" if @oauth_token }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restiny
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-30 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/faraday/destiny/api.rb
+- lib/faraday/destiny/auth.rb
 - lib/restiny.rb
 - lib/restiny/constants.rb
 - lib/restiny/errors.rb