Modify migration helper input paramters

Author: zzooeeyy

docs/usage/oauth.md

@@ -14,7 +14,6 @@ For more information on authenticating a Shopify app please see the [Types of Au
   - [Authorization Code Grant](#authorization-code-grant)
   - [Client Credentials Grant](#client-credentials-grant)
 - [Expiring Offline Access Tokens](#expiring-offline-access-tokens)
-  - [Enabling Expiring Offline Access Tokens](#enabling-expiring-offline-access-tokens)
   - [Refreshing Access Tokens](#refreshing-access-tokens)
   - [Migrating Non-Expiring Tokens to Expiring Tokens](#migrating-non-expiring-tokens-to-expiring-tokens)
 - [Using OAuth Session to make authenticated API calls](#using-oauth-session-to-make-authenticated-api-calls)
@@ -398,7 +397,8 @@ If you have existing non-expiring offline access tokens and want to migrate them
 #### Input
 | Parameter      | Type     | Required? | Notes                                                                                           |
 | -------------- | -------- | :-------: | ----------------------------------------------------------------------------------------------- |
-| `non_expiring_offline_session` | `ShopifyAPI::Auth::Session` | Yes | A Session object containing the non-expiring offline access token to migrate. |
+| `shop`         | `String` | Yes       | A Shopify domain name in the form `{exampleshop}.myshopify.com`.                               |
+| `non_expiring_offline_token` | `String` | Yes | The non-expiring offline access token to migrate. |
 
 #### Output
 This method returns a new `ShopifyAPI::Auth::Session` object with an expiring access token and refresh token. Your app should store this new session to replace the non-expiring one.
@@ -411,7 +411,8 @@ def migrate_shop_to_expiring_offline_token(shop)
 
   # Migrate to expiring token
   new_session = ShopifyAPI::Auth::TokenExchange.migrate_to_expiring_token(
-    non_expiring_offline_session: old_session
+    shop: shop,
+    non_expiring_offline_token: old_session.access_token
   )
 
   # Store the new expiring session, replacing the old one

lib/shopify_api/auth/token_exchange.rb

@@ -81,26 +81,28 @@ def exchange_token(shop:, session_token:, requested_token_type:)
 
         sig do
           params(
-            non_expiring_offline_session: ShopifyAPI::Auth::Session,
+            shop: String,
+            non_expiring_offline_token: String,
           ).returns(ShopifyAPI::Auth::Session)
         end
-        def migrate_to_expiring_token(non_expiring_offline_session:)
+        def migrate_to_expiring_token(shop:, non_expiring_offline_token:)
           unless ShopifyAPI::Context.setup?
             raise ShopifyAPI::Errors::ContextNotSetupError,
               "ShopifyAPI::Context not setup, please call ShopifyAPI::Context.setup"
           end
 
+          shop_session = ShopifyAPI::Auth::Session.new(shop: shop)
           body = {
             client_id: ShopifyAPI::Context.api_key,
             client_secret: ShopifyAPI::Context.api_secret_key,
             grant_type: TOKEN_EXCHANGE_GRANT_TYPE,
-            subject_token: non_expiring_offline_session.access_token,
+            subject_token: non_expiring_offline_token,
             subject_token_type: RequestedTokenType::OFFLINE_ACCESS_TOKEN.serialize,
             requested_token_type: RequestedTokenType::OFFLINE_ACCESS_TOKEN.serialize,
             expiring: "1",
           }
 
-          client = Clients::HttpClient.new(session: non_expiring_offline_session, base_path: "/admin/oauth")
+          client = Clients::HttpClient.new(session: shop_session, base_path: "/admin/oauth")
           response = begin
             client.request(
               Clients::HttpRequest.new(
@@ -118,7 +120,7 @@ def migrate_to_expiring_token(non_expiring_offline_session:)
           session_params = T.cast(response.body, T::Hash[String, T.untyped]).to_h
 
           Session.from(
-            shop: non_expiring_offline_session.shop,
+            shop: shop,
             access_token_response: Oauth::AccessTokenResponse.from_hash(session_params),
           )
         end

test/auth/token_exchange_test.rb

@@ -231,24 +231,17 @@ def test_exchange_token_online_token
 
       def test_migrate_to_expiring_token_context_not_setup
         modify_context(api_key: "", api_secret_key: "", host: "")
-        non_expiring_session = ShopifyAPI::Auth::Session.new(
-          shop: @shop,
-          access_token: "old-offline-token-123",
-        )
 
         assert_raises(ShopifyAPI::Errors::ContextNotSetupError) do
           ShopifyAPI::Auth::TokenExchange.migrate_to_expiring_token(
-            non_expiring_offline_session: non_expiring_session,
+            shop: @shop,
+            non_expiring_offline_token: "old-offline-token-123",
           )
         end
       end
 
       def test_migrate_to_expiring_token_success
         non_expiring_token = "old-offline-token-123"
-        non_expiring_session = ShopifyAPI::Auth::Session.new(
-          shop: @shop,
-          access_token: non_expiring_token,
-        )
         migration_request = {
           client_id: ShopifyAPI::Context.api_key,
           client_secret: ShopifyAPI::Context.api_secret_key,
@@ -280,7 +273,8 @@ def test_migrate_to_expiring_token_success
 
         session = Time.stub(:now, @stubbed_time_now) do
           ShopifyAPI::Auth::TokenExchange.migrate_to_expiring_token(
-            non_expiring_offline_session: non_expiring_session,
+            shop: @shop,
+            non_expiring_offline_token: non_expiring_token,
           )
         end
 
@@ -289,10 +283,6 @@ def test_migrate_to_expiring_token_success
 
       def test_migrate_to_expiring_token_http_error
         non_expiring_token = "old-offline-token-123"
-        non_expiring_session = ShopifyAPI::Auth::Session.new(
-          shop: @shop,
-          access_token: non_expiring_token,
-        )
         migration_request = {
           client_id: ShopifyAPI::Context.api_key,
           client_secret: ShopifyAPI::Context.api_secret_key,
@@ -316,7 +306,8 @@ def test_migrate_to_expiring_token_http_error
 
         assert_raises(ShopifyAPI::Errors::HttpResponseError) do
           ShopifyAPI::Auth::TokenExchange.migrate_to_expiring_token(
-            non_expiring_offline_session: non_expiring_session,
+            shop: @shop,
+            non_expiring_offline_token: non_expiring_token,
           )
         end
       end