@abgov/nx-adsp 5.1.0 → 5.2.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "5.1.0",
+  "version": "5.2.0-beta.1",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",
@@ -13,13 +13,15 @@
     "@nrwl/angular": "^15.0.0",
     "@nrwl/devkit": "^15.0.0",
     "@nrwl/express": "^15.0.0",
-    "@nrwl/react": "^15.0.0"
+    "@nrwl/react": "^15.0.0",
+    "@nx-dotnet/core": "^1.16.0"
   },
   "dependencies": {
     "@angular-devkit/core": "^15.0.0",
     "@angular-devkit/schematics": "^15.0.0",
-    "axios": "1.1.3",
-    "express": "4.18.1",
+    "axios": "^0.27.0",
+    "enquirer": "^2.3.6",
+    "express": "^4.18.1",
     "open": "^8.4.0"
   },
   "generators": "./generators.json",

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

@@ -1,15 +1,25 @@
 import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
 import { Tree, readProjectConfiguration } from '@nrwl/devkit';
 
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
 import angularApp from './angular-app';
 import { AngularAppGeneratorSchema } from './schema';
 
+jest.mock('../../utils/adsp-utils');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('angular app generator', () => {
   let appTree: Tree;
   const options: AngularAppGeneratorSchema = {
     name: 'test',
     env: 'dev',
-    realm: 'testtenant',
   };
 
   beforeEach(() => {

package/src/generators/angular-app/files/src/environments/environment.ts__tmpl__

@@ -6,7 +6,7 @@ export const environment = {
   access: {
     url: '<%= accessServiceUrl %>',
     realm: '<%= tenantRealm %>',
-    client_id: 'urn:ads:platform:tenant-admin-app'
+    client_id: 'urn:ads:<%= tenant %>:<%= projectName %>'
   },
   tenantApi: {
     host: "http://localhost:3333",

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

@@ -1,9 +1,9 @@
+import { AdspConfiguration } from '../../utils/adsp';
 import { EnvironmentName } from '../../utils/environments';
 
 export interface AngularAppGeneratorSchema {
   name: string;
   env: EnvironmentName;
-  realm: string;
   proxy?: NginxProxyConfiguration | NginxProxyConfiguration[];
 }
 

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

@@ -32,16 +32,6 @@
         ]
       }
     },
-    "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": [
         {
@@ -82,7 +72,6 @@
   },
   "required": [
     "name",
-    "env",
-    "realm"
+    "env"
   ]
 }

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

@@ -2,6 +2,9 @@ import { addDependenciesToPackageJson } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import appGenerator from '@nx-dotnet/core/src/generators/app/generator';
 import refGenerator from '@nx-dotnet/core/src/generators/nuget-reference/generator';
+
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
 import { Schema } from './schema';
 import generator from './dotnet-service';
 
@@ -11,11 +14,22 @@ jest.mock('@nx-dotnet/core/src/generators/nuget-reference/generator');
 const appGeneratorMock = appGenerator as jest.Mocked<typeof appGenerator>;
 const refGeneratorMock = refGenerator as jest.Mocked<typeof refGenerator>;
 
+jest.mock('../../utils/adsp-utils', () => ({
+  ...jest.requireActual('../../utils/adsp-utils'),
+  getAdspConfiguration: jest.fn(),
+}));
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('Dotnet Service Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-    realm: 'test',
   };
 
   it('can run', async () => {

package/src/generators/dotnet-service/files/appsettings.Development.json__tmpl__

@@ -9,7 +9,7 @@
     "AccessServiceUrl": "<%= accessServiceUrl %>",
     "Realm": "<%= tenantRealm %>",
     "DirectoryUrl": "<%= directoryServiceUrl %>",
-    "ClientId": "",
+    "ClientId": "urn:ads:<%= tenant %>:<%= projectName %>",
     "ClientSecret": ""
   }
 }

package/src/generators/dotnet-service/files/appsettings.json__tmpl__

@@ -9,7 +9,7 @@
     "AccessServiceUrl": "<%= accessServiceUrl %>",
     "Realm": "<%= tenantRealm %>",
     "DirectoryUrl": "<%= directoryServiceUrl %>",
-    "ClientId": "",
+    "ClientId": "urn:ads:<%= tenant %>:<%= projectName %>",
     "ClientSecret": ""
   },
   "AllowedHosts": "*"

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

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

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

@@ -31,21 +31,10 @@
           "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",
-    "env",
-    "realm"
+    "env"
   ]
 }

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

@@ -1,7 +1,6 @@
 "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");
@@ -24,7 +23,7 @@ function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         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',

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,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,6BAAc,CAAC,IAAI,EACnC,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"}
+{"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

@@ -1,13 +1,24 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
 import { Schema } from './schema';
 import generator from './express-service';
 
+jest.mock('../../utils/adsp-utils');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('Express Service Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-    realm: 'test',
   };
 
   it('can run', async () => {

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

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

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

@@ -31,21 +31,10 @@
           "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",
-    "env",
-    "realm"
+    "env"
   ]
 }

package/src/generators/mern/mern.js

@@ -29,8 +29,8 @@ function addFiles(host, options) {
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         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: {
+        yield (0, express_service_1.default)(host, Object.assign(Object.assign({}, normalizedOptions), { name: `${options.name}-service` }));
+        yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, normalizedOptions), { name: `${options.name}-app`, proxy: {
                 location: '/api/',
                 proxyPass: `http://${options.name}-service:3333/${options.name}-service/`,
             } }));

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,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"}
+{"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,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,iBAAiB,KACpB,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

@@ -1,13 +1,24 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
 import { Schema } from './schema';
 import generator from './mern';
 
+jest.mock('../../utils/adsp-utils');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-    realm: 'test',
   };
 
   it('can run', async () => {

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

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

package/src/generators/mern/schema.json

@@ -31,21 +31,10 @@
           "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",
-    "env",
-    "realm"
+    "env"
   ]
 }

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/environments/environment.ts__tmpl__

@@ -6,6 +6,6 @@ export const environment = {
   access: {
     url: '<%= accessServiceUrl %>',
     realm: '<%= tenantRealm %>',
-    client_id: '<%= projectName %>'
+    client_id: 'urn:ads:<%= tenant %>:<%= projectName %>'
   }
 };

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

@@ -73,6 +73,7 @@ function default_1(host, options) {
         yield initRedux(host, { name: 'intake', project: options.name });
         (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@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',

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

@@ -1,13 +1,24 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
 import { Schema } from './schema';
 import generator from './react-app';
 
+jest.mock('../../utils/adsp-utils');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
+
 describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-    realm: 'test',
   };
 
   it('can run', async () => {

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

@@ -5,7 +5,6 @@ import { NginxProxyConfiguration } from '../../utils/nginx';
 export interface Schema {
   name: string;
   env: EnvironmentName;
-  realm: string;
   proxy?: NginxProxyConfiguration | NginxProxyConfiguration[];
 }
 

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

@@ -32,16 +32,6 @@
         ]
       }
     },
-    "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": [
         {
@@ -82,7 +72,6 @@
   },
   "required": [
     "name",
-    "env",
-    "realm"
+    "env"
   ]
 }

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

@@ -2,12 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const path = require("path");
+const adsp_utils_1 = require("../../utils/adsp-utils");
 const dotnet_service_1 = require("../dotnet-service/dotnet-service");
 const react_app_1 = require("../react-app/react-app");
+function normalizeOptions(host, options) {
+    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 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` }));
-        yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
+        const normalizedOptions = yield normalizeOptions(host, options);
+        yield (0, dotnet_service_1.default)(host, Object.assign(Object.assign({}, normalizedOptions), { name: `${options.name}-service` }));
+        yield (0, react_app_1.default)(host, Object.assign(Object.assign({}, normalizedOptions), { name: `${options.name}-app`, proxy: {
                 location: '/api/',
                 proxyPass: `http://${options.name}-service:5000/${options.name}-service/`,
             } }));

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,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"}
+{"version":3,"file":"react-dotnet.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-dotnet/react-dotnet.ts"],"names":[],"mappings":";;;AAAA,yCAMsB;AACtB,6BAA6B;AAC7B,uDAA8D;AAC9D,qEAAiE;AACjE,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,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEhE,MAAM,IAAA,wBAAiB,EAAC,IAAI,kCACvB,iBAAiB,KACpB,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,UAAU,IAC/B,CAAC;QAEH,MAAM,IAAA,mBAAY,EAAC,IAAI,kCAClB,iBAAiB,KACpB,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;AApBD,4BAoBC"}

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

@@ -1,8 +1,20 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
 import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+
+import * as utils from '../../utils/adsp-utils';
+import { environments } from '../../utils/environments';
+import serviceGenerator from '../dotnet-service/dotnet-service';
 import { Schema } from './schema';
 import generator from './react-dotnet';
-import serviceGenerator from '../dotnet-service/dotnet-service';
+
+jest.mock('../../utils/adsp-utils');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getAdspConfiguration.mockResolvedValue({
+  tenant: 'test',
+  tenantRealm: 'test',
+  accessServiceUrl: environments.test.accessServiceUrl,
+  directoryServiceUrl: environments.test.directoryServiceUrl,
+});
 
 jest.mock('../dotnet-service/dotnet-service');
 const serviceGeneratorMock = serviceGenerator as jest.Mocked<
@@ -13,7 +25,6 @@ describe('React App Generator', () => {
   const options: Schema = {
     name: 'test',
     env: 'dev',
-    realm: 'test',
   };
 
   it('can run', async () => {

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

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

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

@@ -31,21 +31,10 @@
           "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",
-    "env",
-    "realm"
+    "env"
   ]
 }

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

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

package/src/utils/adsp-utils.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAdspConfiguration = exports.hasDependency = void 0;
+exports.isAdspOptions = exports.getAdspConfiguration = exports.hasDependency = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
 const axios_1 = require("axios");
+const enquirer_1 = require("enquirer");
 const express = require("express");
 const open = require("open");
 const simple_oauth2_1 = require("simple-oauth2");
@@ -13,7 +14,7 @@ function hasDependency(host, dependency) {
     return !!dependencies[dependency] || !!devDependencies[dependency];
 }
 exports.hasDependency = hasDependency;
-function tenantLogin(accessServiceUrl, realm) {
+function realmLogin(accessServiceUrl, realm) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const client = new simple_oauth2_1.AuthorizationCode({
             client: {
@@ -29,16 +30,23 @@ function tenantLogin(accessServiceUrl, realm) {
         const redirect_uri = 'http://localhost:3000/callback';
         const authorizationUri = client.authorizeURL({
             redirect_uri,
-            scope: 'profile email',
+            scope: 'email',
         });
         const app = express();
-        const tokenPromise = new Promise((resolve) => {
+        const tokenPromise = new Promise((resolve, reject) => {
             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 { code, error } = req.query;
+                if (error) {
+                    res.send('Login failed.');
+                    reject(new Error(`Error encountered during login. ${error}`));
+                }
+                else {
+                    res.send('Successfully signed in. You can close this browser tab or window.');
+                    resolve(client.getToken({
+                        code: code,
+                        redirect_uri,
+                    }));
+                }
             });
         });
         const server = app.listen(3000);
@@ -50,25 +58,45 @@ function tenantLogin(accessServiceUrl, realm) {
         return token.access_token;
     });
 }
-function getAdspConfiguration(_host, { env, realm }, login = false) {
+function getAdspConfiguration(_host, options) {
+    var _a;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        let tenant = '';
+        const { env, realm } = options;
         const environment = environments_1.environments[env || 'prod'];
-        if (login) {
+        if (isAdspOptions(options)) {
+            // If Adsp configuration is already been resolved, then no need to retrieve gain.
+            return options.adsp;
+        }
+        else {
             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 token = yield realmLogin(environment.accessServiceUrl, 'core');
             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;
+            const { data: tenants } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, {
+                headers: { Authorization: `Bearer ${token}` },
+            });
+            const choices = tenants.results
+                .map((r) => r.name)
+                .sort((a, b) => a.localeCompare(b));
+            const result = yield (0, enquirer_1.prompt)({
+                type: 'autocomplete',
+                name: 'tenant',
+                message: 'Which tenant is the application or service for?',
+                choices,
+            });
+            return {
+                tenant: (0, devkit_1.names)(result.tenant).fileName,
+                tenantRealm: ((_a = tenants.results.find((r) => r.name === result.tenant)) === null || _a === void 0 ? void 0 : _a.realm) || realm,
+                accessServiceUrl: environment.accessServiceUrl,
+                directoryServiceUrl: environment.directoryServiceUrl,
+            };
         }
-        return {
-            tenant,
-            tenantRealm: realm,
-            accessServiceUrl: environment.accessServiceUrl,
-            directoryServiceUrl: environment.directoryServiceUrl,
-        };
     });
 }
 exports.getAdspConfiguration = getAdspConfiguration;
+function isAdspOptions(options) {
+    var _a;
+    return !!((_a = options === null || options === void 0 ? void 0 : options.adsp) === null || _a === void 0 ? void 0 : _a.tenantRealm);
+}
+exports.isAdspOptions = isAdspOptions;
 //# 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":"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"}
+{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/adsp-utils.ts"],"names":[],"mappings":"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"}

package/src/utils/adsp.d.ts

@@ -4,3 +4,7 @@ export interface AdspConfiguration {
   accessServiceUrl: string;
   directoryServiceUrl: string;
 }
+
+export type AdspOptions = {
+  adsp: AdspConfiguration;
+};