Refactor Shopify class to streamline token and router properties

vapor-community · Nov 22, 2024 · 87c761b · 87c761b
1 parent cc43d63
commit 87c761b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Sources/ImperialShopify/Shopify.swift b/Sources/ImperialShopify/Shopify.swift
@@ -2,10 +2,8 @@
 import Vapor
 
 public final class Shopify: FederatedService {
-    public var tokens: any FederatedServiceTokens { self.router.tokens }
-    public var router: any FederatedServiceRouter { self.shopifyRouter }
-
-    public let shopifyRouter: ShopifyRouter
+    public let tokens: any FederatedServiceTokens
+    public let router: any FederatedServiceRouter
 
     public init(
         routes: some RoutesBuilder,
@@ -15,7 +13,8 @@ public final class Shopify: FederatedService {
         scope: [String],
         completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
-        self.shopifyRouter = try ShopifyRouter(callback: callback, scope: scope, completion: completion)
+        self.router = try ShopifyRouter(callback: callback, scope: scope, completion: completion)
+        self.tokens = self.router.tokens
 
         try self.router.configureRoutes(
             withAuthURL: authenticate,

diff --git a/Sources/ImperialShopify/ShopifyRouter.swift b/Sources/ImperialShopify/ShopifyRouter.swift
@@ -48,7 +48,8 @@ final public class ShopifyRouter: FederatedServiceRouter {
         ShopifyCallbackBody(
             code: code,
             clientId: tokens.clientID,
-            clientSecret: tokens.clientSecret)
+            clientSecret: tokens.clientSecret
+        )
     }
 
     /// Gets an access token from an OAuth provider.