Update sdk state initialization

src/@sdk/api/Auth/index.ts

@@ -102,6 +102,10 @@ export class AuthAPI extends ErrorListener {
       );
     }
 
+    await this.jobsManager.run("checkout", "provideCheckout", {
+      isUserSignedIn: !!data?.user,
+    });
+
     return {
       data,
       dataError,

src/@sdk/api/Auth/types.ts

@@ -1,4 +1,5 @@
 export enum FunctionErrorAuthTypes {}
 export enum DataErrorAuthTypes {
   "SIGN_IN",
+  "GET_USER",
 }

src/@sdk/api/Checkout/index.ts

@@ -1,3 +1,4 @@
+import { PaymentGateway } from "@sdk/fragments/gqlTypes/PaymentGateway";
 import { ErrorListener } from "@sdk/helpers";
 import {
   ICheckoutModel,
@@ -12,7 +13,6 @@ import {
   DataErrorCheckoutTypes,
   FunctionErrorCheckoutTypes,
   IAddress,
-  IAvailablePaymentGateways,
   IAvailableShippingMethods,
   ICheckout,
   ICreditCard,
@@ -28,7 +28,7 @@ export class SaleorCheckoutAPI extends ErrorListener {
   selectedShippingAddressId?: string;
   selectedBillingAddressId?: string;
   availableShippingMethods?: IAvailableShippingMethods;
-  availablePaymentGateways?: IAvailablePaymentGateways;
+  availablePaymentGateways?: PaymentGateway[];
   payment?: IPayment;
 
   private saleorState: SaleorState;
@@ -95,7 +95,7 @@ export class SaleorCheckoutAPI extends ErrorListener {
     );
     this.saleorState.subscribeToChange(
       StateItems.PAYMENT_GATEWAYS,
-      (paymentGateways: IAvailablePaymentGateways) => {
+      (paymentGateways: PaymentGateway[]) => {
         console.log("StateItems.PAYMENT_GATEWAYS", paymentGateways);
         this.availablePaymentGateways = paymentGateways;
       }

src/@sdk/api/Checkout/types.ts

@@ -27,7 +27,6 @@ export interface IAddress {
 }
 
 export type IAvailableShippingMethods = Checkout_availableShippingMethods[];
-export type IAvailablePaymentGateways = GetShopPaymentGateways_shop_availablePaymentGateways[];
 
 export interface IShippingMethod {
   id: string;

src/@sdk/api/index.ts

@@ -45,17 +45,18 @@ export class SaleorAPI {
 
     const localStorageHandler = new LocalStorageHandler();
     const apolloClientManager = new ApolloClientManager(client);
-    const saleorState = new SaleorState(
+    const jobsManager = new JobsManager(
       localStorageHandler,
       apolloClientManager
     );
-    const localStorageManager = new LocalStorageManager(
+    const saleorState = new SaleorState(
       localStorageHandler,
-      saleorState
+      apolloClientManager,
+      jobsManager
     );
-    const jobsManager = new JobsManager(
+    const localStorageManager = new LocalStorageManager(
       localStorageHandler,
-      apolloClientManager
+      saleorState
     );
 
     if (onStateUpdate) {

src/@sdk/auth.ts

@@ -18,11 +18,6 @@ export function setAuthToken(token: string) {
   dispatchEvent(authEvent);
 }
 
-export function removeAuthToken() {
-  localStorage.removeItem("token");
-  dispatchEvent(authEvent);
-}
-
 export function clearStorage(): void {
   localStorage.clear();
   dispatchEvent(authEvent);

src/@sdk/data/ApolloClientManager/index.ts

@@ -3,6 +3,7 @@ import ApolloClient from "apollo-client";
 import { Checkout } from "@sdk/fragments/gqlTypes/Checkout";
 import { OrderDetail } from "@sdk/fragments/gqlTypes/OrderDetail";
 import { Payment } from "@sdk/fragments/gqlTypes/Payment";
+import { PaymentGateway } from "@sdk/fragments/gqlTypes/PaymentGateway";
 import { User } from "@sdk/fragments/gqlTypes/User";
 import { CountryCode } from "@sdk/gqlTypes/globalTypes";
 import {
@@ -94,6 +95,23 @@ export class ApolloClientManager {
       .subscribe(value => next(value.data?.me), error, complete);
   };
 
+  subscribeToPaymentGatewaysChange = (
+    next: (value: PaymentGateway[] | null) => void,
+    error?: (error: any) => void,
+    complete?: () => void
+  ) => {
+    this.client
+      .watchQuery<GetShopPaymentGateways, any>({
+        fetchPolicy: "cache-only",
+        query: ShopQueries.getShopPaymentGateways,
+      })
+      .subscribe(
+        value => next(value.data.shop?.availablePaymentGateways),
+        error,
+        complete
+      );
+  };
+
   getUser = async () => {
     const { data, errors } = await this.client.query<UserDetails, any>({
       fetchPolicy: "network-only",
@@ -342,41 +360,23 @@ export class ApolloClientManager {
   };
 
   getPaymentGateways = async () => {
-    let paymentGateways:
-      | GetShopPaymentGateways_shop_availablePaymentGateways[]
-      | null;
-    try {
-      paymentGateways = await new Promise((resolve, reject) => {
-        const observable = this.client.watchQuery<GetShopPaymentGateways, any>({
-          fetchPolicy: "network-only",
-          query: ShopQueries.getShopPaymentGateways,
-        });
-        observable.subscribe(
-          result => {
-            const { data, errors } = result;
-            if (errors?.length) {
-              reject(errors);
-            } else {
-              resolve(data.shop.availablePaymentGateways);
-            }
-          },
-          error => {
-            reject(error);
-          }
-        );
-      });
+    const { data, errors } = await this.client.query<
+      GetShopPaymentGateways,
+      any
+    >({
+      fetchPolicy: "network-only",
+      query: ShopQueries.getShopPaymentGateways,
+    });
 
-      if (paymentGateways) {
-        return {
-          data: paymentGateways,
-        };
-      }
-    } catch (error) {
+    if (errors?.length) {
       return {
-        error,
+        error: errors,
+      };
+    } else {
+      return {
+        data: data.shop.availablePaymentGateways,
       };
     }
-    return {};
   };
 
   createCheckout = async (

src/@sdk/fragments/gqlTypes/PaymentGateway.ts

@@ -0,0 +1,35 @@
+/* tslint:disable */
+/* eslint-disable */
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL fragment: PaymentGateway
+// ====================================================
+
+export interface PaymentGateway_config {
+  __typename: "GatewayConfigLine";
+  /**
+   * Gateway config key.
+   */
+  field: string;
+  /**
+   * Gateway config value for key.
+   */
+  value: string | null;
+}
+
+export interface PaymentGateway {
+  __typename: "PaymentGateway";
+  /**
+   * Payment gateway ID.
+   */
+  id: string;
+  /**
+   * Payment gateway name.
+   */
+  name: string;
+  /**
+   * Payment gateway client configuration.
+   */
+  config: PaymentGateway_config[];
+}

src/@sdk/fragments/shop.ts

@@ -0,0 +1,12 @@
+import gql from "graphql-tag";
+
+export const paymentGatewayFragment = gql`
+  fragment PaymentGateway on PaymentGateway {
+    id
+    name
+    config {
+      field
+      value
+    }
+  }
+`;

src/@sdk/jobs/Auth/AuthJobs.ts

@@ -1,3 +1,4 @@
+import { DataErrorCheckoutTypes } from "@sdk/api/Checkout/types";
 import { ApolloClientManager } from "@sdk/data/ApolloClientManager";
 import { LocalStorageHandler } from "@sdk/helpers/LocalStorageHandler";
 import {
@@ -6,7 +7,6 @@ import {
 } from "@temp/@sdk/api/Auth/types";
 
 import { JobRunResponse } from "../types";
-import { DataErrorCheckoutTypes } from "@temp/@sdk/api/Checkout/types";
 
 export type PromiseAuthJobRunResponse = Promise<
   JobRunResponse<
@@ -27,6 +27,23 @@ export class AuthJobs {
     this.localStorageHandler = localStorageHandler;
   }
 
+  provideUser = async (): PromiseAuthJobRunResponse => {
+    const { data, error } = await this.apolloClientManager.getUser();
+
+    if (error) {
+      return {
+        dataError: {
+          error,
+          type: DataErrorAuthTypes.GET_USER,
+        },
+      };
+    }
+
+    return {
+      data,
+    };
+  };
+
   signIn = async ({
     email,
     password,
@@ -50,22 +67,6 @@ export class AuthJobs {
 
     this.localStorageHandler.setSignInToken(data?.token || null);
 
-    const {
-      data: checkoutData,
-      error: checkoutError,
-    } = await this.apolloClientManager.getCheckout(true, null);
-
-    if (checkoutError) {
-      return {
-        dataError: {
-          error: checkoutError,
-          type: DataErrorCheckoutTypes.GET_CHECKOUT,
-        },
-      };
-    } else if (checkoutData) {
-      this.localStorageHandler.setCheckout(checkoutData);
-    }
-
     return {
       data,
     };

src/@sdk/jobs/Checkout/CheckoutJobs.ts

@@ -26,6 +26,51 @@ export class CheckoutJobs {
     this.localStorageHandler = localStorageHandler;
   }
 
+  provideCheckout = async ({
+    isUserSignedIn,
+  }: {
+    isUserSignedIn: boolean;
+  }): PromiseCheckoutJobRunResponse => {
+    const checkout = this.localStorageHandler.getCheckout();
+
+    const { data, error } = await this.apolloClientManager.getCheckout(
+      isUserSignedIn,
+      checkout?.token
+    );
+
+    if (error) {
+      return {
+        dataError: {
+          error,
+          type: DataErrorCheckoutTypes.GET_CHECKOUT,
+        },
+      };
+    } else {
+      this.localStorageHandler.setCheckout(data || checkout);
+
+      return {
+        data,
+      };
+    }
+  };
+
+  providePaymentGateways = async (): PromiseCheckoutJobRunResponse => {
+    const { data, error } = await this.apolloClientManager.getPaymentGateways();
+
+    if (error) {
+      return {
+        dataError: {
+          error,
+          type: DataErrorCheckoutTypes.GET_PAYMENT_GATEWAYS,
+        },
+      };
+    }
+
+    return {
+      data,
+    };
+  };
+
   createCheckout = async ({
     email,
     lines,

src/@sdk/mutations/gqlTypes/TokenAuth.ts

@@ -182,7 +182,7 @@ export interface TokenAuth_tokenCreate {
 export interface TokenAuth {
   /**
    * Mutation that authenticates a user and returns token and user data.
-   *
+   * 
    * It overrides the default graphql_jwt.ObtainJSONWebToken to wrap potential
    * authentication errors in our Error type, which is consistent to how the rest of
    * the mutation works.

src/@sdk/queries/shop.ts

@@ -1,4 +1,5 @@
 import gql from "graphql-tag";
+import { paymentGatewayFragment } from "../fragments/shop";
 
 export const getShop = gql`
   query GetShop {
@@ -23,15 +24,11 @@ export const getShop = gql`
 `;
 
 export const getShopPaymentGateways = gql`
+  ${paymentGatewayFragment}
   query GetShopPaymentGateways {
     shop {
       availablePaymentGateways {
-        id
-        name
-        config {
-          field
-          value
-        }
+        ...PaymentGateway
       }
     }
   }