Merge pull request #9 from reactioncommerce/chore-mikemurray-dev-scripts

feat/core: Update dev scripts

.env.example

@@ -1,4 +1,14 @@
+# Devserver
+DEV_SERVER_PORT=8081
+
+# ORY Hydra clinet configuration
+HYDRA_OAUTH2_ADMIN_HOST=localhost
+HYDRA_OAUTH2_ADMIN_PORT=4445
+HYDRA_OAUTH2_CLIENT_ID=reaction-admin-core
+HYDRA_REDIRECT_URL=http://localhost:8081
+
+# Public vars for the web-app
 PUBLIC_GRAPHQL_API_URL=http://localhost:3000/graphql
 PUBLIC_OIDC_CLIENT_ID=reaction-admin-core
 PUBLIC_OIDC_URL=http://localhost:4444
-PUBLIC_ROOT_URL=http://localhost:8081
+PUBLIC_ROOT_URL=http://localhost:8081

README.md

@@ -4,13 +4,13 @@
 
 ### With Docker
 
+1. `cp .env.example .env`
 1. `docker-compose up`
 
 ### Outside of Docker
 
-1. `npm install`
-1. `cd package && npm install`
-1. `cd package && mpn run init:hydra`
+1. `npm install && (cd package && npm install)`
+1. `cp .env.example .env`
 1. `npm start`
 
 ### Developer Certificate of Origin

package.json

@@ -4,21 +4,15 @@
   "description": "Reaction admin core library testing app",
   "main": "index.js",
   "scripts": {
-    "build": "./package/bin/reaction-plugin-build",
+    "build": "./package/bin/build-plugin",
     "build:app": "webpack --config ./package/config/webpack.prod.js",
     "bp": "npm run build && npm run publish",
-    "publish": "yalc publish --push",
-    "hydra:init": "node ./package/bin/create-hydra-client.js",
     "lint": "eslint ./package/src",
-    "start": "./package/bin/server.js --port 8081",
+    "start": "./package/bin/dev-server",
     "test": "jest ./package/src",
     "test:watch": "jest --watch ./package/src",
     "test:file": "jest --no-cache --watch"
   },
-  "bin": {
-    "reaction": "./package/bin/server.js",
-    "reaction-build": "./package/bin/reaction-plugin-build"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",

package/bin/reaction-plugin-build → package/bin/build-plugin

@@ -9,10 +9,11 @@ rimraf dist-modules-temp
 BABEL_ENV=production BABEL_MODULES=1 babel --root-mode upward src --out-dir dist
 
 # Copy build scripts, config and other sources
-cp -r bin dist/bin
-cp -r config dist/config
-cp -r src/graphql dist/graphql
-cp -r src/test-utils dist/test-utils
-cp package.json dist/package.json
-cp README.md dist/README.md
-cp LICENSE dist/LICENSE
+cp -r bin dist
+cp -r config dist
+cp -r scripts dist
+cp -r src/graphql dist
+cp -r src/test-utils dist
+cp package.json dist
+cp README.md dist
+cp LICENSE dist

package/bin/dev-server

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+/* eslint-disable node/shebang */
+require("../scripts/devServer")();

package/bin/init-hydra

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+/* eslint-disable node/shebang */
+const createHydraClient = require("../scripts/createHydraClient");
+
+/**
+ * Run command
+ * @returns {undefined}
+ */
+async function run() {
+  await createHydraClient();
+  // eslint-disable-next-line no-process-exit
+  process.exit(10);
+}
+
+run();

package/config/webpack.common.js

@@ -35,7 +35,6 @@ module.exports = {
       },
       {
         test: /\.(graphql|gql)$/,
-        exclude: /node_modules/,
         loader: "graphql-tag/loader"
       },
       {

package/package.json

@@ -16,12 +16,12 @@
     "access": "public"
   },
   "scripts": {
-    "build": "bin/reaction-plugin-build",
-    "init:hydra": "node bin/create-hydra-client.js"
+    "build": "bin/build-plugin"
   },
   "bin": {
-    "reaction": "./bin/server.js",
-    "reaction-build": "./bin/reaction-plugin-build"
+    "reaction-dev-server": "./bin/dev-server",
+    "reaction-build-plugin": "./bin/build-plugin",
+    "reaction-init-hydra": "./bin/init-hydra"
   },
   "dependencies": {
     "@apollo/react-hooks": "^3.1.3",
@@ -73,7 +73,6 @@
     "html-loader": "~0.5.5",
     "html-webpack-plugin": "~3.2.0",
     "jest": "^25.1.0",
-    "minimist": "~1.2.5",
     "oidc-client": "~1.10.1",
     "prop-types": "^15.7.2",
     "raf": "^3.4.1",

package/scripts/createHydraClient.js

@@ -0,0 +1,108 @@
+/* eslint-disable no-console */
+// eslint-disable-next-line node/no-extraneous-require
+require("dotenv").config();
+const http = require("http");
+const { URL } = require("url");
+const envalid = require("envalid");
+
+const {
+  HYDRA_OAUTH2_ADMIN_HOST,
+  HYDRA_OAUTH2_ADMIN_PORT,
+  HYDRA_OAUTH2_CLIENT_ID,
+  HYDRA_REDIRECT_URL
+} = envalid.cleanEnv(process.env, {
+  HYDRA_OAUTH2_ADMIN_HOST: envalid.str({
+    desc: "Hydra admin hostname",
+    example: "localhost"
+  }),
+  HYDRA_OAUTH2_ADMIN_PORT: envalid.num({
+    default: "reaction-admin-core",
+    desc: "Hydra admin port",
+    example: 4445
+  }),
+  HYDRA_OAUTH2_CLIENT_ID: envalid.str({
+    desc: "Client ID",
+    example: "reaction-admin-core"
+  }),
+  HYDRA_REDIRECT_URL: envalid.url({
+    desc: "The canonical root URL for the Reaction Admin Core site",
+    example: "http://localhost:8080"
+  })
+});
+
+const makeAbsolute = (relativeUrl, baseUrl = HYDRA_REDIRECT_URL) => {
+  const url = new URL(relativeUrl, baseUrl);
+  return url.href;
+};
+
+/* eslint-disable camelcase */
+const bodyEncoded = JSON.stringify({
+  client_id: HYDRA_OAUTH2_CLIENT_ID,
+  token_endpoint_auth_method: "none",
+  redirect_uris: [
+    makeAbsolute("/authentication/callback"),
+    makeAbsolute("/authentication/silent_callback")
+  ],
+  grant_types: ["authorization_code"],
+  response_types: ["code"],
+  post_logout_redirect_uris: [HYDRA_REDIRECT_URL]
+});
+/* eslint-enable camelcase */
+
+const options = {
+  hostname: HYDRA_OAUTH2_ADMIN_HOST,
+  port: HYDRA_OAUTH2_ADMIN_PORT,
+  path: "/clients",
+  method: "POST",
+  headers: {
+    "Content-Type": "application/json",
+    "Content-Length": Buffer.byteLength(bodyEncoded)
+  }
+};
+
+/**
+ * Create Hydra client
+ * @returns {Promise} A promise that resolves on success and rejects of failure
+ */
+module.exports = async function createHydraClient() {
+  const promise = new Promise((resolve, reject) => {
+    const req = http.request(options, (res) => {
+      res.setEncoding("utf8");
+      let body = "";
+
+      res.on("data", (chunk) => {
+        body += chunk.toString();
+      });
+
+      res.on("end", () => {
+        switch (res.statusCode) {
+          case 200:
+          // intentional fallthrough!
+          // eslint-disable-line no-fallthrough
+          case 201:
+            console.log("OK: hydra client created");
+            resolve();
+            break;
+          case 409:
+            console.log("OK: hydra client already exists");
+            resolve();
+            break;
+          default:
+            console.error("ERROR: Could not create hydra client");
+            console.error(body);
+            reject(10);
+        }
+      });
+    });
+
+    req.on("error", (error) => {
+      console.error("ERROR: Could not create hydra client");
+      console.error(error.message);
+      reject(11);
+    });
+
+    req.end(bodyEncoded);
+  });
+
+  return promise;
+};