Merge pull request 'Fix duplicate Apple IAP selection' (#263) from loewy/fix-duplicate-apple-iap-selection into master

Reviewed-on: #263

src/index.tsx

@@ -83,6 +83,7 @@ export type AppleIapSubscriptionOptionsGql = {
   __typename?: "AppleIapSubscriptionOptionsGQL";
   enabled: Scalars["Boolean"]["output"];
   proMonthlyProductId?: Maybe<Scalars["String"]["output"]>;
+  productIds: Array<Scalars["String"]["output"]>;
 };
 
 export type BankFeaturesGql = {
@@ -3679,6 +3680,7 @@ export type VideoGql = {
 
 export type VideoHistoryGql = {
   __typename?: "VideoHistoryGQL";
+  followingCount: Scalars["Int"]["output"];
   hasFollowing: Scalars["Boolean"]["output"];
   pageInfo: PageInfoGql;
   videos: Array<VideoGql>;
@@ -4508,6 +4510,7 @@ export type GetVideoFeedQuery = {
   getFeedVideos: {
     __typename?: "VideoHistoryGQL";
     hasFollowing: boolean;
+    followingCount: number;
     videos: Array<{
       __typename?: "VideoGQL";
       id: number;
@@ -5055,6 +5058,12 @@ export type GetAvailableSubscriptionOptionsQuery = {
         active: boolean;
       }>;
     }>;
+    appleIap: {
+      __typename?: "AppleIapSubscriptionOptionsGQL";
+      enabled: boolean;
+      proMonthlyProductId?: string | null;
+      productIds: Array<string>;
+    };
   };
 };
 
@@ -5067,6 +5076,9 @@ export type GetSubscriptionStatusQuery = {
   getUserSubscriptionStatus: {
     __typename?: "UserSubscriptionStatusGQL";
     hasActiveSubscription: boolean;
+    entitlementSource?: EntitlementSourceTypeEnum | null;
+    entitlementStartsAt?: any | null;
+    entitlementEndsAt?: any | null;
     subscriptionStatus?: StripeSubscriptionStatusEnum | null;
     currentPeriodStart?: any | null;
     currentPeriodEnd?: any | null;
@@ -5076,6 +5088,38 @@ export type GetSubscriptionStatusQuery = {
   };
 };
 
+export type GetAppleAppAccountTokenQueryVariables = Exact<{
+  [key: string]: never;
+}>;
+
+export type GetAppleAppAccountTokenQuery = {
+  __typename?: "Query";
+  getAppleAppAccountToken: string;
+};
+
+export type SyncAppleSubscriptionMutationVariables = Exact<{
+  signedTransactionInfo: Scalars["String"]["input"];
+}>;
+
+export type SyncAppleSubscriptionMutation = {
+  __typename?: "Mutation";
+  syncAppleSubscription: {
+    __typename?: "SyncAppleSubscriptionResultGQL";
+    ok: boolean;
+    errorCode?: string | null;
+    errorMessage?: string | null;
+    hasActiveSubscription: boolean;
+    entitlementSource?: EntitlementSourceTypeEnum | null;
+    entitlementStartsAt?: any | null;
+    entitlementEndsAt?: any | null;
+    appleStatus?: number | null;
+    originalTransactionId?: string | null;
+    latestTransactionId?: string | null;
+    productId?: string | null;
+    expiresAt?: any | null;
+  };
+};
+
 export type CancelSubscriptionMutationVariables = Exact<{
   [key: string]: never;
 }>;
@@ -5085,6 +5129,9 @@ export type CancelSubscriptionMutation = {
   cancelSubscription: {
     __typename?: "UserSubscriptionStatusGQL";
     hasActiveSubscription: boolean;
+    entitlementSource?: EntitlementSourceTypeEnum | null;
+    entitlementStartsAt?: any | null;
+    entitlementEndsAt?: any | null;
     subscriptionStatus?: StripeSubscriptionStatusEnum | null;
     currentPeriodStart?: any | null;
     currentPeriodEnd?: any | null;
@@ -9478,6 +9525,7 @@ export const GetVideoFeedDocument = gql`
         endCursor
       }
       hasFollowing
+      followingCount
     }
   }
   ${VideoCardFieldsFragmentDoc}
@@ -10658,6 +10706,11 @@ export const GetAvailableSubscriptionOptionsDocument = gql`
           active
         }
       }
+      appleIap {
+        enabled
+        proMonthlyProductId
+        productIds
+      }
     }
   }
 `;
@@ -10730,6 +10783,9 @@ export const GetSubscriptionStatusDocument = gql`
   query GetSubscriptionStatus {
     getUserSubscriptionStatus {
       hasActiveSubscription
+      entitlementSource
+      entitlementStartsAt
+      entitlementEndsAt
       subscriptionStatus
       currentPeriodStart
       currentPeriodEnd
@@ -10804,10 +10860,146 @@ export type GetSubscriptionStatusQueryResult = Apollo.QueryResult<
   GetSubscriptionStatusQuery,
   GetSubscriptionStatusQueryVariables
 >;
+export const GetAppleAppAccountTokenDocument = gql`
+  query GetAppleAppAccountToken {
+    getAppleAppAccountToken
+  }
+`;
+
+/**
+ * __useGetAppleAppAccountTokenQuery__
+ *
+ * To run a query within a React component, call `useGetAppleAppAccountTokenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetAppleAppAccountTokenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetAppleAppAccountTokenQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetAppleAppAccountTokenQuery(
+  baseOptions?: Apollo.QueryHookOptions<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >(GetAppleAppAccountTokenDocument, options);
+}
+export function useGetAppleAppAccountTokenLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >(GetAppleAppAccountTokenDocument, options);
+}
+export function useGetAppleAppAccountTokenSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetAppleAppAccountTokenQuery,
+    GetAppleAppAccountTokenQueryVariables
+  >(GetAppleAppAccountTokenDocument, options);
+}
+export type GetAppleAppAccountTokenQueryHookResult = ReturnType<
+  typeof useGetAppleAppAccountTokenQuery
+>;
+export type GetAppleAppAccountTokenLazyQueryHookResult = ReturnType<
+  typeof useGetAppleAppAccountTokenLazyQuery
+>;
+export type GetAppleAppAccountTokenSuspenseQueryHookResult = ReturnType<
+  typeof useGetAppleAppAccountTokenSuspenseQuery
+>;
+export type GetAppleAppAccountTokenQueryResult = Apollo.QueryResult<
+  GetAppleAppAccountTokenQuery,
+  GetAppleAppAccountTokenQueryVariables
+>;
+export const SyncAppleSubscriptionDocument = gql`
+  mutation SyncAppleSubscription($signedTransactionInfo: String!) {
+    syncAppleSubscription(
+      input: { signedTransactionInfo: $signedTransactionInfo }
+    ) {
+      ok
+      errorCode
+      errorMessage
+      hasActiveSubscription
+      entitlementSource
+      entitlementStartsAt
+      entitlementEndsAt
+      appleStatus
+      originalTransactionId
+      latestTransactionId
+      productId
+      expiresAt
+    }
+  }
+`;
+export type SyncAppleSubscriptionMutationFn = Apollo.MutationFunction<
+  SyncAppleSubscriptionMutation,
+  SyncAppleSubscriptionMutationVariables
+>;
+
+/**
+ * __useSyncAppleSubscriptionMutation__
+ *
+ * To run a mutation, you first call `useSyncAppleSubscriptionMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useSyncAppleSubscriptionMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [syncAppleSubscriptionMutation, { data, loading, error }] = useSyncAppleSubscriptionMutation({
+ *   variables: {
+ *      signedTransactionInfo: // value for 'signedTransactionInfo'
+ *   },
+ * });
+ */
+export function useSyncAppleSubscriptionMutation(
+  baseOptions?: Apollo.MutationHookOptions<
+    SyncAppleSubscriptionMutation,
+    SyncAppleSubscriptionMutationVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useMutation<
+    SyncAppleSubscriptionMutation,
+    SyncAppleSubscriptionMutationVariables
+  >(SyncAppleSubscriptionDocument, options);
+}
+export type SyncAppleSubscriptionMutationHookResult = ReturnType<
+  typeof useSyncAppleSubscriptionMutation
+>;
+export type SyncAppleSubscriptionMutationResult =
+  Apollo.MutationResult<SyncAppleSubscriptionMutation>;
+export type SyncAppleSubscriptionMutationOptions = Apollo.BaseMutationOptions<
+  SyncAppleSubscriptionMutation,
+  SyncAppleSubscriptionMutationVariables
+>;
 export const CancelSubscriptionDocument = gql`
   mutation CancelSubscription {
     cancelSubscription {
       hasActiveSubscription
+      entitlementSource
+      entitlementStartsAt
+      entitlementEndsAt
       subscriptionStatus
       currentPeriodStart
       currentPeriodEnd

src/operations/feed.gql

@@ -146,5 +146,6 @@ query GetVideoFeed(
       endCursor
     }
     hasFollowing
+    followingCount
   }
 }

src/operations/payments.gql

@@ -44,12 +44,20 @@ query GetAvailableSubscriptionOptions {
         active
       }
     }
+    appleIap {
+      enabled
+      proMonthlyProductId
+      productIds
+    }
   }
 }
 
 query GetSubscriptionStatus {
   getUserSubscriptionStatus {
     hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
     subscriptionStatus
     currentPeriodStart
     currentPeriodEnd
@@ -59,9 +67,35 @@ query GetSubscriptionStatus {
   }
 }
 
+query GetAppleAppAccountToken {
+  getAppleAppAccountToken
+}
+
+mutation SyncAppleSubscription($signedTransactionInfo: String!) {
+  syncAppleSubscription(
+    input: { signedTransactionInfo: $signedTransactionInfo }
+  ) {
+    ok
+    errorCode
+    errorMessage
+    hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
+    appleStatus
+    originalTransactionId
+    latestTransactionId
+    productId
+    expiresAt
+  }
+}
+
 mutation CancelSubscription {
   cancelSubscription {
     hasActiveSubscription
+    entitlementSource
+    entitlementStartsAt
+    entitlementEndsAt
     subscriptionStatus
     currentPeriodStart
     currentPeriodEnd

src/schema.gql

@@ -732,6 +732,7 @@ type VideoHistoryGQL {
   videos: [VideoGQL!]!
   pageInfo: PageInfoGQL!
   hasFollowing: Boolean!
+  followingCount: Int!
 }
 
 type PageInfoGQL {
@@ -1033,6 +1034,7 @@ type StripePriceGQL {
 type AppleIapSubscriptionOptionsGQL {
   enabled: Boolean!
   proMonthlyProductId: String
+  productIds: [String!]!
 }
 
 type UserSubscriptionStatusGQL {