@abgov/nx-adsp 5.0.0 → 5.1.1-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "5.0.0",
+  "version": "5.1.1-beta.1",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",
@@ -18,7 +18,9 @@
   "dependencies": {
     "@angular-devkit/core": "^15.0.0",
     "@angular-devkit/schematics": "^15.0.0",
-    "camelcase": "^5.3.1"
+    "axios": "1.1.3",
+    "express": "4.18.1",
+    "open": "^8.4.0"
   },
   "generators": "./generators.json",
   "types": "./src/index.d.ts"

package/src/generators/angular-app/angular-app.js

@@ -5,22 +5,24 @@ const devkit_1 = require("@nrwl/devkit");
 const path = require("path");
 const adsp_utils_1 = require("../../utils/adsp-utils");
 function normalizeOptions(host, options) {
-    const projectName = (0, devkit_1.names)(options.name).fileName;
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
-    const projectOrg = (0, devkit_1.getWorkspaceLayout)(host).npmScope;
-    const openshiftDirectory = `.openshift/${projectName}`;
-    const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
-    const nginxProxies = Array.isArray(options.proxy) ?
-        [...options.proxy] :
-        (options.proxy ?
-            [options.proxy] :
-            []);
-    return Object.assign(Object.assign({}, options), { projectName,
-        projectRoot,
-        openshiftDirectory,
-        projectOrg,
-        adsp,
-        nginxProxies });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = (0, devkit_1.names)(options.name).fileName;
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
+        const projectOrg = (0, devkit_1.getWorkspaceLayout)(host).npmScope;
+        const openshiftDirectory = `.openshift/${projectName}`;
+        const adsp = yield (0, adsp_utils_1.getAdspConfiguration)(host, options);
+        const nginxProxies = Array.isArray(options.proxy)
+            ? [...options.proxy]
+            : options.proxy
+                ? [options.proxy]
+                : [];
+        return Object.assign(Object.assign({}, options), { projectName,
+            projectRoot,
+            openshiftDirectory,
+            projectOrg,
+            adsp,
+            nginxProxies });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.adsp), (0, devkit_1.names)(options.name)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), tmpl: '' });
@@ -35,12 +37,12 @@ function addFiles(host, options) {
                 target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
                 secure: upstreamUrl.protocol === 'https:',
                 changeOrigin: false,
-                pathRewrite: {}
+                pathRewrite: {},
             };
             // If there is a path on the upstream url, then add a rewrite.
             if (upstreamUrl.pathname.length > 1) {
                 proxy.pathRewrite = {
-                    [`^${nginxProxy.location}`]: upstreamUrl.pathname
+                    [`^${nginxProxy.location}`]: upstreamUrl.pathname,
                 };
             }
             return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
@@ -55,13 +57,13 @@ function removeFiles(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         const { applicationGenerator: initAngular } = yield Promise.resolve().then(() => require('@nrwl/angular/generators'));
         yield initAngular(host, { name: options.name });
         (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@abgov/angular-components': '^1.7.1',
             '@abgov/core-css': '^1.0.0',
-            '@angular/cdk': "^11.2.0",
+            '@angular/cdk': '^11.2.0',
             '@angular/localize': '^11.2.0',
             'html-webpack-plugin': '~4.5.2',
             'oidc-client': '~1.11.5',
@@ -74,10 +76,10 @@ function default_1(host, options) {
         config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), { assets: [
                 ...config.targets.build.options.assets,
                 {
-                    "glob": "nginx.conf",
-                    "input": `${layout.appsDir}/${options.name}`,
-                    "output": "./"
-                }
+                    glob: 'nginx.conf',
+                    input: `${layout.appsDir}/${options.name}`,
+                    output: './',
+                },
             ] });
         if (addedProxy) {
             // Add the webpack dev server proxy if there is proxy configuration.

package/src/generators/angular-app/angular-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"angular-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/angular-app/angular-app.ts"],"names":[],"mappings":"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"}

package/src/generators/angular-app/angular-app.spec.ts

@@ -8,7 +8,8 @@ describe('angular app generator', () => {
   let appTree: Tree;
   const options: AngularAppGeneratorSchema = {
     name: 'test',
-    tenant: 'testtenant',
+    env: 'dev',
+    realm: 'testtenant',
   };
 
   beforeEach(() => {

package/src/generators/angular-app/schema.d.ts

@@ -1,15 +1,17 @@
+import { EnvironmentName } from '../../utils/environments';
+
 export interface AngularAppGeneratorSchema {
   name: string;
-  tenant: string;
-  proxy?: NginxProxyConfiguration | NginxProxyConfiguration[]
+  env: EnvironmentName;
+  realm: string;
+  proxy?: NginxProxyConfiguration | NginxProxyConfiguration[];
 }
 
-
 export interface NormalizedSchema extends AngularAppGeneratorSchema {
   projectName: string;
   projectRoot: string;
   projectOrg: string;
   openshiftDirectory: string;
-  adsp: AdspConfiguration
+  adsp: AdspConfiguration;
   nginxProxies: NginxProxyConfiguration[];
 }

package/src/generators/angular-app/schema.json

@@ -14,15 +14,33 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
+    },
+    "realm": {
+      "type": "string",
+      "description": "Realm of the ADSP tenant.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "alias": "r",
+      "x-prompt": "What is the realm of your ADSP tenant?"
     },
     "proxy": {
       "oneOf": [
@@ -38,7 +56,10 @@
                 "type": "string"
               }
             },
-            "required": ["location", "proxyPass"]
+            "required": [
+              "location",
+              "proxyPass"
+            ]
           }
         },
         {
@@ -51,10 +72,17 @@
               "type": "string"
             }
           },
-          "required": ["location", "proxyPass"]
+          "required": [
+            "location",
+            "proxyPass"
+          ]
         }
       ]
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/generators/dotnet-service/dotnet-service.js

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const camelcase_1 = require("camelcase");
 const path = require("path");
 const adsp_utils_1 = require("../../utils/adsp-utils");
 function normalizeOptions(host, options) {
-    const projectName = (0, devkit_1.names)(options.name).fileName;
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
-    const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
-    return Object.assign(Object.assign({}, options), { projectName,
-        projectRoot,
-        adsp, namespace: (0, camelcase_1.default)(options.namespace || projectName, {
-            pascalCase: true,
-        }) });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = (0, devkit_1.names)(options.name).fileName;
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
+        const adsp = yield (0, adsp_utils_1.getAdspConfiguration)(host, options);
+        return Object.assign(Object.assign({}, options), { projectName,
+            projectRoot,
+            adsp });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
@@ -24,7 +23,7 @@ function default_1(host, options) {
         if (!(0, adsp_utils_1.hasDependency)(host, '@nx-dotnet/core')) {
             throw new Error('nx-dotnet/core is required to generate dotnet service');
         }
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         const { default: appGenerator } = yield Promise.resolve().then(() => require(`${'@nx-dotnet/core/src/generators/app/generator'}`));
         const { default: refGenerator } = yield Promise.resolve().then(() => require(`${'@nx-dotnet/core/src/generators/nuget-reference/generator'}`));
         yield appGenerator(host, {

package/src/generators/dotnet-service/dotnet-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,yCAAkC;AAClC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CAAC,IAAU,EAAE,OAAe;IACnD,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;IAEzE,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,IAAI,EACJ,SAAS,EAAE,IAAA,mBAAS,EAAC,OAAO,CAAC,SAAS,IAAI,WAAW,EAAE;YACrD,UAAU,EAAE,IAAI;SACjB,CAAC,IACF;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,0BAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAChC,GAAG,8CAA8C,EAAE,EACpD,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAChC,GAAG,0DAA0D,EAAE,EAChE,CAAC;QAEF,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CAAC,IAAI,kCACzB,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;SACJ;QAED,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AA5CD,4BA4CC"}
+{"version":3,"file":"dotnet-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/dotnet-service/dotnet-service.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,IAAI,CAAC,IAAA,0BAAa,EAAC,IAAI,EAAE,iBAAiB,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAChC,GAAG,8CAA8C,EAAE,EACpD,CAAC;QAEF,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,2CAChC,GAAG,0DAA0D,EAAE,EAChE,CAAC;QAEF,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,IAAI,EAAE,iBAAiB,CAAC,WAAW;YACnC,QAAQ,EAAE,QAAQ;YAClB,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,MAAM;YACpB,YAAY,EAAE,KAAK;YACnB,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;QAEH,MAAM,YAAY,CAAC,IAAI,EAAE;YACvB,OAAO,EAAE,iBAAiB,CAAC,WAAW;YACtC,WAAW,EAAE,UAAU;YACvB,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAElC,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CAAC,IAAI,kCACzB,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;SACJ;QAED,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AA5CD,4BA4CC"}

package/src/generators/dotnet-service/dotnet-service.spec.ts

@@ -14,7 +14,8 @@ const refGeneratorMock = refGenerator as jest.Mocked<typeof refGenerator>;
 describe('Dotnet Service Generator', () => {
   const options: Schema = {
     name: 'test',
-    tenant: 'test',
+    env: 'dev',
+    realm: 'test',
   };
 
   it('can run', async () => {

package/src/generators/dotnet-service/schema.d.ts

@@ -2,13 +2,12 @@ import { AdspConfiguration } from '../../utils/adsp';
 
 export interface Schema {
   name: string;
-  tenant: string;
-  namespace?: string;
+  env: EnvironmentName;
+  realm: string;
 }
 
 export interface NormalizedSchema extends Schema {
   projectName: string;
   projectRoot: string;
   adsp: AdspConfiguration;
-  namespace: string;
 }

package/src/generators/dotnet-service/schema.json

@@ -14,21 +14,38 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
     },
-    "namespace": {
+    "realm": {
       "type": "string",
-      "description": "Default namespace to use.",
-      "alias": "n"
+      "description": "Realm of the ADSP tenant.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "alias": "r",
+      "x-prompt": "What is the realm of your ADSP tenant?"
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/generators/express-service/express-service.js

@@ -1,18 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const test_runners_1 = require("@nrwl/angular/src/utils/test-runners");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
 const path = require("path");
 const adsp_utils_1 = require("../../utils/adsp-utils");
 function normalizeOptions(host, options) {
-    const projectName = (0, devkit_1.names)(options.name).fileName;
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
-    const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
-    return Object.assign(Object.assign({}, options), { projectName,
-        projectRoot,
-        adsp });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = (0, devkit_1.names)(options.name).fileName;
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
+        const adsp = yield (0, adsp_utils_1.getAdspConfiguration)(host, options);
+        return Object.assign(Object.assign({}, options), { projectName,
+            projectRoot,
+            adsp });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
@@ -20,13 +21,13 @@ function addFiles(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         const { applicationGenerator: initExpress } = yield Promise.resolve().then(() => require('@nrwl/express'));
-        yield initExpress(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipPackageJson: false, linter: linter_1.Linter.EsLint, unitTestRunner: test_runners_1.UnitTestRunner.Jest, pascalCaseFiles: false, js: false }));
+        yield initExpress(host, Object.assign(Object.assign({}, options), { skipFormat: true, skipPackageJson: false, linter: linter_1.Linter.EsLint, unitTestRunner: 'jest', pascalCaseFiles: false, js: false }));
         (0, devkit_1.addDependenciesToPackageJson)(host, {
             '@abgov/adsp-service-sdk': '^1.18.0',
-            'dotenv': '^16.0.0',
-            'passport': '^0.6.0',
+            dotenv: '^16.0.0',
+            passport: '^0.6.0',
             'passport-anonymous': '^1.0.1',
         }, {
             '@types/passport': '^1.0.9',

package/src/generators/express-service/express-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,uEAAsE;AACtE,yCAQsB;AACtB,yCAAsC;AACtC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;IAEzE,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,IAAI,IACJ;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,2CAAa,eAAe,EAAC,CAAC;QAC5E,MAAM,WAAW,CACf,IAAI,kCAEC,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,cAAc,EAAE,6BAAc,CAAC,IAAI,EACnC,eAAe,EAAE,KAAK,EACtB,EAAE,EAAE,KAAK,IAEZ,CAAC;QAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,yBAAyB,EAAE,SAAS;YACpC,QAAQ,EAAE,SAAS;YACnB,UAAU,EAAE,QAAQ;YACpB,oBAAoB,EAAE,QAAQ;SAC/B,EACD;YACE,iBAAiB,EAAE,QAAQ;YAC3B,2BAA2B,EAAE,QAAQ;SACtC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CACvB,IAAI,kCAEC,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IAEzC,CAAC;SACH;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AAhDD,4BAgDC"}
+{"version":3,"file":"express-service.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/express-service/express-service.ts"],"names":[],"mappings":";;;AAAA,yCAQsB;AACtB,yCAAsC;AACtC,6BAA6B;AAC7B,uDAA6E;AAG7E,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QACjD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,OAAO,CAAC,IAAI,KACf,IAAI,EAAE,EAAE,GACT,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,2CAAa,eAAe,EAAC,CAAC;QAC5E,MAAM,WAAW,CAAC,IAAI,kCACjB,OAAO,KACV,UAAU,EAAE,IAAI,EAChB,eAAe,EAAE,KAAK,EACtB,MAAM,EAAE,eAAM,CAAC,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,KAAK,EACtB,EAAE,EAAE,KAAK,IACT,CAAC;QAEH,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,yBAAyB,EAAE,SAAS;YACpC,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,QAAQ;YAClB,oBAAoB,EAAE,QAAQ;SAC/B,EACD;YACE,iBAAiB,EAAE,QAAQ;YAC3B,2BAA2B,EAAE,QAAQ;SACtC,CACF,CAAC;QAEF,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QAClC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,IAAI,IAAA,0BAAa,EAAC,IAAI,EAAE,cAAc,CAAC,EAAE;YACvC,MAAM,EAAE,mBAAmB,EAAE,GAAG,2CAAa,GAAG,cAAc,EAAE,EAAC,CAAC;YAClE,MAAM,mBAAmB,CAAC,IAAI,kCACzB,OAAO,KACV,OAAO,EAAE,iBAAiB,CAAC,WAAW,IACtC,CAAC;SACJ;QAED,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AA1CD,4BA0CC"}

package/src/generators/express-service/express-service.spec.ts

@@ -6,7 +6,7 @@ import generator from './express-service';
 describe('Express Service Generator', () => {
   const options: Schema = {
     name: 'test',
-    tenant: 'test',
+    env: 'dev',
     realm: 'test',
   };
 

package/src/generators/express-service/schema.d.ts

@@ -1,13 +1,14 @@
 import { AdspConfiguration } from '../../utils/adsp';
+import { EnvironmentName } from '../../utils/environments';
 
 export interface Schema {
   name: string;
-  tenant: string;
+  env: EnvironmentName;
   realm: string;
 }
 
 export interface NormalizedSchema extends Schema {
   projectName: string;
   projectRoot: string;
-  adsp: AdspConfiguration
+  adsp: AdspConfiguration;
 }

package/src/generators/express-service/schema.json

@@ -14,15 +14,23 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
     },
     "realm": {
       "type": "string",
@@ -35,5 +43,9 @@
       "x-prompt": "What is the realm of your ADSP tenant?"
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/generators/mern/mern.js

@@ -7,17 +7,19 @@ const adsp_utils_1 = require("../../utils/adsp-utils");
 const express_service_1 = require("../express-service/express-service");
 const react_app_1 = require("../react-app/react-app");
 function normalizeOptions(host, options) {
-    const name = (0, devkit_1.names)(options.name).fileName;
-    const projectDirectory = name;
-    const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectDirectory}`;
-    const openshiftDirectory = `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${projectDirectory}`;
-    const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
-    return Object.assign(Object.assign({}, options), { projectName,
-        projectRoot,
-        projectDirectory,
-        openshiftDirectory,
-        adsp });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const name = (0, devkit_1.names)(options.name).fileName;
+        const projectDirectory = name;
+        const projectName = projectDirectory.replace(new RegExp('/', 'g'), '-');
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectDirectory}`;
+        const openshiftDirectory = `${path.dirname((0, devkit_1.getWorkspacePath)(host))}/.openshift/${projectDirectory}`;
+        const adsp = yield (0, adsp_utils_1.getAdspConfiguration)(host, options);
+        return Object.assign(Object.assign({}, options), { projectName,
+            projectRoot,
+            projectDirectory,
+            openshiftDirectory,
+            adsp });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), template: '' });
@@ -26,11 +28,11 @@ function addFiles(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         yield (0, express_service_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service` }));
         yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
                 location: '/api/',
-                proxyPass: `http://${options.name}-service:3333/${options.name}-service/`
+                proxyPass: `http://${options.name}-service:3333/${options.name}-service/`,
             } }));
         // Currently no files specific to MERN generator.
         // addFiles(host, normalizedOptions);

package/src/generators/mern/mern.js.map

@@ -1 +1 @@
-{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAe;IAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;IAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;IAE9E,MAAM,kBAAkB,GACtB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC,eAAe,gBAAgB,EAAE,CAAA;IAE1E,MAAM,IAAI,GAAG,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEjD,uCACK,OAAO,KACV,WAAW;QACX,WAAW;QACX,gBAAgB;QAChB,kBAAkB;QAClB,IAAI,IACJ;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KACtB,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAC/B,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,IAAA,yBAAkB,EACtB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAElC,CAAC;QAEF,MAAM,IAAA,mBAAY,EAChB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IAEJ,CAAC;QAEF,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA/BD,4BA+BC"}
+{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,wEAAoE;AACpE,sDAAkD;AAGlD,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;QAEf,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC;QAC9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,gBAAgB,EAAE,CAAC;QAE9E,MAAM,kBAAkB,GAAG,GAAG,IAAI,CAAC,OAAO,CACxC,IAAA,yBAAgB,EAAC,IAAI,CAAC,CACvB,eAAe,gBAAgB,EAAE,CAAC;QAEnC,MAAM,IAAI,GAAG,MAAM,IAAA,iCAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEvD,uCACK,OAAO,KACV,WAAW;YACX,WAAW;YACX,gBAAgB;YAChB,kBAAkB;YAClB,IAAI,IACJ;IACJ,CAAC;CAAA;AAED,SAAS,QAAQ,CAAC,IAAU,EAAE,OAAyB;IACrD,MAAM,eAAe,iDAChB,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KACtB,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,EAAE,GACb,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,OAAO,CAAC,WAAW,EACnB,eAAe,CAChB,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,EACjC,GAAG,OAAO,CAAC,kBAAkB,EAAE,EAC/B,eAAe,CAChB,CAAC;AACJ,CAAC;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,yBAAkB,EAAC,IAAI,kCACxB,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IACD,CAAC;QAEH,iDAAiD;QACjD,qCAAqC;QACrC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAxBD,4BAwBC"}

package/src/generators/mern/mern.spec.ts

@@ -6,7 +6,7 @@ import generator from './mern';
 describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
-    tenant: 'test',
+    env: 'dev',
     realm: 'test',
   };
 

package/src/generators/mern/schema.d.ts

@@ -1,8 +1,9 @@
-import { AdspConfiguration } from "../../utils/adsp";
+import { AdspConfiguration } from '../../utils/adsp';
+import { EnvironmentName } from '../../utils/environments';
 
 export interface Schema {
   name: string;
-  tenant: string;
+  env: EnvironmentName;
   realm: string;
 }
 
@@ -11,5 +12,5 @@ export interface NormalizedSchema extends Schema {
   projectRoot: string;
   projectDirectory: string;
   openshiftDirectory: string;
-  adsp: AdspConfiguration
+  adsp: AdspConfiguration;
 }

package/src/generators/mern/schema.json

@@ -14,15 +14,23 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
     },
     "realm": {
       "type": "string",
@@ -35,5 +43,9 @@
       "x-prompt": "What is the realm of your ADSP tenant?"
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/generators/react-app/files/src/app/app.tsx__tmpl__

@@ -2,12 +2,11 @@ import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { UserManager } from 'oidc-client';
 import { UserState } from 'redux-oidc';
-import { GoAButton, GoAHeader, GoAHeroBanner } from '@abgov/react-components';
+import { GoAAppHeader, GoAButton, GoAMicrositeHeader, GoAHeroBanner } from '@abgov/react-components';
 
+import { AppDispatch } from '../store';
 import styles from './app.module.css';
-import '@abgov/core-css/goa-core.css';
-import '@abgov/core-css/goa-components.css';
-import '@abgov/react-components/react-components.esm.css';
+import '@abgov/styles/styles.esm.css';
 import { 
   fetchPrivateResource, 
   fetchPublicResource, 
@@ -26,7 +25,7 @@ export function App({ userManager }: AppProps) {
   const publicResource = useSelector(publicResourceSelector);
   const privateResource = useSelector(privateResourceSelector);
 
-  const dispatch = useDispatch();
+  const dispatch = useDispatch<AppDispatch>();
 
   useEffect(() => {
     dispatch(fetchPublicResource());
@@ -37,13 +36,13 @@ export function App({ userManager }: AppProps) {
 
   return (
     <div className={styles.app}>
-      <GoAHeader
-        serviceLevel="alpha"
-        serviceName="Digital Service Example"
-        serviceHome="/"
+      <GoAMicrositeHeader type="alpha" />
+      <GoAAppHeader
+        url="/"
+        heading="Digital Service Example"
       />
       <GoAHeroBanner
-        title="Quick start of a digital service"
+        heading="Quick start of a digital service"
         backgroundUrl={'../assets/banner.jpg'}
       />
       <main>

package/src/generators/react-app/files/src/main.tsx__tmpl__

@@ -2,33 +2,17 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 import { Provider } from 'react-redux';
-import { 
-  CallbackComponent, 
-  loadUser, 
-  OidcProvider, 
-  reducer as oidcReducer, 
-  SignoutCallbackComponent
+import {
+  CallbackComponent,
+  loadUser,
+  OidcProvider,
+  SignoutCallbackComponent,
 } from 'redux-oidc';
-import { configureStore, getDefaultMiddleware } from '@reduxjs/toolkit';
 
 import { environment } from './environments/environment';
-import { START_FEATURE_KEY, startReducer } from './app/start.slice';
-import { INTAKE_FEATURE_KEY, intakeReducer } from './app/intake.slice';
 import { createUserManager } from './access';
 import App from './app/app';
-
-const store = configureStore({
-  reducer: { 
-    user: oidcReducer,
-    [START_FEATURE_KEY]: startReducer,
-    [INTAKE_FEATURE_KEY]: intakeReducer
-  },
-  // Additional middleware can be passed to this array
-  middleware: [...getDefaultMiddleware()],
-  devTools: process.env.NODE_ENV !== 'production',
-  // Optional Redux store enhancers
-  enhancers: [],
-});
+import { store } from './store';
 
 // Fetch configuration from web server; otherwise fallback to static environment.
 fetch('/config/config.json')

package/src/generators/react-app/files/src/react-oidc.d.ts__tmpl__

@@ -0,0 +1,14 @@
+// Declarations to allow redux-oidc to work with react 18
+declare module 'redux-oidc' {
+  export interface CallbackComponentProps {
+    children: React.ReactNode;
+  }
+
+  export interface OidcProviderProps<TSTate> {
+    children: React.ReactNode;
+  }
+
+  export interface SignoutCallbackComponentProps {
+    children: React.ReactNode;
+  }
+}

package/src/generators/react-app/files/src/store.ts__tmpl__

@@ -0,0 +1,16 @@
+import { configureStore } from '@reduxjs/toolkit';
+import { reducer as oidcReducer } from 'redux-oidc';
+import { START_FEATURE_KEY, startReducer } from './app/start.slice';
+import { INTAKE_FEATURE_KEY, intakeReducer } from './app/intake.slice';
+
+export const store = configureStore({
+  reducer: {
+    user: oidcReducer,
+    [START_FEATURE_KEY]: startReducer,
+    [INTAKE_FEATURE_KEY]: intakeReducer,
+  },
+  devTools: process.env.NODE_ENV !== 'production',
+  // Optional Redux store enhancers
+  enhancers: [],
+});
+export type AppDispatch = typeof store.dispatch;

package/src/generators/react-app/react-app.js

@@ -1,26 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const test_runners_1 = require("@nrwl/angular/src/utils/test-runners");
 const devkit_1 = require("@nrwl/devkit");
 const linter_1 = require("@nrwl/linter");
 const path = require("path");
 const adsp_utils_1 = require("../../utils/adsp-utils");
 function normalizeOptions(host, options) {
-    const projectName = (0, devkit_1.names)(options.name).fileName;
-    const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
-    const openshiftDirectory = `.openshift/${projectName}`;
-    const adsp = (0, adsp_utils_1.getAdspConfiguration)(host, options);
-    const nginxProxies = Array.isArray(options.proxy) ?
-        [...options.proxy] :
-        (options.proxy ?
-            [options.proxy] :
-            []);
-    return Object.assign(Object.assign({}, options), { projectName,
-        projectRoot,
-        openshiftDirectory,
-        adsp,
-        nginxProxies });
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const projectName = (0, devkit_1.names)(options.name).fileName;
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
+        const openshiftDirectory = `.openshift/${projectName}`;
+        const adsp = yield (0, adsp_utils_1.getAdspConfiguration)(host, options);
+        const nginxProxies = Array.isArray(options.proxy)
+            ? [...options.proxy]
+            : options.proxy
+                ? [options.proxy]
+                : [];
+        return Object.assign(Object.assign({}, options), { projectName,
+            projectRoot,
+            openshiftDirectory,
+            adsp,
+            nginxProxies });
+    });
 }
 function addFiles(host, options) {
     const templateOptions = Object.assign(Object.assign(Object.assign({}, options), options.adsp), { tmpl: '' });
@@ -35,12 +36,12 @@ function addFiles(host, options) {
                 target: `${upstreamUrl.protocol}//localhost${upstreamUrl.port ? ':' + upstreamUrl.port : ''}`,
                 secure: upstreamUrl.protocol === 'https:',
                 changeOrigin: false,
-                pathRewrite: {}
+                pathRewrite: {},
             };
             // If there is a path on the upstream url, then add a rewrite.
             if (upstreamUrl.pathname.length > 1) {
                 proxy.pathRewrite = {
-                    [`^${nginxProxy.location}`]: upstreamUrl.pathname
+                    [`^${nginxProxy.location}`]: upstreamUrl.pathname,
                 };
             }
             return Object.assign(Object.assign({}, proxyConf), { [nginxProxy.location]: proxy });
@@ -55,7 +56,7 @@ function removeFiles(host, options) {
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(host, options);
+        const normalizedOptions = yield normalizeOptions(host, options);
         const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nrwl/react'));
         const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nrwl/react'));
         // Setting strict to false because of: https://github.com/nrwl/nx/issues/8180
@@ -64,22 +65,22 @@ function default_1(host, options) {
             style: 'styled-components',
             skipFormat: true,
             linter: linter_1.Linter.EsLint,
-            unitTestRunner: test_runners_1.UnitTestRunner.Jest,
-            e2eTestRunner: test_runners_1.E2eTestRunner.Cypress,
+            unitTestRunner: 'jest',
+            e2eTestRunner: 'cypress',
             babelJest: false,
             strict: false,
         });
         yield initRedux(host, { name: 'intake', project: options.name });
         (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@abgov/core-css': '^1.0.0',
-            '@abgov/react-components': '^3.1.0',
-            '@types/react-router-dom': '~5.1.7',
-            "@types/redux-mock-store": "~1.0.2",
-            'html-webpack-plugin': '~4.5.2',
+            '@abgov/react-components': '^4.1.0',
+            '@abgov/styles': '^1.0.0',
+            '@types/react-router-dom': '~5.3.3',
+            '@types/redux-mock-store': '~1.0.2',
+            'html-webpack-plugin': '~5.5.0',
             'oidc-client': '~1.11.5',
             'redux-oidc': '~4.0.0-beta1',
             'react-router-dom': '~5.2.0',
-            'redux-mock-store': '~1.5.4'
+            'redux-mock-store': '~1.5.4',
         });
         const addedProxy = addFiles(host, normalizedOptions);
         removeFiles(host, normalizedOptions);
@@ -88,10 +89,10 @@ function default_1(host, options) {
         config.targets.build.options = Object.assign(Object.assign({}, config.targets.build.options), { assets: [
                 ...config.targets.build.options.assets,
                 {
-                    "glob": "nginx.conf",
-                    "input": `${layout.appsDir}/${options.name}`,
-                    "output": "./"
-                }
+                    glob: 'nginx.conf',
+                    input: `${layout.appsDir}/${options.name}`,
+                    output: './',
+                },
             ], webpackConfig: `${normalizedOptions.projectRoot}/webpack.conf.js` });
         if (addedProxy) {
             // Add the webpack dev server proxy if there is proxy configuration.

package/src/generators/react-app/react-app.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"react-app.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-app/react-app.ts"],"names":[],"mappings":"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"}

package/src/generators/react-app/react-app.spec.ts

@@ -6,7 +6,8 @@ import generator from './react-app';
 describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
-    tenant: 'test',
+    env: 'dev',
+    realm: 'test',
   };
 
   it('can run', async () => {

package/src/generators/react-app/schema.d.ts

@@ -1,16 +1,18 @@
 import { AdspConfiguration } from '../../utils/adsp';
+import { EnvironmentName } from '../../utils/environments';
 import { NginxProxyConfiguration } from '../../utils/nginx';
 
 export interface Schema {
   name: string;
-  tenant: string;
-  proxy?: NginxProxyConfiguration | NginxProxyConfiguration[]
+  env: EnvironmentName;
+  realm: string;
+  proxy?: NginxProxyConfiguration | NginxProxyConfiguration[];
 }
 
 export interface NormalizedSchema extends Schema {
   projectName: string;
   projectRoot: string;
   openshiftDirectory: string;
-  adsp: AdspConfiguration
+  adsp: AdspConfiguration;
   nginxProxies: NginxProxyConfiguration[];
 }

package/src/generators/react-app/schema.json

@@ -14,15 +14,33 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
+    },
+    "realm": {
+      "type": "string",
+      "description": "Realm of the ADSP tenant.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "alias": "r",
+      "x-prompt": "What is the realm of your ADSP tenant?"
     },
     "proxy": {
       "oneOf": [
@@ -38,7 +56,10 @@
                 "type": "string"
               }
             },
-            "required": ["location", "proxyPass"]
+            "required": [
+              "location",
+              "proxyPass"
+            ]
           }
         },
         {
@@ -51,10 +72,17 @@
               "type": "string"
             }
           },
-          "required": ["location", "proxyPass"]
+          "required": [
+            "location",
+            "proxyPass"
+          ]
         }
       ]
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/generators/react-dotnet/react-dotnet.js

@@ -6,10 +6,10 @@ const dotnet_service_1 = require("../dotnet-service/dotnet-service");
 const react_app_1 = require("../react-app/react-app");
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        yield (0, dotnet_service_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service`, namespace: options.name }));
+        yield (0, dotnet_service_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-service` }));
         yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
                 location: '/api/',
-                proxyPass: `http://${options.name}-service:5000/${options.name}-service/`
+                proxyPass: `http://${options.name}-service:5000/${options.name}-service/`,
             } }));
         return () => {
             (0, devkit_1.installPackagesTask)(host);

package/src/generators/react-dotnet/react-dotnet.js.map

@@ -1 +1 @@
-{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AACtB,qEAAiE;AACjE,sDAAkD;AAGlD,mBAA+B,IAAU,EAAE,OAAe;;QAExD,MAAM,IAAA,wBAAiB,EACrB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,EAC/B,SAAS,EAAE,OAAO,CAAC,IAAI,IAE1B,CAAC;QAEF,MAAM,IAAA,mBAAY,EAChB,IAAI,kCAEC,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IAEJ,CAAC;QAEF,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAA;IACH,CAAC;CAAA;AA1BD,4BA0BC"}
+{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,yCAAyD;AACzD,qEAAiE;AACjE,sDAAkD;AAGlD,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACvB,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,OAAO,KACV,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,MAAM,EAC3B,KAAK,EAAE;gBACL,QAAQ,EAAE,OAAO;gBACjB,SAAS,EAAE,UAAU,OAAO,CAAC,IAAI,iBAAiB,OAAO,CAAC,IAAI,WAAW;aAC1E,IACD,CAAC;QAEH,OAAO,GAAG,EAAE;YACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC;IACJ,CAAC;CAAA;AAlBD,4BAkBC"}

package/src/generators/react-dotnet/react-dotnet.spec.ts

@@ -12,7 +12,8 @@ const serviceGeneratorMock = serviceGenerator as jest.Mocked<
 describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
-    tenant: 'test',
+    env: 'dev',
+    realm: 'test',
   };
 
   it('can run', async () => {

package/src/generators/react-dotnet/schema.d.ts

@@ -1,4 +1,7 @@
+import { EnvironmentName } from '../../utils/environments';
+
 export interface Schema {
   name: string;
-  tenant: string;
+  env: EnvironmentName;
+  realm: string;
 }

package/src/generators/react-dotnet/schema.json

@@ -14,16 +14,38 @@
       },
       "x-prompt": "What name would you like to use?"
     },
-    "tenant": {
+    "env": {
       "type": "string",
-      "description": "Name of the ADSP tenant.",
+      "description": "Environment to target.",
       "$default": {
         "$source": "argv",
         "index": 1
       },
-      "alias": "t",
-      "x-prompt": "What is the name of your ADSP tenant?"
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target?",
+        "type": "list",
+        "items": [
+          "dev",
+          "test",
+          "prod"
+        ]
+      }
+    },
+    "realm": {
+      "type": "string",
+      "description": "Realm of the ADSP tenant.",
+      "$default": {
+        "$source": "argv",
+        "index": 2
+      },
+      "alias": "r",
+      "x-prompt": "What is the realm of your ADSP tenant?"
     }
   },
-  "required": ["name", "tenant"]
-}
+  "required": [
+    "name",
+    "env",
+    "realm"
+  ]
+}

package/src/utils/adsp-utils.d.ts

@@ -1,7 +1,8 @@
 import { Tree } from '@nrwl/devkit';
 import { AdspConfiguration } from './adsp';
+import { EnvironmentName } from './environments';
 export declare function hasDependency(host: Tree, dependency: string): boolean;
-export declare function getAdspConfiguration(host: Tree, { tenant, realm }: {
-    tenant: string;
-    realm?: string;
-}): AdspConfiguration;
+export declare function getAdspConfiguration(_host: Tree, { env, realm }: {
+    env?: EnvironmentName;
+    realm: string;
+}, login?: boolean): Promise<AdspConfiguration>;

package/src/utils/adsp-utils.js

@@ -1,20 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAdspConfiguration = exports.hasDependency = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const axios_1 = require("axios");
+const express = require("express");
+const open = require("open");
+const simple_oauth2_1 = require("simple-oauth2");
+const environments_1 = require("./environments");
 function hasDependency(host, dependency) {
     const { dependencies, devDependencies } = (0, devkit_1.readJson)(host, 'package.json');
-    return !!dependencies[dependency] ||
-        !!devDependencies[dependency];
+    return !!dependencies[dependency] || !!devDependencies[dependency];
 }
 exports.hasDependency = hasDependency;
-function getAdspConfiguration(host, { tenant, realm }) {
-    return {
-        tenant,
-        tenantRealm: realm,
-        accessServiceUrl: 'https://access.alberta.ca',
-        directoryServiceUrl: 'https://directory-service.adsp.alberta.ca',
-    };
+function tenantLogin(accessServiceUrl, realm) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const client = new simple_oauth2_1.AuthorizationCode({
+            client: {
+                id: 'nx-adsp-cli',
+                secret: '',
+            },
+            auth: {
+                tokenHost: accessServiceUrl,
+                tokenPath: `/auth/realms/${realm}/protocol/openid-connect/token`,
+                authorizePath: `/auth/realms/${realm}/protocol/openid-connect/auth`,
+            },
+        });
+        const redirect_uri = 'http://localhost:3000/callback';
+        const authorizationUri = client.authorizeURL({
+            redirect_uri,
+            scope: 'profile email',
+        });
+        const app = express();
+        const tokenPromise = new Promise((resolve) => {
+            app.get('/callback', function (req, res) {
+                res.send('Successfully signed in. You can close the browser.');
+                resolve(client.getToken({
+                    code: req.query.code,
+                    redirect_uri,
+                }));
+            });
+        });
+        const server = app.listen(3000);
+        open(authorizationUri);
+        const { token } = yield Promise.race([
+            tokenPromise,
+            new Promise((_, reject) => setTimeout(() => reject(new Error('Timed out waiting for login.')), 120000)),
+        ]).finally(() => server.close());
+        return token.access_token;
+    });
+}
+function getAdspConfiguration(_host, { env, realm }, login = false) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let tenant = '';
+        const environment = environments_1.environments[env || 'prod'];
+        if (login) {
+            const { data: entries } = yield axios_1.default.get(new URL('/directory/v2/namespaces/platform/entries', environment.directoryServiceUrl).href, { decompress: true, responseEncoding: 'utf8', responseType: 'json' });
+            const urls = entries.reduce((values, item) => (Object.assign(Object.assign({}, values), { [item.urn]: item.url })), {});
+            const token = yield tenantLogin(environment.accessServiceUrl, realm);
+            const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
+            const { data: tenants } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, { headers: { Authorization: `Bearer ${token}` } });
+            tenant = tenants.results[0].name;
+        }
+        return {
+            tenant,
+            tenantRealm: realm,
+            accessServiceUrl: environment.accessServiceUrl,
+            directoryServiceUrl: environment.directoryServiceUrl,
+        };
+    });
 }
 exports.getAdspConfiguration = getAdspConfiguration;
 //# sourceMappingURL=adsp-utils.js.map

package/src/utils/adsp-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/adsp-utils.ts"],"names":[],"mappings":";;;AAAA,yCAGsB;AAOtB,SAAgB,aAAa,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,EACJ,YAAY,EACZ,eAAe,EAChB,GAAY,IAAA,iBAAQ,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAE5C,OAAO,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;QAC/B,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AARD,sCAQC;AAED,SAAgB,oBAAoB,CAClC,IAAU,EACV,EAAE,MAAM,EAAE,KAAK,EAAsC;IAErD,OAAO;QACL,MAAM;QACN,WAAW,EAAE,KAAK;QAClB,gBAAgB,EAAE,2BAA2B;QAC7C,mBAAmB,EAAE,2CAA2C;KACjE,CAAA;AACH,CAAC;AAVD,oDAUC"}
+{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/adsp-utils.ts"],"names":[],"mappings":";;;;AAAA,yCAA8C;AAC9C,iCAA0B;AAC1B,mCAAmC;AACnC,6BAA6B;AAC7B,iDAA+D;AAE/D,iDAA+D;AAM/D,SAAgB,aAAa,CAAC,IAAU,EAAE,UAAkB;IAC1D,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAY,IAAA,iBAAQ,EACzD,IAAI,EACJ,cAAc,CACf,CAAC;IAEF,OAAO,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;AACrE,CAAC;AAPD,sCAOC;AAED,SAAe,WAAW,CACxB,gBAAwB,EACxB,KAAa;;QAEb,MAAM,MAAM,GAAG,IAAI,iCAAiB,CAAC;YACnC,MAAM,EAAE;gBACN,EAAE,EAAE,aAAa;gBACjB,MAAM,EAAE,EAAE;aACX;YACD,IAAI,EAAE;gBACJ,SAAS,EAAE,gBAAgB;gBAC3B,SAAS,EAAE,gBAAgB,KAAK,gCAAgC;gBAChE,aAAa,EAAE,gBAAgB,KAAK,+BAA+B;aACpE;SACF,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,gCAAgC,CAAC;QACtD,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC;YAC3C,YAAY;YACZ,KAAK,EAAE,eAAe;SACvB,CAAC,CAAC;QAEH,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;QACtB,MAAM,YAAY,GAAG,IAAI,OAAO,CAAc,CAAC,OAAO,EAAE,EAAE;YACxD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,GAAG,EAAE,GAAG;gBACrC,GAAG,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;gBAE/D,OAAO,CACL,MAAM,CAAC,QAAQ,CAAC;oBACd,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,IAAc;oBAC9B,YAAY;iBACb,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACvB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YACnC,YAAY;YACZ,IAAI,OAAO,CAAc,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CACrC,UAAU,CACR,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,EACvD,MAAM,CACP,CACF;SACF,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;QAEjC,OAAO,KAAK,CAAC,YAAY,CAAC;IAC5B,CAAC;CAAA;AAED,SAAsB,oBAAoB,CACxC,KAAW,EACX,EAAE,GAAG,EAAE,KAAK,EAA4C,EACxD,KAAK,GAAG,KAAK;;QAEb,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,2BAAY,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC;QAEhD,IAAI,KAAK,EAAE;YACT,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CACvC,IAAI,GAAG,CACL,2CAA2C,EAC3C,WAAW,CAAC,mBAAmB,CAChC,CAAC,IAAI,EACN,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,CACrE,CAAC;YAEF,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CACzB,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,iCAAM,MAAM,KAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,GAAG,IAAG,EACvD,EAAE,CACH,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAErE,MAAM,gBAAgB,GAAG,IAAI,CAAC,oCAAoC,CAAC,CAAC;YACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CACvC,IAAI,GAAG,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,IAAI,EAC5C,EAAE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE,EAAE,CAClD,CAAC;YAEF,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SAClC;QAED,OAAO;YACL,MAAM;YACN,WAAW,EAAE,KAAK;YAClB,gBAAgB,EAAE,WAAW,CAAC,gBAAgB;YAC9C,mBAAmB,EAAE,WAAW,CAAC,mBAAmB;SACrD,CAAC;IACJ,CAAC;CAAA;AAvCD,oDAuCC"}

package/src/utils/environments.d.ts

@@ -0,0 +1,7 @@
+export declare type EnvironmentName = 'dev' | 'test' | 'prod';
+interface Environment {
+    accessServiceUrl: string;
+    directoryServiceUrl: string;
+}
+export declare const environments: Record<EnvironmentName, Environment>;
+export {};

package/src/utils/environments.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.environments = void 0;
+exports.environments = {
+    dev: {
+        accessServiceUrl: 'https://access.adsp-dev.gov.ab.ca',
+        directoryServiceUrl: 'https://directory-service.adsp-dev.gov.ab.ca',
+    },
+    test: {
+        accessServiceUrl: 'https://access-uat.alberta.ca',
+        directoryServiceUrl: 'https://directory-service.adsp-uat.alberta.ca',
+    },
+    prod: {
+        accessServiceUrl: 'https://access.alberta.ca',
+        directoryServiceUrl: 'https://directory-service.adsp.alberta.ca',
+    },
+};
+//# sourceMappingURL=environments.js.map

package/src/utils/environments.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environments.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/environments.ts"],"names":[],"mappings":";;;AAMa,QAAA,YAAY,GAAyC;IAChE,GAAG,EAAE;QACH,gBAAgB,EAAE,mCAAmC;QACrD,mBAAmB,EAAE,8CAA8C;KACpE;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,+BAA+B;QACjD,mBAAmB,EAAE,+CAA+C;KACrE;IACD,IAAI,EAAE;QACJ,gBAAgB,EAAE,2BAA2B;QAC7C,mBAAmB,EAAE,2CAA2C;KACjE;CACF,CAAC"}