reactioncommerce · kieckhafer · Feb 6, 2020 · Oct 28, 2019 · Oct 28, 2019 · Oct 28, 2019
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,10 @@
 # in all future steps.
 #
 #  Assumes that the Docker image is published to Docker Hub.
-version: 2
+version: 2.1
+
+orbs:
+  webhook: eddiewebb/webhook@volatile
 
 # The following stanza defines a map named defaults with a variable that may be
 # inserted using the YAML merge (<<: *) key later in the file to save some
@@ -13,9 +16,8 @@ defaults: &defaults
     - CI_SCRIPTS: "npx --quiet --package @reactioncommerce/ci-scripts@1.9.1"
     - DOCKER_REPOSITORY: "reactioncommerce/example-storefront"
     - DOCKER_NAME: "example-storefront"
+    - GITOPS_PR_WEBHOOK: "https://w603b5hwp1.execute-api.us-east-1.amazonaws.com/dev/pullrequests"
     - GLOBAL_CACHE_VERSION: “v3”
-    - SERVICE: "reaction-storefront"
-    - REACTION_GITOPS_REVIEWERS: "wistonk,griggheo"
   docker:
     - image: circleci/node:12-stretch
 
@@ -83,6 +85,8 @@ jobs:
       - run:
           name: Build and push production Docker image
           command: ${CI_SCRIPTS} docker-build-tag-push . ${DOCKER_REPOSITORY}
+      - webhook/notify:
+          endpoint: "${GITOPS_PR_WEBHOOK}"
 
   create-gitops-pull-request:
     <<: *defaults
@@ -111,10 +115,3 @@ workflows:
             - dockerfile-lint
             - eslint
             - test-unit
-      - create-gitops-pull-request:
-          context: reaction-gitops
-          requires:
-            - docker-build-push
-          filters:
-            branches:
-              only: /^trunk$/
diff --git a/.env.example b/.env.example
@@ -1,16 +1,17 @@
 CANONICAL_URL=http://localhost:4000
 ENABLE_SPA_ROUTING=true
-EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql-beta
-INTERNAL_GRAPHQL_URL=http://reaction.api.reaction.localhost:3000/graphql-beta
+EXTERNAL_GRAPHQL_URL=http://localhost:3000/graphql
+INTERNAL_GRAPHQL_URL=http://api.reaction.localhost:3000/graphql
 OAUTH2_ADMIN_PORT=4445
+OAUTH2_ADMIN_URL=http://hydra.reaction.localhost:4445
 OAUTH2_AUTH_URL=http://localhost:4444/oauth2/auth
 OAUTH2_CLIENT_ID=example-storefront
 OAUTH2_CLIENT_SECRET=CHANGEME
-OAUTH2_HOST=hydra.auth.reaction.localhost
-OAUTH2_IDP_HOST_URL=http://reaction.api.reaction.localhost:3000/
-OAUTH2_LOGOUT_URL=http://localhost:3000/account/logout
-OAUTH2_REDIRECT_URL=http://localhost:4000/callback
-OAUTH2_TOKEN_URL=http://hydra.auth.reaction.localhost:4444/oauth2/token
+OAUTH2_PUBLIC_LOGOUT_URL=http://localhost:4444/oauth2/sessions/logout
+OAUTH2_HOST=hydra.reaction.localhost
+OAUTH2_IDP_PUBLIC_CHANGE_PASSWORD_URL=http://localhost:4100/account/change-password?email=EMAIL&from=FROM
+OAUTH2_IDP_HOST_URL=http://identity.reaction.localhost:4100
+OAUTH2_TOKEN_URL=http://hydra.reaction.localhost:4444/oauth2/token
 PORT=4000
 SEGMENT_ANALYTICS_SKIP_MINIMIZE=true
 SEGMENT_ANALYTICS_WRITE_KEY=ENTER_KEY_HERE

diff --git a/.gitignore b/.gitignore
@@ -32,4 +32,4 @@ src/.next/*
 build
 /reports
 
-package-lock.json
+docker-compose.override.yml
diff --git a/.graphqlrc b/.graphqlrc
@@ -1,5 +1,5 @@
 {
   "request": {
-    "url": "http://localhost:3000/graphql-beta"
+    "url": "http://localhost:3000/graphql"
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,56 @@
+# v3.0.0
+
+This is the v3.0.0 release of `example-storefront`, designed to work with v3.0.0 of the Reaction API.
+
+## Features
+
+- feat: remove `-beta` from GraphQL paths [#646](https://github.com/reactioncommerce/example-storefront/pull/646)
+- feat: Use Lambda webhook for automated PR creation and merging into reaction-gitops [#651](https://github.com/reactioncommerce/example-storefront/pull/651)
+- feat: implemented change password flow and standard OpenID logout flow [#637](https://github.com/reactioncommerce/example-storefront/pull/637)
+- feat: auto-create Hydra client on startup [#628](https://github.com/reactioncommerce/example-storefront/pull/628)
+
+## Fixes
+
+- fix: update query with required shopIds array [#656](https://github.com/reactioncommerce/example-storefront/pull/656)
+- fixes: made `bin/setup` handle special characters in variables [#639](https://github.com/reactioncommerce/example-storefront/pull/639)
+- fix: params for withTag API query [#621](https://github.com/reactioncommerce/example-storefront/pull/621)
+- fix: handle OAUTH2_IDP_HOST_URL with no ending slash and missing shop [#627](https://github.com/reactioncommerce/example-storefront/pull/627)
+
+## Chores
+
+- chore: reconfigure docker-compose networks [#653](https://github.com/reactioncommerce/example-storefront/pull/653)
+- chore: copy changes from 2.x/trunk [#650](https://github.com/reactioncommerce/example-storefront/pull/650)
+- chore: use published image for docker-compose [#623](https://github.com/reactioncommerce/example-storefront/pull/623)
+
+## Refactors
+
+- refactor: Update token name `cartToken` [#616](https://github.com/reactioncommerce/example-storefront/pull/616)
+
+## Notes
+
+*These changes were originally tested and released in our alpha and beta releases*
+
+- [v3.0.0-beta.2](https://github.com/reactioncommerce/example-storefront/releases/tag/v3.0.0-beta.2)
+- [v3.0.0-beta](https://github.com/reactioncommerce/example-storefront/releases/tag/v3.0.0-beta)
+- [v3.0.0-alpha.3](https://github.com/reactioncommerce/example-storefront/releases/tag/v3.0.0-alpha.3)
+- [v3.0.0-alpha.2](https://github.com/reactioncommerce/example-storefront/releases/tag/v3.0.0-alpha.2)
+- [v3.0.0-alpha](https://github.com/reactioncommerce/example-storefront/releases/tag/v3.0.0-alpha)
+
+*The following Reaction projects are being released one time in coordination as v3.0.0*
+
+- [Reaction API](https://github.com/reactioncommerce/reaction)
+- [Reaction Hydra](https://github.com/reactioncommerce/reaction-hydra)
+- [Reaction Identity](https://github.com/reactioncommerce/reaction-identity)
+- [Reaction Admin (beta)](https://github.com/reactioncommerce/reaction-admin)
+- [Example Storefront](https://github.com/reactioncommerce/example-storefront)
+- [Reaction Development Platform](https://github.com/reactioncommerce/reaction-development-platform)
+
+*After this release, Reaction releases will no longer be coordinated across all projects - we'll release each project independently, as needed. This means version numbers will no longer be in sync. The newest versions of each project will work together.*
+
 # v2.9.1
 
 Example Storefront v2.9.1 is a patch update to keep this project in sync with [Reaction v2.9.1](https://github.com/reactioncommerce/reaction) and [reaction-hydra v2.9.1](https://github.com/reactioncommerce/reaction-hydra)
 
-
 ## Fixes
 
 - fix: login from storefront [#633](https://github.com/reactioncommerce/example-storefront/pull/633)

diff --git a/README.md b/README.md
@@ -25,19 +25,16 @@ This example storefront is built with [Next.js](https://nextjs.org/), [React](ht
 
 Follow the [Reaction Platform docs](https://docs.reactioncommerce.com/docs/installation-reaction-platform) to install and run all the services necessary to run the storefront:
 
-| Directory: Service                                                                         | URL                                                          |
-| ------------------------------------------------------------------------------------------ | ------------------------------------------------------------ |
-| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL API                    | [localhost:3000/graphql-beta](localhost:3000/graphql-beta)   |
-| [`reaction`](https://github.com/reactioncommerce/reaction): GraphiQL developer tool        | [localhost:3000/graphql-beta](localhost:3000/graphql-beta)   |
-| [`reaction`](https://github.com/reactioncommerce/reaction): Operator UI                    | [localhost:3000](localhost:3000)                             |
-| [`reaction`](https://github.com/reactioncommerce/reaction): MongoDB                        | [localhost:27017](localhost:27017)                           |
-| [`reaction-hydra`](https://github.com/reactioncommerce/reaction-hydra): Authentication     | [localhost:4444](localhost:4444)                             |
-| [`example-storefront`](https://github.com/reactioncommerce/example-storefront): Storefront | [localhost:4000](localhost:4000)                             |
-
-**Note**: The storefront has redirects so if you open any of the following URLs, you'll be redirected to the GraphiQL developer tool:
-- [localhost:4000/graphql]()
-- [localhost:4000/graphql-beta]()
-- [localhost:4000/graphiql]()
+| Directory: Service                                                                            | URL                                              |
+|-----------------------------------------------------------------------------------------------|--------------------------------------------------|
+| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL API                       | [localhost:3000/graphql](localhost:3000/graphql) |
+| [`reaction`](https://github.com/reactioncommerce/reaction): GraphQL Playground developer tool | [localhost:3000/graphql](localhost:3000/graphql) |
+| [`reaction`](https://github.com/reactioncommerce/reaction): Reaction Admin                    | [localhost:4080](localhost:4080)                 |
+| [`reaction`](https://github.com/reactioncommerce/reaction): MongoDB                           | [localhost:27017](localhost:27017)               |
+| [`reaction-hydra`](https://github.com/reactioncommerce/reaction-hydra): Authentication        | [localhost:4444](localhost:4444)                 |
+| [`example-storefront`](https://github.com/reactioncommerce/example-storefront): Storefront    | [localhost:4000](localhost:4000)                 |
+
+**Note**: The storefront has redirects so that if you open [http://localhost:4000/graphql](http://localhost:4000/graphql), you'll be redirected to the GraphQL Playground.
 
 ## Configuration
 
@@ -78,7 +75,7 @@ docker-compose up -d && docker-compose logs -f
 
 ### Run in development against a production API
 
-Change the `INTERNAL_GRAPHQL_URL` in `.env` to the production API URL. The URL should end in `/graphql-beta`, like: `https://my-website.com/graphql-beta`. Save the `.env` file and restart the application with:
+Change the `INTERNAL_GRAPHQL_URL` in `.env` to the production API URL. The URL should end in `/graphql`, like: `https://my-website.com/graphql`. Save the `.env` file and restart the application with:
 
 ```sh
 docker-compose run --rm --service-ports web yarn start
@@ -152,7 +149,7 @@ Sometimes we need to test the [Example Storefront Component Library](https://git
 1. After the build is done, `cd` into the new `dist` folder it just built and run `yarn link` to allow the library to be installed into the storefront. This will link `@reactioncommerce/components`
 1. Inside the `example-storefront` repo, temporarily rename your `.yarnrc` file to anything else (i.e. `.yarnrc-temp`)
 1. Run `yarn install` and then the command `yarn link "@reactioncommerce/components"` to set the local version as an override of the published npm version
-1. Inside your `.env` file, change `INTERNAL_GRAPHQL_URL` to equal `http://localhost:3030/graphql-beta`, the same as the `EXTERNAL_GRAPHQL_URL`
+1. Inside your `.env` file, change `INTERNAL_GRAPHQL_URL` to equal `http://localhost:3000/graphql`, the same as the `EXTERNAL_GRAPHQL_URL`
 1. Start the storefront locally by running the command `export $(cat .env | xargs) && yarn dev`
 1. Your storefront should now be running at `localhost:4000`
     - If you see errors about not being able to find peer dependency packages, that seems to be an issues with yarn linking. You can just temporarily `yarn add` each of those packages in the component library `package/dist` folder. (This folder is gitignored anyway.)
@@ -191,7 +188,7 @@ docker build -t reaction-storefront .
 Then, to start the app on your machine, make sure the Reaction API container is already running and enter:
 
 ```sh
-docker run -it --name storefront -p 4000:4000 --env-file .env --network api.reaction.localhost reaction-storefront
+docker run -it --name storefront -p 4000:4000 --env-file .env --network reaction.localhost reaction-storefront
 ```
 
 _**NOTE:** You can replace the number before the colon in `4000:4000` with a different localhost port you'd like the application to run at._

diff --git a/bin/create-hydra-client.js b/bin/create-hydra-client.js
diff --git a/bin/setup b/bin/setup
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-__dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-env_file=${__dir}/../.env
-env_example_file=${__dir}/../.env.example
+cd "$(dirname "${BASH_SOURCE[0]}")/.."
+env_file=./.env
+env_example_file=./.env.example
 
 function main {
   set -e
@@ -17,7 +17,7 @@ function add_new_env_vars {
   export IFS=$'\n'
   for var in $(cat "${env_example_file}"); do
     key="${var%%=*}"     # get var key
-    var=$(eval echo "$var") # generate dynamic values
+    var=$(command echo "$var") # generate dynamic values
 
     # If .env doesn't contain this env key, add it
     if ! $(grep -qLE "^$key=" "${env_file}"); then

diff --git a/bin/start b/bin/start
@@ -8,7 +8,7 @@ IFS="$(printf "\n\t")"
 
 cd "$(dirname "$0")/.."
 yarn install
-printf "Creating hydra client…"
+printf "Waiting for Hydra service...  "
 ./bin/wait-for.sh "${OAUTH2_HOST}:${OAUTH2_ADMIN_PORT}"
-./bin/create-hydra-client.js
-yarn dev
+printf "Hydra service found!\n"
+yarn start:dev
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,27 @@
+# This docker-compose file is used to run the project in Docker for development.
+# The local files are mounted into the created container.
+#
+# Usage:
+#  ln -s docker-compose.dev.yml docker-compose.override.yml
+#  docker-compose up [-d]
+#
+# To go back to running the published image:
+#  rm docker-compose.override.yml
+
+version: '3.4'
+
+services:
+  web:
+    image: reactioncommerce/node-dev:10.16.3-v2
+    command: "./bin/start"
+    volumes:
+      - .:/usr/local/src/app
+      - web-yarn:/home/node/.cache/yarn
+      # Do not link in node_modules from the host
+      # This allows IDEs to run lint etc with native add-ons for host OS
+      # Without interfering with native add-ons in container
+      - empty_node_modules:/usr/local/src/app/node_modules
+
+volumes:
+  web-yarn:
+  empty_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,37 +1,23 @@
-# This docker-compose file is used to run the Example Storefront in Docker for development.
-# The local files are mounted into the created container.
+# This docker-compose file is used to run the project's published image
+#
 # Usage: docker-compose up [-d]
+#
+# See comment in docker-compose.dev.yml if you want to run for development.
 
 version: '3.4'
 
 networks:
-  api:
+  reaction:
     external:
-      name: api.reaction.localhost
-  auth.reaction.localhost:
-    external:
-      name: auth.reaction.localhost
+      name: reaction.localhost
 
 services:
   web:
-    image: reactioncommerce/node-dev:10.16.3-v2
+    image: reactioncommerce/example-storefront:release-v3.0.0
     env_file:
       - ./.env
     networks:
-      api:
-        aliases:
-          - storefront
-      auth.reaction.localhost:
+      default:
+      reaction:
     ports:
       - 4000:4000
-    volumes:
-      - web-yarn:/home/node/.cache/yarn
-      - .:/usr/local/src/app
-      # Do not link in node_modules from the host
-      # This allows IDEs to run lint etc with native add-ons for host OS
-      # Without interfering with native add-ons in container
-      - empty_node_modules:/usr/local/src/app/node_modules
-
-volumes:
-  web-yarn:
-  empty_node_modules:
diff --git a/docs/README.md b/docs/README.md
@@ -20,8 +20,3 @@ docker-compose run --rm web adr new "Implement the Torpedos"
 
 - [Testing](testing.md)
 - [Patterns](testing.md#patterns)
-
-## Tools and Utilities
-
-- [Tools to help with development](utilities.md)
-- [GraphiQL App installation and setup](utilities.md#graphiql-app)