Compare commits

...

7 Commits

Author SHA1 Message Date
Dean Wenstrand
79979b001a Add bio field to user (UserFragment + editUser)
All checks were successful
Tests / Tests (pull_request) Successful in 10s
Expose UserGQL.bio in UserFragment and let editUser set it; regenerated
codegen. Rebased onto current master.
2026-06-19 14:14:24 -07:00
49fbebd0c2 Merge pull request 'Fix duplicate Apple IAP selection' (#263) from loewy/fix-duplicate-apple-iap-selection into master
Reviewed-on: #263
2026-06-18 21:39:20 +00:00
9219451c8d Fix duplicate Apple IAP selection
All checks were successful
Tests / Tests (pull_request) Successful in 11s
2026-06-18 14:32:37 -07:00
42601f9587 Merge pull request 'Add Apple subscription mobile operations' (#255) from apple-iap-pr4-mobile-ops into master
Reviewed-on: #255
2026-06-18 20:03:10 +00:00
acfb750265 Merge pull request 'Add Apple IAP product IDs to subscription options' (#262) from loewy/apple-iap-product-options into master
Reviewed-on: #262
2026-06-18 01:59:53 +00:00
ffa96a24c3 Add Apple subscription mobile operations
All checks were successful
Tests / Tests (pull_request) Successful in 9s
2026-06-17 18:39:36 -07:00
5b73dd3a83 Add Apple IAP product IDs to subscription options
All checks were successful
Tests / Tests (pull_request) Successful in 10s
2026-06-17 18:22:47 -07:00
4 changed files with 38 additions and 13 deletions

View File

@@ -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 = {
@@ -326,6 +327,7 @@ export type EditShotReturn = {
export type EditUserInputGql = {
agreesToMarketing?: InputMaybe<Scalars["Boolean"]["input"]>;
bio?: InputMaybe<Scalars["String"]["input"]>;
fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
username?: InputMaybe<Scalars["String"]["input"]>;
videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
@@ -3555,6 +3557,7 @@ export type UserGql = {
__typename?: "UserGQL";
activeVideoId?: Maybe<Scalars["Int"]["output"]>;
agreesToMarketing?: Maybe<Scalars["Boolean"]["output"]>;
bio?: Maybe<Scalars["String"]["output"]>;
createdAt?: Maybe<Scalars["DateTime"]["output"]>;
fargoRating?: Maybe<Scalars["Int"]["output"]>;
firebaseUid?: Maybe<Scalars["String"]["output"]>;
@@ -5040,11 +5043,6 @@ export type GetAvailableSubscriptionOptionsQuery = {
getAvailableSubscriptionOptions: {
__typename?: "StripeSubscriptionOptionsGQL";
trialPeriodDays?: number | null;
appleIap: {
__typename?: "AppleIapSubscriptionOptionsGQL";
enabled: boolean;
proMonthlyProductId?: string | null;
};
products: Array<{
__typename?: "StripeProductGQL";
id: string;
@@ -5062,6 +5060,12 @@ export type GetAvailableSubscriptionOptionsQuery = {
active: boolean;
}>;
}>;
appleIap: {
__typename?: "AppleIapSubscriptionOptionsGQL";
enabled: boolean;
proMonthlyProductId?: string | null;
productIds: Array<string>;
};
};
};
@@ -5937,6 +5941,7 @@ export type EditProfileImageUriMutation = {
username: string;
isAdmin?: boolean | null;
profileImageUri?: string | null;
bio?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
@@ -5957,6 +5962,7 @@ export type GetLoggedInUserQuery = {
username: string;
isAdmin?: boolean | null;
profileImageUri?: string | null;
bio?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
@@ -5979,6 +5985,7 @@ export type GetUserQuery = {
username: string;
isAdmin?: boolean | null;
profileImageUri?: string | null;
bio?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
@@ -6168,6 +6175,7 @@ export type EditUserMutationVariables = Exact<{
fargoRating?: InputMaybe<Scalars["Int"]["input"]>;
videosPrivateByDefault?: InputMaybe<Scalars["Boolean"]["input"]>;
agreesToMarketing?: InputMaybe<Scalars["Boolean"]["input"]>;
bio?: InputMaybe<Scalars["String"]["input"]>;
}>;
export type EditUserMutation = {
@@ -6181,6 +6189,7 @@ export type EditUserMutation = {
updatedAt?: any | null;
videosPrivateByDefault?: boolean | null;
agreesToMarketing?: boolean | null;
bio?: string | null;
};
};
@@ -6198,6 +6207,7 @@ export type UserFragmentFragment = {
username: string;
isAdmin?: boolean | null;
profileImageUri?: string | null;
bio?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
@@ -6221,6 +6231,7 @@ export type GetUsersMatchingQuery = {
username: string;
isAdmin?: boolean | null;
profileImageUri?: string | null;
bio?: string | null;
fargoRating?: number | null;
activeVideoId?: number | null;
createdAt?: any | null;
@@ -7400,6 +7411,7 @@ export const UserFragmentFragmentDoc = gql`
username
isAdmin
profileImageUri
bio
fargoRating
activeVideoId
createdAt
@@ -10689,10 +10701,6 @@ export const GetAvailableSubscriptionOptionsDocument = gql`
query GetAvailableSubscriptionOptions {
getAvailableSubscriptionOptions {
trialPeriodDays
appleIap {
enabled
proMonthlyProductId
}
products {
id
name
@@ -10708,6 +10716,11 @@ export const GetAvailableSubscriptionOptionsDocument = gql`
active
}
}
appleIap {
enabled
proMonthlyProductId
productIds
}
}
}
`;
@@ -13401,6 +13414,7 @@ export const EditUserDocument = gql`
$fargoRating: Int
$videosPrivateByDefault: Boolean
$agreesToMarketing: Boolean
$bio: String
) {
editUser(
input: {
@@ -13408,6 +13422,7 @@ export const EditUserDocument = gql`
fargoRating: $fargoRating
videosPrivateByDefault: $videosPrivateByDefault
agreesToMarketing: $agreesToMarketing
bio: $bio
}
) {
id
@@ -13417,6 +13432,7 @@ export const EditUserDocument = gql`
updatedAt
videosPrivateByDefault
agreesToMarketing
bio
}
}
`;
@@ -13442,6 +13458,7 @@ export type EditUserMutationFn = Apollo.MutationFunction<
* fargoRating: // value for 'fargoRating'
* videosPrivateByDefault: // value for 'videosPrivateByDefault'
* agreesToMarketing: // value for 'agreesToMarketing'
* bio: // value for 'bio'
* },
* });
*/

View File

@@ -29,10 +29,6 @@ mutation CreateCustomerPortalSession {
query GetAvailableSubscriptionOptions {
getAvailableSubscriptionOptions {
trialPeriodDays
appleIap {
enabled
proMonthlyProductId
}
products {
id
name
@@ -48,6 +44,11 @@ query GetAvailableSubscriptionOptions {
active
}
}
appleIap {
enabled
proMonthlyProductId
productIds
}
}
}

View File

@@ -177,6 +177,7 @@ mutation editUser(
$fargoRating: Int
$videosPrivateByDefault: Boolean
$agreesToMarketing: Boolean
$bio: String
) {
editUser(
input: {
@@ -184,6 +185,7 @@ mutation editUser(
fargoRating: $fargoRating
videosPrivateByDefault: $videosPrivateByDefault
agreesToMarketing: $agreesToMarketing
bio: $bio
}
) {
id
@@ -193,6 +195,7 @@ mutation editUser(
updatedAt
videosPrivateByDefault
agreesToMarketing
bio
}
}
@@ -206,6 +209,7 @@ fragment UserFragment on UserGQL {
username
isAdmin
profileImageUri
bio
fargoRating
activeVideoId
createdAt

View File

@@ -356,6 +356,7 @@ type UserGQL {
activeVideoId: Int
stripeCustomerId: String
profileImageUri: String
bio: String
createdAt: DateTime
updatedAt: DateTime
videosPrivateByDefault: Boolean
@@ -1034,6 +1035,7 @@ type StripePriceGQL {
type AppleIapSubscriptionOptionsGQL {
enabled: Boolean!
proMonthlyProductId: String
productIds: [String!]!
}
type UserSubscriptionStatusGQL {
@@ -1363,6 +1365,7 @@ input EditUserInputGQL {
fargoRating: Int = null
videosPrivateByDefault: Boolean = null
agreesToMarketing: Boolean = null
bio: String = null
}
type SyncAppleSubscriptionResultGQL {