Update graphql-js to 15.4.0

package.json

@@ -51,7 +51,7 @@
     "forest-express-sequelize": "6.3.13",
     "fs-extra": "9.0.1",
     "googleapis": "62.0.0",
-    "graphql": "15.3.0",
+    "graphql": "15.4.0",
     "graphql-iso-date": "3.6.1",
     "graphql-type-json": "0.3.2",
     "handlebars": "4.7.6",

server/graphql/schemaV1.graphql

@@ -138,6 +138,11 @@ type Collective implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -260,11 +265,6 @@ type Collective implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -355,7 +355,6 @@ input CollectiveInputType {
   tags: [String]
   tiers: [TierInputType]
   settings: JSON
-  data: JSON
   members: [MemberInputType]
   notifications: [NotificationInputType]
   HostCollectiveId: Int
@@ -417,6 +416,7 @@ interface CollectiveInterface {
   path: String
   isHost: Boolean
   isIncognito: Boolean
+  isGuest: Boolean
   canApply: Boolean
   canContact: Boolean
   isArchived: Boolean
@@ -551,11 +551,6 @@ interface CollectiveInterface {
     """
     orderBy: PaymenMethodOrderField
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -748,27 +743,20 @@ Input type for CommentType
 """
 input CommentAttributesInputType {
   id: Int
-  markdown: String
   html: String
-  UpdateId: Int
 }
 
 """
 Input type for CommentType
 """
 input CommentInputType {
   id: Int
-  markdown: String
   html: String
 
   """
   Not supported yet. Defaults to user collective ID.
   """
   FromCollectiveId: Int
-  CollectiveId: Int
-  ExpenseId: Int
-  UpdateId: Int
-  ConversationId: Int
 }
 
 """
@@ -890,6 +878,11 @@ type Contributor {
   """
   isIncognito: Boolean!
 
+  """
+  Defines if the contributors is a guest account
+  """
+  isGuest: Boolean!
+
   """
   Description of how the member contribute. Will usually be a tier name, or "design" or "code".
   """
@@ -1060,6 +1053,11 @@ type Event implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -1182,11 +1180,6 @@ type Event implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -1299,24 +1292,15 @@ Input type for ExpenseType
 input ExpenseInputType {
   id: Int
   amount: Int
-  currency: String
   createdAt: DateString
   incurredAt: DateString
   description: String
   category: String
   status: String
   type: String
-
-  """
-  Can be: paypal, other. Also deprecated: donation, manual
-  """
-  payoutMethod: String
   PayoutMethod: PayoutMethodInput
   privateMessage: String
-  attachment: String
-  attachments: [ExpenseItemInputType]
   items: [ExpenseItemInputType]
-  user: UserInputType
   collective: CollectiveAttributesInputType
 }
 
@@ -1495,6 +1479,11 @@ type Fund implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -1617,11 +1606,6 @@ type Fund implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -2037,11 +2021,6 @@ type Mutation {
     """
     limitedToTags: [String]
 
-    """
-    Limit this payment method to make donations to those collectives
-    """
-    limitedToCollectiveIds: [Int]
-
     """
     Limit this payment method to make donations to the collectives hosted by those hosts
     """
@@ -2118,11 +2097,6 @@ type Mutation {
     """
     limitedToTags: [String]
 
-    """
-    Limit this payment method to make donations to those collectives
-    """
-    limitedToCollectiveIds: [Int]
-
     """
     Limit this payment method to make donations to the collectives hosted by those hosts
     """
@@ -2399,7 +2373,6 @@ input OrderInputType {
   publicMessage: String
   privateMessage: String
   paymentMethod: PaymentMethodInputType
-  user: UserInputType
   fromCollective: CollectiveAttributesInputType
   collective: CollectiveAttributesInputType!
   tier: TierInputType
@@ -2612,6 +2585,11 @@ type Organization implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -2734,11 +2712,6 @@ type Organization implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -3026,6 +2999,11 @@ type Project implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -3148,11 +3126,6 @@ type Project implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -3292,7 +3265,6 @@ type Query {
     CollectiveId: Int
     CollectiveSlug: String
     status: ExpenseStatus
-    category: String
     FromCollectiveId: Int
     FromCollectiveSlug: String
 
@@ -3940,6 +3912,11 @@ type User implements CollectiveInterface {
   """
   isIncognito: Boolean
 
+  """
+  Returns whether this collective is a guest profile
+  """
+  isGuest: Boolean
+
   """
   Returns whether this collective is archived
   """
@@ -4062,11 +4039,6 @@ type User implements CollectiveInterface {
     types: [String]
     orderBy: PaymenMethodOrderField = type
 
-    """
-    Defines if the organization "collective" payment method should be returned
-    """
-    includeOrganizationCollectivePaymentMethod: Boolean = false
-
     """
     Defines if the host "collective" payment method should be returned
     """
@@ -4153,7 +4125,6 @@ input UserInputType {
   twitterHandle: String
   githubHandle: String
   website: String
-  paypalEmail: String
   newsletterOptIn: Boolean
   location: LocationInputType
 }

server/graphql/schemaV2.graphql

@@ -215,11 +215,6 @@ input AccountReferenceInput {
   """
   id: String
 
-  """
-  The internal id of the account (ie: 580)
-  """
-  legacyId: Int
-
   """
   The slug identifying the account (ie: babel for https://opencollective.com/babel)
   """
@@ -422,7 +417,6 @@ enum ActivityType {
   COLLECTIVE_TRANSACTION_CREATED
   COLLECTIVE_UPDATE_CREATED
   COLLECTIVE_UPDATE_PUBLISHED
-  COLLECTIVE_USER_ADDED
   COLLECTIVE_CONTACT
   ORGANIZATION_COLLECTIVE_CREATED
   SUBSCRIPTION_ACTIVATED
@@ -439,6 +433,7 @@ enum ActivityType {
   ACTIVATED_COLLECTIVE_AS_HOST
   DEACTIVATED_COLLECTIVE_AS_HOST
   COLLECTIVE_TRANSACTION_PAID
+  COLLECTIVE_USER_ADDED
 }
 
 """
@@ -958,7 +953,6 @@ input CommentCreateInput {
   If your comment is linked to an expense, set it here
   """
   expense: ExpenseReferenceInput
-  ExpenseId: Int
   ConversationId: String
 }
 
@@ -5058,11 +5052,6 @@ input NewAccountOrReferenceInput {
   """
   id: String
 
-  """
-  The internal id of the account (ie: 580)
-  """
-  legacyId: Int
-
   """
   The slug identifying the account (ie: babel for https://opencollective.com/babel)
   """
@@ -6024,11 +6013,6 @@ type Query {
     searchTerm: String
   ): ExpenseCollection
   expense(
-    """
-    Public expense identifier
-    """
-    id: String
-
     """
     Identifiers to retrieve the expense.
     """