@unchainedshop/api 2.0.0-beta6 → 2.0.0-beta8

package/src/schema/mutation.js

@@ -8,7 +8,6 @@ export default [
       loginWithPassword(
         username: String
         email: String
-        password: HashedPasswordInput
         plainPassword: String
         totpCode: String
       ): LoginMethodResponse
@@ -31,10 +30,6 @@ export default [
       createUser(
         username: String
         email: String
-        password: HashedPasswordInput
-          @deprecated(
-            reason: "Use plainPassword, there is not a lot of added security by hashing on the client"
-          )
         webAuthnPublicKeyCredentials: JSON
         plainPassword: String
         profile: UserProfileInput
@@ -50,12 +45,7 @@ export default [
       """
       Change the current user's password. Must be logged in.
       """
-      changePassword(
-        oldPassword: HashedPasswordInput
-        oldPlainPassword: String
-        newPassword: HashedPasswordInput
-        newPlainPassword: String
-      ): SuccessResponse
+      changePassword(oldPlainPassword: String, newPlainPassword: String): SuccessResponse
 
       """
       Request a forgot password email.
@@ -65,11 +55,7 @@ export default [
       """
       Reset the password for a user using a token received in email. Logs the user in afterwards.
       """
-      resetPassword(
-        newPlainPassword: String
-        newPassword: HashedPasswordInput
-        token: String!
-      ): LoginMethodResponse
+      resetPassword(newPlainPassword: String, token: String!): LoginMethodResponse
 
       """
       Log the user out.
@@ -348,12 +334,7 @@ export default [
       """
       Enroll a new user, setting enroll to true will let the user choose his password (e-mail gets sent)
       """
-      enrollUser(
-        profile: UserProfileInput!
-        email: String!
-        password: HashedPasswordInput
-        plainPassword: String
-      ): User
+      enrollUser(profile: UserProfileInput!, email: String!, plainPassword: String): User
 
       """
       Forcefully trigger an enrollment email for already added users by e-mail
@@ -368,7 +349,7 @@ export default [
       """
       Set a new password for a specific user
       """
-      setPassword(newPassword: HashedPasswordInput, newPlainPassword: String, userId: ID!): User
+      setPassword(newPlainPassword: String, userId: ID!): User
 
       """
       Set roles of a user

package/src/schema/query.js

@@ -35,7 +35,7 @@ export default [
         slugs: [String!]
         includeDrafts: Boolean = false
         queryString: String
-      ): Int!
+      ): Int! @cacheControl(maxAge: 180)
 
       """
       Simple list of published products filtered either by tags or explicit slugs
@@ -60,16 +60,18 @@ export default [
       List products specified prices
       """
       productCatalogPrices(productId: ID!): [ProductCatalogPrice!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Localization: Meta data for product
       """
-      translatedProductTexts(productId: ID!): [ProductTexts!]!
+      translatedProductTexts(productId: ID!): [ProductTexts!]! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Localization: Media title/subtitle of a media that is attached to a product
       """
       translatedProductMediaTexts(productMediaId: ID!): [ProductMediaTexts!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Localization: Variations and Variation Options
@@ -77,12 +79,13 @@ export default [
       translatedProductVariationTexts(
         productVariationId: ID!
         productVariationOptionValue: String
-      ): [ProductVariationTexts!]!
+      ): [ProductVariationTexts!]! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Returns total number languages
       """
       languagesCount(includeInactive: Boolean = false, queryString: String): Int!
+        @cacheControl(maxAge: 180)
 
       """
       Get all languages
@@ -115,6 +118,7 @@ export default [
       Returns total number of countries
       """
       countriesCount(includeInactive: Boolean = false, queryString: String): Int!
+        @cacheControl(maxAge: 180)
 
       """
       Get a specific country by ID
@@ -125,6 +129,7 @@ export default [
       Returns total number of currencies
       """
       currenciesCount(includeInactive: Boolean = false, queryString: String): Int!
+        @cacheControl(maxAge: 180)
 
       """
       Get all currencies
@@ -145,42 +150,49 @@ export default [
       """
       Returns total number of delivery providers, optionally filtered by type
       """
-      deliveryProvidersCount(type: DeliveryProviderType): Int!
+      deliveryProvidersCount(type: DeliveryProviderType): Int! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all delivery providers, optionally filtered by type
       """
       deliveryProviders(type: DeliveryProviderType): [DeliveryProvider!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get a specific delivery provider by ID
       """
       deliveryProvider(deliveryProviderId: ID!): DeliveryProvider
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all delivery interfaces filtered by type
       """
       deliveryInterfaces(type: DeliveryProviderType!): [DeliveryInterface!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Returns total number of delivery providers, optionally filtered by type
       """
       warehousingProvidersCount(type: WarehousingProviderType): Int!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all warehousing providers, optionally filtered by type
       """
       warehousingProviders(type: WarehousingProviderType): [WarehousingProvider!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get a specific warehousing provider by ID
       """
       warehousingProvider(warehousingProviderId: ID!): WarehousingProvider
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all warehousing interfaces filtered by type
       """
       warehousingInterfaces(type: WarehousingProviderType!): [WarehousingInterface!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get token
@@ -190,22 +202,24 @@ export default [
       """
       Returns total number of payment providers, optionally filtered by type
       """
-      paymentProvidersCount(type: PaymentProviderType): Int!
+      paymentProvidersCount(type: PaymentProviderType): Int! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all payment providers, optionally filtered by type
       """
       paymentProviders(type: PaymentProviderType): [PaymentProvider!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get a specific payment provider by ID
       """
-      paymentProvider(paymentProviderId: ID!): PaymentProvider
+      paymentProvider(paymentProviderId: ID!): PaymentProvider @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all payment interfaces filtered by type
       """
       paymentInterfaces(type: PaymentProviderType!): [PaymentInterface!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Returns total number of orders
@@ -256,7 +270,7 @@ export default [
         includeInactive: Boolean = false
         includeLeaves: Boolean = false
         queryString: String
-      ): Int!
+      ): Int! @cacheControl(maxAge: 180)
 
       """
       Get a specific assortment by ID
@@ -267,21 +281,25 @@ export default [
       Localization: Meta data for assortments
       """
       translatedAssortmentTexts(assortmentId: ID!): [AssortmentTexts!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Localization: Media title/subtitle of a media that is attached to a assortment
       """
       translatedAssortmentMediaTexts(assortmentMediaId: ID!): [AssortmentMediaTexts!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Localization: Filters and Filter Options
       """
       translatedFilterTexts(filterId: ID!, filterOptionValue: String): [FilterTexts!]!
+        @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Returns total number of filters
       """
       filtersCount(includeInactive: Boolean = false, queryString: String): Int!
+        @cacheControl(maxAge: 180)
 
       """
       Get all filters
@@ -302,7 +320,7 @@ export default [
       """
       Returns total number of product reviews
       """
-      productReviewsCount(queryString: String): Int!
+      productReviewsCount(queryString: String): Int! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get all product reviews
@@ -312,12 +330,12 @@ export default [
         offset: Int = 0
         sort: [SortOptionInput!]
         queryString: String
-      ): [ProductReview!]!
+      ): [ProductReview!]! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Get a specific product review by ID
       """
-      productReview(productReviewId: ID!): ProductReview!
+      productReview(productReviewId: ID!): ProductReview! @cacheControl(scope: PRIVATE, maxAge: 0)
 
       """
       Returns total number of quotations

package/src/schema/types/assortment.js

@@ -1,13 +1,13 @@
 export default [
   /* GraphQL */ `
-    type AssortmentMediaTexts {
+    type AssortmentMediaTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type AssortmentMedia {
+    type AssortmentMedia @cacheControl(maxAge: 180) {
       _id: ID!
       tags: [LowerCaseString!]
       file: Media!
@@ -18,7 +18,7 @@ export default [
     """
     Assortment
     """
-    type Assortment {
+    type Assortment @cacheControl(maxAge: 180) {
       _id: ID!
       created: DateTime
       updated: DateTime
@@ -47,7 +47,7 @@ export default [
     """
     Directed assortment to product paths (breadcrumbs)
     """
-    type AssortmentPath {
+    type AssortmentPath @cacheControl(maxAge: 180) {
       links: [AssortmentPathLink!]!
     }
 
@@ -56,14 +56,13 @@ export default [
     assortmentId and assortmentTexts are there for convenience
     to short-circuit breadcrumb lookups
     """
-    type AssortmentPathLink {
+    type AssortmentPathLink @cacheControl(maxAge: 180) {
       assortmentId: ID!
-      assortmentSlug: String! @deprecated(reason: "Please use assortmentTexts")
       assortmentTexts(forceLocale: String): AssortmentTexts!
       link: AssortmentLink
     }
 
-    type AssortmentProduct {
+    type AssortmentProduct @cacheControl(maxAge: 180) {
       _id: ID!
       sortKey: Int!
       tags: [LowerCaseString!]
@@ -71,7 +70,7 @@ export default [
       product: Product!
     }
 
-    type AssortmentFilter {
+    type AssortmentFilter @cacheControl(maxAge: 180) {
       _id: ID!
       sortKey: Int!
       tags: [LowerCaseString!]
@@ -79,7 +78,7 @@ export default [
       filter: Filter!
     }
 
-    type AssortmentLink {
+    type AssortmentLink @cacheControl(maxAge: 180) {
       _id: ID!
       sortKey: Int!
       tags: [LowerCaseString!]
@@ -87,7 +86,7 @@ export default [
       child: Assortment!
     }
 
-    type AssortmentTexts {
+    type AssortmentTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       slug: String

package/src/schema/types/color.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Color {
+    type Color @cacheControl(maxAge: 180) {
       name: String
       hex: String
       red: Int

package/src/schema/types/country.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Country {
+    type Country @cacheControl(maxAge: 180) {
       _id: ID!
       """
       ISO 3166-1 alpha-2 https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements

package/src/schema/types/currency.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Currency {
+    type Currency @cacheControl(maxAge: 180) {
       _id: ID!
       isoCode: String!
       isActive: Boolean

package/src/schema/types/delivery.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type DeliveryInterface {
+    type DeliveryInterface @cacheControl(maxAge: 180) {
       _id: ID!
       label: String
       version: String
@@ -25,7 +25,7 @@ export default [
       WRONG_CREDENTIALS
     }
 
-    type DeliveryProvider {
+    type DeliveryProvider @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime
@@ -36,6 +36,7 @@ export default [
       configurationError: DeliveryProviderError
       isActive: Boolean
       simulatedPrice(currency: String, useNetPrice: Boolean = false, orderId: ID, context: JSON): Price
+        @cacheControl(scope: PRIVATE, maxAge: 10)
     }
   `,
 ];

package/src/schema/types/dimensions.js

@@ -12,7 +12,7 @@ export default [
       MILLIMETERS
     }
 
-    type Dimensions {
+    type Dimensions @cacheControl(maxAge: 180) {
       weight(unit: MassUnit = KILOGRAM): Float
       length(unit: LengthUnit = METERS): Float
       width(unit: LengthUnit = METERS): Float

package/src/schema/types/discount.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type DiscountInterface {
+    type DiscountInterface @cacheControl(maxAge: 180) {
       _id: ID!
       label: String
       version: String

package/src/schema/types/dispatch.js

@@ -1,3 +1,4 @@
+// TODO: Cache?
 export default [
   /* GraphQL */ `
     type Dispatch {

package/src/schema/types/filter.js

@@ -22,20 +22,20 @@ export default [
       RANGE
     }
 
-    type FilterTexts {
+    type FilterTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type FilterOption {
+    type FilterOption @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): FilterTexts
       value: String
     }
 
-    type Filter {
+    type Filter @cacheControl(maxAge: 180) {
       _id: ID!
       updated: DateTime
       created: DateTime
@@ -46,17 +46,14 @@ export default [
       options: [FilterOption!]
     }
 
-    type LoadedFilterOption {
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
+    type LoadedFilterOption @cacheControl(maxAge: 180) {
       filteredProductsCount: Int!
       definition: FilterOption!
       isSelected: Boolean
     }
 
-    type LoadedFilter {
-      examinedProducts: Int! @deprecated(reason: "Renamed, use the productsCount field")
+    type LoadedFilter @cacheControl(maxAge: 180) {
       productsCount: Int!
-      filteredProducts: Int! @deprecated(reason: "Renamed, use the filteredProductsCount field")
       filteredProductsCount: Int!
       definition: Filter!
       isSelected: Boolean

package/src/schema/types/geo-position.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type GeoPosition {
+    type GeoPosition @cacheControl(maxAge: 180) {
       latitude: Float!
       longitude: Float!
       altitute: Float

package/src/schema/types/language.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Language {
+    type Language @cacheControl(maxAge: 180) {
       _id: ID!
       """
       ISO 639-1 alpha-2 https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes

package/src/schema/types/media.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Media {
+    type Media @cacheControl(maxAge: 180) {
       _id: ID!
       name: String!
       type: String!

package/src/schema/types/payment.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type PaymentInterface {
+    type PaymentInterface @cacheControl(maxAge: 180) {
       _id: ID!
       label: String
       version: String
@@ -30,7 +30,7 @@ export default [
       WRONG_CREDENTIALS
     }
 
-    type PaymentCredentials {
+    type PaymentCredentials @cacheControl(maxAge: 0, scope: PRIVATE) {
       _id: ID!
       user: User!
       paymentProvider: PaymentProvider!
@@ -40,7 +40,7 @@ export default [
       isPreferred: Boolean!
     }
 
-    type PaymentProvider {
+    type PaymentProvider @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime

package/src/schema/types/price.js

@@ -1,6 +1,6 @@
 export default [
   /* GraphQL */ `
-    type Price {
+    type Price @cacheControl(maxAge: 60) {
       _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!
@@ -8,7 +8,7 @@ export default [
       currency: String!
     }
 
-    type PriceRange {
+    type PriceRange @cacheControl(maxAge: 60) {
       _id: ID!
       minPrice: Price!
       maxPrice: Price!

package/src/schema/types/product/bundle-product.js

@@ -3,7 +3,7 @@ export default [
     """
     A Bundle product consists of multiple configured products
     """
-    type BundleProduct implements Product {
+    type BundleProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -20,7 +20,6 @@ export default [
         sort: [SortOptionInput!]
         queryString: String
       ): [ProductReview!]!
-
       assortmentPaths: [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID
@@ -30,7 +29,7 @@ export default [
       ): [Product!]!
     }
 
-    type ProductBundleItem {
+    type ProductBundleItem @cacheControl(maxAge: 180) {
       product: Product!
       quantity: Int!
       configuration: [ProductConfigurationParameter!]

package/src/schema/types/product/configurable-product.js

@@ -12,20 +12,20 @@ export default [
       TEXT
     }
 
-    type ProductVariationTexts {
+    type ProductVariationTexts @cacheControl(maxAge: 180) {
       _id: ID!
       locale: String
       title: String
       subtitle: String
     }
 
-    type ProductVariationOption {
+    type ProductVariationOption @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): ProductVariationTexts
       value: String
     }
 
-    type ProductVariation {
+    type ProductVariation @cacheControl(maxAge: 180) {
       _id: ID!
       texts(forceLocale: String): ProductVariationTexts
       type: ProductVariationType
@@ -36,7 +36,7 @@ export default [
     """
     Key Value Combination
     """
-    type ProductVariationAssignmentVector {
+    type ProductVariationAssignmentVector @cacheControl(maxAge: 180) {
       _id: ID!
       variation: ProductVariation
       option: ProductVariationOption
@@ -45,7 +45,7 @@ export default [
     """
     Key Value Combination to Product Assignment
     """
-    type ProductVariationAssignment {
+    type ProductVariationAssignment @cacheControl(maxAge: 180) {
       _id: ID!
 
       """
@@ -62,7 +62,7 @@ export default [
     """
     Configurable Product (Proxy)
     """
-    type ConfigurableProduct implements Product {
+    type ConfigurableProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -97,7 +97,7 @@ export default [
         includeInactive: Boolean = false
         currency: String
         useNetPrice: Boolean = false
-      ): PriceRange
+      ): PriceRange @cacheControl(scope: PRIVATE)
 
       """
       Reduced list of possible products by key/value combinations

package/src/schema/types/product/plan-product.js

@@ -13,7 +13,7 @@ export default [
       METERED
     }
 
-    type ProductPlanConfiguration {
+    type ProductPlanConfiguration @cacheControl(maxAge: 180) {
       usageCalculationType: ProductPlanUsageCalculationType!
       billingInterval: ProductPlanConfigurationInterval!
       billingIntervalCount: Int
@@ -32,7 +32,7 @@ export default [
     """
     Plan (Virtual Product that somebody can enroll to)
     """
-    type PlanProduct implements Product {
+    type PlanProduct implements Product @cacheControl(maxAge: 180) {
       _id: ID!
       sequence: Int!
       status: ProductStatus!
@@ -45,7 +45,8 @@ export default [
       catalogPrice(quantity: Int = 1, currency: String): Price
       leveledCatalogPrices(currency: String): [PriceLevel!]!
       simulatedPrice(currency: String, useNetPrice: Boolean = false, quantity: Int = 1): Price
-      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!]
+        @cacheControl(scope: PRIVATE)
+      simulatedDiscounts(quantity: Int = 1): [ProductDiscount!] @cacheControl(scope: PRIVATE)
       assortmentPaths(forceLocale: String): [ProductAssortmentPath!]!
       siblings(
         assortmentId: ID