fix(chore): Return account conflict error for NativeAuth registration…

… flow
vendure-ecommerce · Oct 18, 2024 · 118d28c · 118d28c
1 parent 0240f0b
commit 118d28c
Show file tree

Hide file tree

Showing 16 changed files with 374 additions and 139 deletions.
diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
@@ -822,9 +822,13 @@ export type CreateFacetInput = {
   values?: InputMaybe<Array<CreateFacetValueWithFacetInput>>;
 };
 
+export type CreateFacetValueCustomFieldsInput = {
+  childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type CreateFacetValueInput = {
   code: Scalars['String']['input'];
-  customFields?: InputMaybe<Scalars['JSON']['input']>;
+  customFields?: InputMaybe<CreateFacetValueCustomFieldsInput>;
   facetId: Scalars['ID']['input'];
   translations: Array<FacetValueTranslationInput>;
 };
@@ -856,9 +860,13 @@ export type CreatePaymentMethodInput = {
   translations: Array<PaymentMethodTranslationInput>;
 };
 
+export type CreateProductCustomFieldsInput = {
+  testId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type CreateProductInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
-  customFields?: InputMaybe<Scalars['JSON']['input']>;
+  customFields?: InputMaybe<CreateProductCustomFieldsInput>;
   enabled?: InputMaybe<Scalars['Boolean']['input']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
@@ -1766,7 +1774,7 @@ export type FacetValue = Node & {
   __typename?: 'FacetValue';
   code: Scalars['String']['output'];
   createdAt: Scalars['DateTime']['output'];
-  customFields?: Maybe<Scalars['JSON']['output']>;
+  customFields?: Maybe<FacetValueCustomFields>;
   facet: Facet;
   facetId: Scalars['ID']['output'];
   id: Scalars['ID']['output'];
@@ -1776,6 +1784,11 @@ export type FacetValue = Node & {
   updatedAt: Scalars['DateTime']['output'];
 };
 
+export type FacetValueCustomFields = {
+  __typename?: 'FacetValueCustomFields';
+  childFacetValue?: Maybe<FacetValue>;
+};
+
 /**
  * Used to construct boolean expressions for filtering search results
  * by FacetValue ID. Examples:
@@ -1831,6 +1844,7 @@ export type FacetValueResult = {
 };
 
 export type FacetValueSortParameter = {
+  childFacetValue?: InputMaybe<SortOrder>;
   code?: InputMaybe<SortOrder>;
   createdAt?: InputMaybe<SortOrder>;
   facetId?: InputMaybe<SortOrder>;
@@ -4622,7 +4636,7 @@ export type Product = Node & {
   channels: Array<Channel>;
   collections: Array<Collection>;
   createdAt: Scalars['DateTime']['output'];
-  customFields?: Maybe<Scalars['JSON']['output']>;
+  customFields?: Maybe<ProductCustomFields>;
   description: Scalars['String']['output'];
   enabled: Scalars['Boolean']['output'];
   facetValues: Array<FacetValue>;
@@ -4645,6 +4659,11 @@ export type ProductVariantListArgs = {
   options?: InputMaybe<ProductVariantListOptions>;
 };
 
+export type ProductCustomFields = {
+  __typename?: 'ProductCustomFields';
+  test?: Maybe<Asset>;
+};
+
 export type ProductFilterParameter = {
   _and?: InputMaybe<Array<ProductFilterParameter>>;
   _or?: InputMaybe<Array<ProductFilterParameter>>;
@@ -4752,6 +4771,7 @@ export type ProductSortParameter = {
   id?: InputMaybe<SortOrder>;
   name?: InputMaybe<SortOrder>;
   slug?: InputMaybe<SortOrder>;
+  test?: InputMaybe<SortOrder>;
   updatedAt?: InputMaybe<SortOrder>;
 };
 
@@ -6461,9 +6481,13 @@ export type UpdateFacetInput = {
   translations?: InputMaybe<Array<FacetTranslationInput>>;
 };
 
+export type UpdateFacetValueCustomFieldsInput = {
+  childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type UpdateFacetValueInput = {
   code?: InputMaybe<Scalars['String']['input']>;
-  customFields?: InputMaybe<Scalars['JSON']['input']>;
+  customFields?: InputMaybe<UpdateFacetValueCustomFieldsInput>;
   id: Scalars['ID']['input'];
   translations?: InputMaybe<Array<FacetValueTranslationInput>>;
 };
@@ -6512,9 +6536,13 @@ export type UpdatePaymentMethodInput = {
   translations?: InputMaybe<Array<PaymentMethodTranslationInput>>;
 };
 
+export type UpdateProductCustomFieldsInput = {
+  testId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type UpdateProductInput = {
   assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
-  customFields?: InputMaybe<Scalars['JSON']['input']>;
+  customFields?: InputMaybe<UpdateProductCustomFieldsInput>;
   enabled?: InputMaybe<Scalars['Boolean']['input']>;
   facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
   featuredAssetId?: InputMaybe<Scalars['ID']['input']>;

diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -808,9 +808,13 @@ export type CreateFacetInput = {
     values?: InputMaybe<Array<CreateFacetValueWithFacetInput>>;
 };
 
+export type CreateFacetValueCustomFieldsInput = {
+    childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type CreateFacetValueInput = {
     code: Scalars['String']['input'];
-    customFields?: InputMaybe<Scalars['JSON']['input']>;
+    customFields?: InputMaybe<CreateFacetValueCustomFieldsInput>;
     facetId: Scalars['ID']['input'];
     translations: Array<FacetValueTranslationInput>;
 };
@@ -841,9 +845,13 @@ export type CreatePaymentMethodInput = {
     translations: Array<PaymentMethodTranslationInput>;
 };
 
+export type CreateProductCustomFieldsInput = {
+    testId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type CreateProductInput = {
     assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
-    customFields?: InputMaybe<Scalars['JSON']['input']>;
+    customFields?: InputMaybe<CreateProductCustomFieldsInput>;
     enabled?: InputMaybe<Scalars['Boolean']['input']>;
     facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
     featuredAssetId?: InputMaybe<Scalars['ID']['input']>;
@@ -1728,7 +1736,7 @@ export type FacetTranslationInput = {
 export type FacetValue = Node & {
     code: Scalars['String']['output'];
     createdAt: Scalars['DateTime']['output'];
-    customFields?: Maybe<Scalars['JSON']['output']>;
+    customFields?: Maybe<FacetValueCustomFields>;
     facet: Facet;
     facetId: Scalars['ID']['output'];
     id: Scalars['ID']['output'];
@@ -1738,6 +1746,10 @@ export type FacetValue = Node & {
     updatedAt: Scalars['DateTime']['output'];
 };
 
+export type FacetValueCustomFields = {
+    childFacetValue?: Maybe<FacetValue>;
+};
+
 /**
  * Used to construct boolean expressions for filtering search results
  * by FacetValue ID. Examples:
@@ -1791,6 +1803,7 @@ export type FacetValueResult = {
 };
 
 export type FacetValueSortParameter = {
+    childFacetValue?: InputMaybe<SortOrder>;
     code?: InputMaybe<SortOrder>;
     createdAt?: InputMaybe<SortOrder>;
     facetId?: InputMaybe<SortOrder>;
@@ -4312,7 +4325,7 @@ export type Product = Node & {
     channels: Array<Channel>;
     collections: Array<Collection>;
     createdAt: Scalars['DateTime']['output'];
-    customFields?: Maybe<Scalars['JSON']['output']>;
+    customFields?: Maybe<ProductCustomFields>;
     description: Scalars['String']['output'];
     enabled: Scalars['Boolean']['output'];
     facetValues: Array<FacetValue>;
@@ -4334,6 +4347,10 @@ export type ProductVariantListArgs = {
     options?: InputMaybe<ProductVariantListOptions>;
 };
 
+export type ProductCustomFields = {
+    test?: Maybe<Asset>;
+};
+
 export type ProductFilterParameter = {
     _and?: InputMaybe<Array<ProductFilterParameter>>;
     _or?: InputMaybe<Array<ProductFilterParameter>>;
@@ -4435,6 +4452,7 @@ export type ProductSortParameter = {
     id?: InputMaybe<SortOrder>;
     name?: InputMaybe<SortOrder>;
     slug?: InputMaybe<SortOrder>;
+    test?: InputMaybe<SortOrder>;
     updatedAt?: InputMaybe<SortOrder>;
 };
 
@@ -6038,9 +6056,13 @@ export type UpdateFacetInput = {
     translations?: InputMaybe<Array<FacetTranslationInput>>;
 };
 
+export type UpdateFacetValueCustomFieldsInput = {
+    childFacetValueId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type UpdateFacetValueInput = {
     code?: InputMaybe<Scalars['String']['input']>;
-    customFields?: InputMaybe<Scalars['JSON']['input']>;
+    customFields?: InputMaybe<UpdateFacetValueCustomFieldsInput>;
     id: Scalars['ID']['input'];
     translations?: InputMaybe<Array<FacetValueTranslationInput>>;
 };
@@ -6094,9 +6116,13 @@ export type UpdatePaymentMethodInput = {
     translations?: InputMaybe<Array<PaymentMethodTranslationInput>>;
 };
 
+export type UpdateProductCustomFieldsInput = {
+    testId?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type UpdateProductInput = {
     assetIds?: InputMaybe<Array<Scalars['ID']['input']>>;
-    customFields?: InputMaybe<Scalars['JSON']['input']>;
+    customFields?: InputMaybe<UpdateProductCustomFieldsInput>;
     enabled?: InputMaybe<Scalars['Boolean']['input']>;
     facetValueIds?: InputMaybe<Array<Scalars['ID']['input']>>;
     featuredAssetId?: InputMaybe<Scalars['ID']['input']>;

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -1020,7 +1020,7 @@ export type FacetValue = Node & {
     __typename?: 'FacetValue';
     code: Scalars['String']['output'];
     createdAt: Scalars['DateTime']['output'];
-    customFields?: Maybe<Scalars['JSON']['output']>;
+    customFields?: Maybe<FacetValueCustomFields>;
     facet: Facet;
     facetId: Scalars['ID']['output'];
     id: Scalars['ID']['output'];
@@ -1030,6 +1030,11 @@ export type FacetValue = Node & {
     updatedAt: Scalars['DateTime']['output'];
 };
 
+export type FacetValueCustomFields = {
+    __typename?: 'FacetValueCustomFields';
+    childFacetValue?: Maybe<FacetValue>;
+};
+
 /**
  * Used to construct boolean expressions for filtering search results
  * by FacetValue ID. Examples:
@@ -1085,6 +1090,7 @@ export type FacetValueResult = {
 };
 
 export type FacetValueSortParameter = {
+    childFacetValue?: InputMaybe<SortOrder>;
     code?: InputMaybe<SortOrder>;
     createdAt?: InputMaybe<SortOrder>;
     facetId?: InputMaybe<SortOrder>;
@@ -2567,7 +2573,7 @@ export type Product = Node & {
     assets: Array<Asset>;
     collections: Array<Collection>;
     createdAt: Scalars['DateTime']['output'];
-    customFields?: Maybe<Scalars['JSON']['output']>;
+    customFields?: Maybe<ProductCustomFields>;
     description: Scalars['String']['output'];
     enabled: Scalars['Boolean']['output'];
     facetValues: Array<FacetValue>;
@@ -2589,6 +2595,11 @@ export type ProductVariantListArgs = {
     options?: InputMaybe<ProductVariantListOptions>;
 };
 
+export type ProductCustomFields = {
+    __typename?: 'ProductCustomFields';
+    test?: Maybe<Asset>;
+};
+
 export type ProductFilterParameter = {
     _and?: InputMaybe<Array<ProductFilterParameter>>;
     _or?: InputMaybe<Array<ProductFilterParameter>>;
@@ -2672,6 +2683,7 @@ export type ProductSortParameter = {
     id?: InputMaybe<SortOrder>;
     name?: InputMaybe<SortOrder>;
     slug?: InputMaybe<SortOrder>;
+    test?: InputMaybe<SortOrder>;
     updatedAt?: InputMaybe<SortOrder>;
 };
 
@@ -2965,6 +2977,7 @@ export type RegionTranslation = {
 };
 
 export type RegisterCustomerAccountResult =
+    | EmailAddressConflictError
     | MissingPasswordError
     | NativeAuthStrategyError
     | PasswordValidationError