Merge pull request #22 from diconium/feature/release2.3

Chiran : Latest code release w.r.to latest Adobe CIF

Author: e-kumarchi

.DS_Store

@@ -1 +1,3 @@
-**/coverage/**
+**/coverage/**
+/repos/aem-core-cif-components/
+/repos/commerce-cif-connector/

.eslintignore

@@ -42,7 +42,7 @@ module.exports = {
         'prettier'
     ],
     'parserOptions': {
-        'ecmaVersion': 6
+        'ecmaVersion': 8
     },
     'extends': [
         "prettier",

.eslintrc.js

@@ -5,4 +5,6 @@ coverage
 results.xml
 .vscode
 .idea
-cif/common/options.json
+/repos/aem-core-cif-components/
+/repos/commerce-cif-connector/
+diconium-CA.pem

.gitignore

@@ -3,7 +3,16 @@
 
 # 3rd-Party GraphQL integration with AEM Commerce and CIF on Adobe I/O Runtime
 
-## 2.3 (Unreleased)
+## 2.3 (March 14 2022)
+##### ENHANCEMENTS: 
+  * Latest Magento Schema Update 
+  * Changes in queries and mutations with respect to latest CIF and Venia
+  * Code Optimisation and improvisation on security code check 
+
+ ##### BUGFIXES:
+  * Commerce.html, Category Picker and Product Picker components fixes as per latest Schema
+  NOTE : Category Search in category picker will be implemented in the next release.  
+
 
 ## 2.2 (June 11, 2021)
 ##### ENHANCEMENTS: 

CHANGELOG.md

@@ -1,36 +1,31 @@
-# 3rd-Party GraphQL integration with AEM Commerce and CIF on Adobe I/O Runtime by [diconium](https://www.diconium.com)
+[![CircleCI](https://circleci.com/gh/adobe/commerce-cif-graphql-integration-reference.svg?style=svg)](https://circleci.com/gh/adobe/commerce-cif-graphql-integration-reference)
+[![codecov](https://codecov.io/gh/adobe/commerce-cif-graphql-integration-reference/branch/master/graph/badge.svg)](https://codecov.io/gh/adobe/commerce-cif-graphql-integration-reference)
 
-[![diconium-dds](images/diconium-dds.png  "diconium digital solutions" )](https://diconium.com/en/news/adobe-io-hybris)
+# 3rd-Party GraphQL integration with AEM Commerce and CIF on Adobe I/O Runtime
 
 ## Introduction
 
 The [CIF (Commerce Integration Framework) GraphQL connector](https://github.com/adobe/commerce-cif-connector) and the [AEM CIF Core Components](https://github.com/adobe/aem-core-cif-components) offer authoring and frontend integration between AEM (Adobe Experience Manager) and Magento. This integration is based on the [Magento GraphQL API](https://devdocs.magento.com/guides/v2.3/graphql/index.html) which offers a very flexible and efficient integration point between AEM and Magento.
 
-In order to support other 3rd-party "non-Magento" commerce platforms, this project demonstrates how a 3rd-party commerce platform like Hybris can be integrated with the CIF GraphQL connector and the AEM CIF Core Components via the Magento GraphQL API. Note that the integration is currently based on the GraphQL API of Magento 2.4.2.
+In order to support other 3rd-party "non-Magento" commerce platforms, this project implements an example "reference" implementation that demonstrates how a 3rd-party commerce platform can be integrated with the CIF GraphQL connector and the AEM CIF Core Components via the Magento GraphQL API. Note that the integration is currently based on the GraphQL API of Magento 2.3.2.
 
-This enables customers to reuse our existing connector and components in their project by simply exposing the Magento GraphQL API on top of a 3rd-party commerce platform like Hybris. To offer maximum flexibility and scalability, this "adaptation layer" is deployed on the serverless [Adobe I/O Runtime](https://www.adobe.io/apis/experienceplatform/runtime.html) platform.
+This enables customers to reuse our existing connector and components in their project by simply exposing the Magento GraphQL API on top of any 3rd-party commerce platform. To offer maximum flexibility and scalability, this "adaptation layer" is deployed on the serverless [Adobe I/O Runtime](https://www.adobe.io/apis/experienceplatform/runtime.html) platform.
 
 ## Getting Started
 
 ### Project structure
 
 This project is organized around [GraphQL resolvers](https://graphql.org/learn/execution/#root-fields-resolvers). Each resolver is either "local" or "remote". A "local" resolver is deployed and executed in the main Adobe I/O action that processes incoming GraphQL requests: we call this action the `dispatcher`. In contrast, a "remote" resolver is deployed as a separate Adobe I/O Runtime action which is referenced in the dispatcher action configuration and integrated via [schema delegation](https://www.apollographql.com/docs/graphql-tools/schema-delegation/).
 
-All code is organized in the `cif` folder. In this implementation, all the resolvers are remote resolvers.
+All code is organized in the `src` folder.
 
 ```
-cif
+src
 ├── common
+├── local
    ├── dispatcher
-├── cart
-   ├── src
-   ├── test
-├── customer
-├── order
-├── product
-├── category
-├── resources
-├── utils
+├── remote
+   ├── cartResolver
 ```
 
 The `common` folder contains all the code that fetches and converts 3rd-party data into the GraphQL format. These classes can be used either by the local dispatcher action or by remote resolvers.
@@ -51,7 +46,7 @@ This second diagram illustrates how a GraphQL query is being executed. The `cart
 
 ![GraphQL query execution](images/graphql-query-execution.png)
 
-## How to configure, build, test, and deploy
+## How to build, test, and deploy
 
 ### Tools
 
@@ -62,36 +57,14 @@ Make sure you have the following tools installed:
 
 OpenWhisk CLI must be available in your systems PATH and set up correctly to either use a local OpenWhisk installation or an Adobe I/O account. Try `wsk --help` to make sure it is working.
 
-### Configuration
-To be able to use this CIF connector you will need to provid some Hybris configurations to connect to your Hybris endpoint.
-Under [cif/common/options.yml.example](cif/common/options.yml.example) you will find an example yml file you should use as an example.
-
-The example file should look something like this
-```
-{
-  "HB_CLIENTSECRET": "<CLIENT_SECRET>",
-  "HB_CLIENTID": "<CLIENT_ID>",
-  "HB_OAUTH_PATH": "/authorizationserver/oauth/token",
-  "HB_API_HOST": "hybris.example.com",
-  "HB_API_BASE_PATH": "/occ/v2/",
-  "HB_BASESITEID": "electronics",
-  "HB_PROTOCOL": "https",
-  "HB_SECURE_BASE_MEDIA_URL": "https://hybris.example.com/yacceleratorstorefront"
-}
-```
-
-You should copy the example file to an options.yml file under the same path, this will be the real file that will have your configurations.
-This file is under .gitignore and should not be commited to the repository since it has client secrets.
-
-
 ### Build & Deployment
 
 To install all the npm dependencies, and then execute all the unit tests, simply run:
 ```
 $ npm install
 $ npm test
 ```
-
+```
 To deploy the actions on the Adobe I/O Runtime platform, we use the [serverless](https://serverless.com/framework/docs/providers/openwhisk/) framework. The deployment of independent packages and actions is defined in each package `serverless.yml` file. To deploy everything individually, simply run:
 ```
 $ npm run deploy-packages
@@ -100,14 +73,29 @@ $ npm run deploy-packages
 To deploy the actions on the Adobe I/O Runtime platform, we use the [serverless](https://serverless.com/framework/docs/providers/openwhisk/) framework. The deployment of packages and actions is defined in the `serverless.yml` file. To deploy everything, simply run:
 ```
 $ npm run deploy
-```
 
-This will deploy the `hybris-graphql/dispatcher` and all other actions like cart, oder etc in your namespace (Complete list in serverless.yml file). The dispatcher is a web action that is accessible with the URL `https://adobeioruntime.net/api/v1/web/NAMESPACE/graphql-reference/dispatcher`. To test the GraphQL endpoint, you can for example use the `GraphiQL` plugin in the Chrome browser.
+
+This will deploy the `graphql-reference/dispatcher` and `graphql-reference/cart` actions in your namespace. The dispatcher is a web action that is accessible with the URL `https://adobeioruntime.net/api/v1/web/NAMESPACE/graphql-reference/dispatcher`. To test the GraphQL endpoint, you can for example use the `GraphiQL` plugin in the Chrome browser. 
+
+Post deployment 
+
+1. Install Latest venia aem-cif-guides-venia.all-2022.02.24-classic.zip for classic AEM or cloud.
+2. Build and Install Latest CIF 2.6.0 on AEM with build package core-cif-components-all-2.6.0 in your   package manager
+3. Include the connector server URL in cif configuration with required server details. 
+4. Please refer https://experienceleague.adobe.com/docs/experience-manager-cloud-service/content/content-and-commerce/home.html for more details on configuration. 
+
+## Developing a real 3rd-party integration
+
+This repository provides a reference implementation that can be used as a starting point to develop a real integration with a 3rd-party commerce system. In order to implement a real integration, one will have to:
+* modify all the `*Loader.js` classes so that they would fetch data via the 3rd-party commerce system (the loaders currently return some "dummy" example data)
+* modify all the `__convertData` conversion methods in the data classes, to convert the data from the 3rd-party system into Magento GraphQL objects
+* modify and extend the `getter` methods in the data classes, to support all the fields not covered by the example integration
+* introduce new local and/or remote resolvers, to incrementally support more fields of the Magento GraphQL API
 
 ### Contributing
 
 Contributions are welcomed! Read the [Contributing Guide](.github/CONTRIBUTING.md) for more information.
 
 ### Licensing
 
-This project is licensed under the Apache V2 License. See [LICENSE](LICENSE) for more information.
+This project is licensed under the Apache V2 License. See [LICENSE](LICENSE) for more information.

README.md

@@ -30,7 +30,7 @@ function resolve(args) {
   const settings = new InputSettings(args);
 
   let remoteResolvers = [];
-  if (cachedSchema == null && args.remoteSchemas) {
+  if (!cachedSchema && args.remoteSchemas) {
     // Get all resolver actions to fetch the remote schemas dynamically
     remoteResolvers = Object.values(args.remoteSchemas).map(resolver => {
       let fetcher = new RemoteResolverFetcher(resolver.action).fetcher;
@@ -48,7 +48,7 @@ function resolve(args) {
 
   return Promise.all(remoteResolvers)
     .then(remotes => {
-      if (cachedSchema == null) {
+      if (!cachedSchema) {
         let remoteExecutableSchemas = [localSchema()];
 
         if (args.remoteSchemas) {

cif/cart/dispatcher.js

@@ -15,9 +15,8 @@
 'use strict';
 
 const LoaderProxy = require('../../common/LoaderProxy.js');
-const CartItemInterface = require('./Interface/CartItemInterface');
 const AddProductToCartLoader = require('./AddProductToCartLoader.js');
-
+const Cart = require('./Cart.js');
 class AddProductToCart {
   /**
    * @param {Object} parameters parameters object contains the cartId,Items to be added,graphqlContext & actionParameters
@@ -50,12 +49,14 @@ class AddProductToCart {
    * @param {Object} data parameter data contains details from hybris
    * @returns {Object} convert the hybris data into magento graphQL schema and return the object
    */
-  __convertData(data) {
-    const { items } = new CartItemInterface([data.entry]);
+  __convertData() {
     return {
-      cart: {
-        items,
-      },
+      cart: new Cart({
+        cartId: this.input.cart_id,
+        graphqlContext: this.graphqlContext,
+        actionParameters: this.actionParameters,
+        add: true,
+      }),
     };
   }
 }

cif/cart/lerna.json

@@ -49,8 +49,10 @@ class Cart {
   __load() {
     console.debug(`Loading cart for ${this.cartId}`);
     return this.cartLoader.load(this.cartId).then(data => {
+      //throw new Error(JSON.stringify(data));
       return this.shippingMethodsLoader.load(this.cartId).then(result => {
         data.deliveryModes = result.deliveryModes;
+        data.cartId = this.cartId;
         return data;
       });
     });
@@ -62,7 +64,7 @@ class Cart {
    */
   getRegionCode(address) {
     let code = address !== undefined ? address.region.isocode.split('-') : '';
-    if (code !== '') {
+    if (code && code.length) {
       code = code.length === 2 ? code[1] : code[0];
     } else {
       code = '';
@@ -131,9 +133,11 @@ class Cart {
     const { items } = new CartItemInterface(data.entries);
     return {
       items: items,
+      id: data.cartId,
       email: user && user.uid,
       is_virtual: false,
       total_quantity: data.totalUnitCount,
+      applied_gift_cards: [],
       billing_address: paymentInfo &&
         paymentInfo.billingAddress && {
           email: data.paymentInfo.billingAddress.email,
@@ -195,31 +199,33 @@ class Cart {
           code:
             paymentInfo && paymentInfo.cardType && paymentInfo.cardType.code
               ? paymentInfo.cardType.code
-              : 'visa',
+              : 'free',
           title:
             paymentInfo && paymentInfo.cardType && paymentInfo.cardType.name
               ? paymentInfo.cardType.name
-              : 'Credit Card',
+              : 'Free',
         },
       ],
       selected_payment_method: {
         code:
           paymentInfo && paymentInfo.cardType && paymentInfo.cardType.code
             ? paymentInfo.cardType.code
-            : '',
+            : 'free',
         title:
           paymentInfo && paymentInfo.cardType && paymentInfo.cardType.code
             ? paymentInfo.cardType.code
-            : '',
-      },
-      applied_coupon: {
-        code:
-          (appliedVouchers &&
-            appliedVouchers.length > 0 &&
-            appliedVouchers[0].code) ||
-          '',
+            : 'Free',
       },
+      applied_coupons:
+        appliedVouchers && appliedVouchers.length > 0 && appliedVouchers[0].code
+          ? [
+              {
+                code: appliedVouchers[0].code,
+              },
+            ]
+          : [],
       prices: {
+        applied_taxes: [],
         grand_total: {
           value: totalPrice && data.totalPrice.value,
           currency: totalPrice && data.totalPrice.currencyIso,