@abgov/nx-adsp 3.1.0 → 3.2.0-beta.2

package/README.md

@@ -1,5 +1,5 @@
 # About this project
-This is the Government of Alberta - DIO - Nx plugin for ADSP apps.
+This is the Government of Alberta - Nx plugin for ADSP apps.
 
 The plugin includes generators for application, service, and fullstack solution quick starts. If the peer dependency `@abgov/nx-oc` is found, then OpenShift yml files are also included in the quickstarts. Application stack peer dependencies are required for the associated ADSP application type; for example, `@nrwl/angular` is required for the angular-app, and `@abgov/nx-dotnet` is required for dotnet-service.
 

package/package.json

@@ -1,27 +1,25 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "3.1.0",
+  "version": "3.2.0-beta.2",
   "license": "Apache-2.0",
   "main": "src/index.js",
-  "description": "Government of Alberta - DIO - Nx plugin for ADSP apps.",
+  "description": "Government of Alberta - Nx plugin for ADSP apps.",
   "repository": {
     "type": "git",
     "url": "https://github.com/abgov/nx-tools.git",
     "directory": "packages/nx-adsp"
   },
   "peerDependencies": {
-    "@abgov/nx-dotnet": "^3.0.0",
-    "@abgov/nx-oc": "^3.0.0",
-    "@nrwl/express": "^13.4.3",
-    "@nrwl/react": "^13.4.3",
-    "@nrwl/angular": "^13.4.3"
+    "@nrwl/angular": "^14.0.0",
+    "@nrwl/devkit": "^14.0.0",
+    "@nrwl/express": "^14.0.0",
+    "@nrwl/react": "^14.0.0"
   },
   "dependencies": {
-    "@angular-devkit/core": "^13.1.0",
-    "@angular-devkit/schematics": "^13.1.0",
-    "camelcase": "^5.3.1",
-    "@nrwl/devkit": "13.8.1"
+    "@angular-devkit/core": "^14.0.0",
+    "@angular-devkit/schematics": "^14.0.0",
+    "camelcase": "^5.3.1"
   },
   "generators": "./generators.json",
-  "typings": "./src/index.d.ts"
+  "types": "./src/index.d.ts"
 }

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

@@ -54,7 +54,7 @@ function removeFiles(host, options) {
     host.delete(`${options.projectRoot}/src/app/star.svg`);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = normalizeOptions(host, options);
         const { applicationGenerator: initAngular } = yield Promise.resolve().then(() => require('@nrwl/angular/generators'));
         yield initAngular(host, { name: options.name });

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

@@ -6,15 +6,14 @@ import { AngularAppGeneratorSchema } from './schema';
 
 describe('angular app generator', () => {
   let appTree: Tree;
-  const options: AngularAppGeneratorSchema = { name: 'test', tenant: 'testtenant' };
+  const options: AngularAppGeneratorSchema = {
+    name: 'test',
+    tenant: 'testtenant',
+  };
 
   beforeEach(() => {
-    appTree = createTreeWithEmptyWorkspace(2);
-    jest.setTimeout(28000)
+    appTree = createTreeWithEmptyWorkspace();
   });
-  afterAll(() => {
-   jest.clearAllTimers()
-  })
 
   it('should run successfully', async () => {
     await angularApp(appTree, options);
@@ -22,48 +21,42 @@ describe('angular app generator', () => {
     expect(config).toBeDefined();
     expect(config.root).toBe('apps/test');
     expect(appTree.exists('apps/test/nginx.conf')).toBeTruthy();
-  }, 10000);
+  }, 30000);
 
-  it ('can add nginx proxy', async () => {
-    const host = createTreeWithEmptyWorkspace(2);
-    await angularApp(
-      host,
-      {
-        ...options,
-        proxy: {
-          location: '/test/',
-          proxyPass: 'http://test-service:3333/'
-        }
-      }
-    );
+  it('can add nginx proxy', async () => {
+    const host = createTreeWithEmptyWorkspace();
+    await angularApp(host, {
+      ...options,
+      proxy: {
+        location: '/test/',
+        proxyPass: 'http://test-service:3333/',
+      },
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
-    expect(
-      host.read('apps/test/nginx.conf').toString()
-    ).toContain('http://test-service:3333/');
+    expect(host.read('apps/test/nginx.conf').toString()).toContain(
+      'http://test-service:3333/'
+    );
   });
 
-  it ('can add multiple nginx proxy', async () => {
-    const host = createTreeWithEmptyWorkspace(2);
-    await angularApp(
-      host,
-      {
-        ...options,
-        proxy: [
-          {
-            location: '/test/',
-            proxyPass: 'http://test-service:3333/'
-          },
-          {
-            location: '/test2/',
-            proxyPass: 'http://test-service2:3333/'
-          }
-        ]
-      }
-    );
+  it('can add multiple nginx proxy', async () => {
+    const host = createTreeWithEmptyWorkspace();
+    await angularApp(host, {
+      ...options,
+      proxy: [
+        {
+          location: '/test/',
+          proxyPass: 'http://test-service:3333/',
+        },
+        {
+          location: '/test2/',
+          proxyPass: 'http://test-service2:3333/',
+        },
+      ],
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
@@ -74,18 +67,15 @@ describe('angular app generator', () => {
     expect(nginxConf).toContain('http://test-service2:3333/');
   });
 
-  it ('can add webpack dev server proxy', async () => {
-    const host = createTreeWithEmptyWorkspace(2);
-    await angularApp(
-      host,
-      {
-        ...options,
-        proxy: {
-          location: '/test/',
-          proxyPass: 'http://test-service:3333/api/'
-        }
-      }
-    );
+  it('can add webpack dev server proxy', async () => {
+    const host = createTreeWithEmptyWorkspace();
+    await angularApp(host, {
+      ...options,
+      proxy: {
+        location: '/test/',
+        proxyPass: 'http://test-service:3333/api/',
+      },
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');

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

@@ -18,7 +18,7 @@ function addFiles(host, options) {
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = normalizeOptions(host, options);
         (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
             '@abgov/nx-dotnet': '^1.0.0'
@@ -56,7 +56,7 @@ function default_1(host, options) {
             const { deploymentGenerator } = yield Promise.resolve().then(() => require(`${'@abgov/nx-oc'}`));
             yield deploymentGenerator(host, Object.assign(Object.assign({}, options), { project: normalizedOptions.projectName }));
         }
-        return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
             (0, devkit_1.installPackagesTask)(host);
         });
     });

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

@@ -1,17 +1,16 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Schema } from './schema';
 import generator from './dotnet-service';
 
 describe('Dotnet Service Generator', () => {
-
-  const options: Schema = { 
+  const options: Schema = {
     name: 'test',
-    tenant: 'test'
-  }
-  
-  it ('can run', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    tenant: 'test',
+  };
+
+  it('can run', async () => {
+    const host = createTreeWithEmptyV1Workspace();
     await generator(host, options);
 
     const config = readProjectConfiguration(host, 'test');
@@ -19,4 +18,4 @@ describe('Dotnet Service Generator', () => {
 
     expect(host.exists('apps/test/test.csproj')).toBeTruthy();
   });
-});
+});

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

@@ -1,6 +1,7 @@
 "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");
@@ -18,19 +19,18 @@ function addFiles(host, options) {
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), options.projectRoot, templateOptions);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = 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: "jest" /* Jest */, pascalCaseFiles: false, js: false }));
+        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 }));
         (0, devkit_1.addDependenciesToPackageJson)(host, {
-            'jwks-rsa': '^2.0.2',
-            'passport': '^0.4.1',
-            "passport-anonymous": "^1.0.1",
-            'passport-jwt': '^4.0.0',
+            '@abgov/adsp-service-sdk': '^1.18.0',
+            'dotenv': '^16.0.0',
+            'passport': '^0.6.0',
+            'passport-anonymous': '^1.0.1',
         }, {
-            '@types/passport': '^1.0.6',
-            "@types/passport-anonymous": "^1.0.3",
-            '@types/passport-jwt': '^3.0.5',
+            '@types/passport': '^1.0.9',
+            '@types/passport-anonymous': '^1.0.3',
         });
         addFiles(host, normalizedOptions);
         yield (0, devkit_1.formatFiles)(host);

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":";;;AACA,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,qBACd,eAAe,EAAE,KAAK,EACtB,EAAE,EAAE,KAAK,IAEZ,CAAC;QAEF,IAAA,qCAA4B,EAC1B,IAAI,EACJ;YACE,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,QAAQ;YACpB,oBAAoB,EAAE,QAAQ;YAC9B,cAAc,EAAE,QAAQ;SACzB,EACD;YACE,iBAAiB,EAAE,QAAQ;YAC3B,2BAA2B,EAAE,QAAQ;YACrC,qBAAqB,EAAE,QAAQ;SAChC,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;AAjDD,4BAiDC"}
+{"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"}

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

@@ -1,22 +1,22 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Schema } from './schema';
 import generator from './express-service';
 
 describe('Express Service Generator', () => {
-
-  const options: Schema = { 
+  const options: Schema = {
     name: 'test',
-    tenant: 'test'
-  }
-  
-  it ('can run', async () => {
-    const host = createTreeWithEmptyWorkspace();
+    tenant: 'test',
+    realm: 'test',
+  };
+
+  it('can run', async () => {
+    const host = createTreeWithEmptyV1Workspace();
     await generator(host, options);
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
 
-    expect(host.exists('apps/test/src/access.ts')).toBeTruthy();
+    expect(host.exists('apps/test/src/main.ts')).toBeTruthy();
   });
 });

package/src/generators/express-service/files/src/environments/environment.prod.ts__tmpl__

@@ -1,4 +1,13 @@
+import * as dotenv from 'dotenv';
+dotenv.config();
+
 export const environment = {
   production: true,
+  TENANT_REALM: '<%= tenantRealm %>',
+  ACCESS_SERVICE_URL: '<%= accessServiceUrl %>',
+  DIRECTORY_SERVICE_URL: '<%= directoryServiceUrl %>',
+  CLIENT_ID: 'urn:ads:<%= tenant %>:<%= projectName %>',
+  CLIENT_SECRET: '',
+  LOG_LEVEL: 'info',
   ...process.env,
 };

package/src/generators/express-service/files/src/environments/environment.ts__tmpl__

@@ -1,7 +1,14 @@
+import * as dotenv from 'dotenv';
+dotenv.config();
+
 export const environment = {
   production: false,
   port: '3333',
   TENANT_REALM: '<%= tenantRealm %>',
   ACCESS_SERVICE_URL: '<%= accessServiceUrl %>',
+  DIRECTORY_SERVICE_URL: '<%= directoryServiceUrl %>',
+  CLIENT_ID: 'urn:ads:<%= tenant %>:<%= projectName %>',
+  CLIENT_SECRET: '',
+  LOG_LEVEL: 'debug',
   ...process.env
 };

package/src/generators/express-service/files/src/main.ts__tmpl__

@@ -2,45 +2,62 @@
  * This is not a production server yet!
  * This is only a minimal backend to get started.
  */
+import { AdspId, initializeService } from '@abgov/adsp-service-sdk';
 import * as express from 'express';
 import * as passport from 'passport';
 import { Strategy as AnonymousStrategy } from 'passport-anonymous';
-import { AccessUser, createAccessStrategy } from './access';
 
 import { environment } from './environments/environment';
 
-passport.use('jwt', createAccessStrategy(environment));
-passport.use('anonymous', new AnonymousStrategy());
+async function initializeApp(): Promise<express.Application> {
+  const app = express();
+  app.use(passport.initialize());
 
-const app = express();
-app.use(passport.initialize());
-app.use(passport.authenticate(['jwt', 'anonymous'], { session: false }));
+  const serviceId = AdspId.parse(environment.CLIENT_ID);
+  const { tenantStrategy } = await initializeService(
+    {
+      displayName: '<%= projectName %>',
+      description: 'Put your service description here.',
+      realm: environment.TENANT_REALM,
+      serviceId,
+      clientSecret: environment.CLIENT_SECRET,
+      accessServiceUrl: new URL(environment.ACCESS_SERVICE_URL),
+      directoryUrl: new URL(environment.DIRECTORY_SERVICE_URL),
+    },
+    { logLevel: environment.LOG_LEVEL }
+  );
 
-app.get(
-  '/<%= projectName %>/v1/public', 
-  (_req, res) => {
+  passport.use('tenant', tenantStrategy);
+  passport.use('anonymous', new AnonymousStrategy());
+
+  app.use(passport.authenticate(['tenant', 'anonymous'], { session: false }));
+
+  app.get('/<%= projectName %>/v1/public', (_req, res) => {
     res.send({ message: `Welcome to public API resource!` });
-  }
-);
-
-app.get(
-  '/<%= projectName %>/v1/private', 
-  (req, res, next) => {
-    if (!req.user) {
-      res.sendStatus(401);
-    } else {
-      next();
+  });
+
+  app.get(
+    '/<%= projectName %>/v1/private',
+    (req, res, next) => {
+      if (!req.user) {
+        res.sendStatus(401);
+      } else {
+        next();
+      }
+    },
+    (req, res) => {
+      const user = req.user;
+      res.send({ message: `Welcome to private API resource! ${user.name}` });
     }
-  }, 
-  (req, res) => {
-    const user = req.user as AccessUser;
-    res.send({ message: `Welcome to private API resource! ${user.name}` });
-  }
-);
+  );
+  return app;
+}
 
-const port = environment.port || 3333;
+initializeApp().then((app) => {
+  const port = environment.port || 3333;
 
-const server = app.listen(port, () => {
-  console.log(`Listening at http://localhost:${port}/<%= projectName %>/v1`);
+  const server = app.listen(port, () => {
+    console.log(`Listening at http://localhost:${port}/<%= projectName %>/v1`);
+  });
+  server.on('error', console.error);
 });
-server.on('error', console.error);

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

@@ -3,6 +3,7 @@ import { AdspConfiguration } from '../../utils/adsp';
 export interface Schema {
   name: string;
   tenant: string;
+  realm: string;
 }
 
 export interface NormalizedSchema extends Schema {

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

@@ -23,6 +23,16 @@
       },
       "alias": "t",
       "x-prompt": "What is the name of your ADSP tenant?"
+    },
+    "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"]

package/src/generators/mern/mern.js

@@ -25,7 +25,7 @@ function addFiles(host, options) {
     (0, devkit_1.generateFiles)(host, path.join(__dirname, 'openshift'), `${options.openshiftDirectory}`, templateOptions);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = 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: {

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

@@ -4,14 +4,14 @@ import { Schema } from './schema';
 import generator from './mern';
 
 describe('React App Generator', () => {
-
-  const options: Schema = { 
+  const options: Schema = {
     name: 'test',
     tenant: 'test',
-  }
-  
-  it ('can run', async () => {
-    const host = createTreeWithEmptyWorkspace(2);
+    realm: 'test',
+  };
+
+  it('can run', async () => {
+    const host = createTreeWithEmptyWorkspace();
     await generator(host, options);
 
     const appConfig = readProjectConfiguration(host, 'test-app');
@@ -19,9 +19,9 @@ describe('React App Generator', () => {
 
     const serviceConfig = readProjectConfiguration(host, 'test-service');
     expect(serviceConfig.root).toBe('apps/test-service');
-    
+
     expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
     const nginxConf = host.read('apps/test-app/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:3333/');
-  });
-});
+  }, 30000);
+});

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

@@ -3,6 +3,7 @@ import { AdspConfiguration } from "../../utils/adsp";
 export interface Schema {
   name: string;
   tenant: string;
+  realm: string;
 }
 
 export interface NormalizedSchema extends Schema {

package/src/generators/mern/schema.json

@@ -23,6 +23,16 @@
       },
       "alias": "t",
       "x-prompt": "What is the name of your ADSP tenant?"
+    },
+    "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"]

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

@@ -1,6 +1,7 @@
 "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");
@@ -53,7 +54,7 @@ function removeFiles(host, options) {
     host.delete(`${options.projectRoot}/src/app/star.svg`);
 }
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = normalizeOptions(host, options);
         const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nrwl/react'));
         const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nrwl/react'));
@@ -63,8 +64,8 @@ function default_1(host, options) {
             style: 'styled-components',
             skipFormat: true,
             linter: linter_1.Linter.EsLint,
-            unitTestRunner: "jest" /* Jest */,
-            e2eTestRunner: "cypress" /* Cypress */,
+            unitTestRunner: test_runners_1.UnitTestRunner.Jest,
+            e2eTestRunner: test_runners_1.E2eTestRunner.Cypress,
             babelJest: false,
             strict: false,
         });

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,73 +1,58 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Schema } from './schema';
 import generator from './react-app';
 
 describe('React App Generator', () => {
-  beforeEach(() => {
-    jest.setTimeout(28000)
-  })
-
-  afterAll(() => {
-   jest.clearAllTimers()
-  })
-
   const options: Schema = {
     name: 'test',
     tenant: 'test',
-  }
+  };
 
-  it ('can run', async () => {
-    jest.setTimeout(28000)
-    const host = createTreeWithEmptyWorkspace();
+  it('can run', async () => {
+    const host = createTreeWithEmptyV1Workspace();
     await generator(host, options);
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
-  });
-
-  it ('can add nginx proxy', async () => {
-    const host = createTreeWithEmptyWorkspace();
-    await generator(
-      host,
-      {
-        ...options,
-        proxy: {
-          location: '/test/',
-          proxyPass: 'http://test-service:3333/'
-        }
-      }
-    );
+  }, 30000);
+
+  it('can add nginx proxy', async () => {
+    const host = createTreeWithEmptyV1Workspace();
+    await generator(host, {
+      ...options,
+      proxy: {
+        location: '/test/',
+        proxyPass: 'http://test-service:3333/',
+      },
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
 
     expect(host.exists('apps/test/nginx.conf')).toBeTruthy();
-    expect(
-      host.read('apps/test/nginx.conf').toString()
-    ).toContain('http://test-service:3333/');
+    expect(host.read('apps/test/nginx.conf').toString()).toContain(
+      'http://test-service:3333/'
+    );
   });
 
-  it ('can add multiple nginx proxy', async () => {
-    const host = createTreeWithEmptyWorkspace();
-    await generator(
-      host,
-      {
-        ...options,
-        proxy: [
-          {
-            location: '/test/',
-            proxyPass: 'http://test-service:3333/'
-          },
-          {
-            location: '/test2/',
-            proxyPass: 'http://test-service2:3333/'
-          }
-        ]
-      }
-    );
+  it('can add multiple nginx proxy', async () => {
+    const host = createTreeWithEmptyV1Workspace();
+    await generator(host, {
+      ...options,
+      proxy: [
+        {
+          location: '/test/',
+          proxyPass: 'http://test-service:3333/',
+        },
+        {
+          location: '/test2/',
+          proxyPass: 'http://test-service2:3333/',
+        },
+      ],
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');
@@ -78,18 +63,15 @@ describe('React App Generator', () => {
     expect(nginxConf).toContain('http://test-service2:3333/');
   });
 
-  it ('can add webpack dev server proxy', async () => {
-    const host = createTreeWithEmptyWorkspace();
-    await generator(
-      host,
-      {
-        ...options,
-        proxy: {
-          location: '/test/',
-          proxyPass: 'http://test-service:3333/api/'
-        }
-      }
-    );
+  it('can add webpack dev server proxy', async () => {
+    const host = createTreeWithEmptyV1Workspace();
+    await generator(host, {
+      ...options,
+      proxy: {
+        location: '/test/',
+        proxyPass: 'http://test-service:3333/api/',
+      },
+    });
 
     const config = readProjectConfiguration(host, 'test');
     expect(config.root).toBe('apps/test');

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

@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
 const dotnet_service_1 = require("../dotnet-service/dotnet-service");
 const react_app_1 = require("../react-app/react-app");
 function default_1(host, options) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+    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, react_app_1.default)(host, Object.assign(Object.assign({}, options), { name: `${options.name}-app`, proxy: {
                 location: '/api/',

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

@@ -1,17 +1,16 @@
 import { readProjectConfiguration } from '@nrwl/devkit';
-import { createTreeWithEmptyWorkspace } from '@nrwl/devkit/testing';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
 import { Schema } from './schema';
 import generator from './react-dotnet';
 
 describe('React App Generator', () => {
-
-  const options: Schema = { 
+  const options: Schema = {
     name: 'test',
     tenant: 'test',
-  }
-  
-  it ('can run', async () => {
-    const host = createTreeWithEmptyWorkspace();
+  };
+
+  it('can run', async () => {
+    const host = createTreeWithEmptyV1Workspace();
     await generator(host, options);
 
     const appConfig = readProjectConfiguration(host, 'test-app');
@@ -19,9 +18,9 @@ describe('React App Generator', () => {
 
     const serviceConfig = readProjectConfiguration(host, 'test-service');
     expect(serviceConfig.root).toBe('apps/test-service');
-    
+
     expect(host.exists('apps/test-app/nginx.conf')).toBeTruthy();
     const nginxConf = host.read('apps/test-app/nginx.conf').toString();
     expect(nginxConf).toContain('http://test-service:5000/');
-  });
-});
+  }, 30000);
+});

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

@@ -1,6 +1,7 @@
 import { Tree } from '@nrwl/devkit';
 import { AdspConfiguration } from './adsp';
 export declare function hasDependency(host: Tree, dependency: string): boolean;
-export declare function getAdspConfiguration(host: Tree, { tenant }: {
+export declare function getAdspConfiguration(host: Tree, { tenant, realm }: {
     tenant: string;
+    realm?: string;
 }): AdspConfiguration;

package/src/utils/adsp-utils.js

@@ -8,11 +8,12 @@ function hasDependency(host, dependency) {
         !!devDependencies[dependency];
 }
 exports.hasDependency = hasDependency;
-function getAdspConfiguration(host, { tenant }) {
+function getAdspConfiguration(host, { tenant, realm }) {
     return {
         tenant,
-        tenantRealm: tenant,
-        accessServiceUrl: 'https://access.alpha.alberta.ca'
+        tenantRealm: realm,
+        accessServiceUrl: 'https://access.alberta.ca',
+        directoryServiceUrl: 'https://directory-service.adsp.alberta.ca',
     };
 }
 exports.getAdspConfiguration = getAdspConfiguration;

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,EAAsB;IAE9B,OAAO;QACL,MAAM;QACN,WAAW,EAAE,MAAM;QACnB,gBAAgB,EAAE,iCAAiC;KACpD,CAAA;AACH,CAAC;AATD,oDASC"}
+{"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"}

package/src/utils/adsp.d.ts

@@ -2,4 +2,5 @@ export interface AdspConfiguration {
   tenant: string;
   tenantRealm: string;
   accessServiceUrl: string;
+  directoryServiceUrl: string;
 }

package/src/generators/express-service/files/src/access.ts__tmpl__

@@ -1,44 +0,0 @@
-import * as jwksRsa from 'jwks-rsa';
-import { Strategy as JwtStrategy, ExtractJwt } from 'passport-jwt';
-
-interface AccessStrategyProps {
-  ACCESS_SERVICE_URL: string;
-  TENANT_REALM: string;
-}
-
-export interface AccessUser {
-  id: string;
-  name: string;
-  email: string;
-  roles: string[];
-}
-
-export const createAccessStrategy = ({
-  ACCESS_SERVICE_URL,
-  TENANT_REALM,
-}: AccessStrategyProps) => {
-  const strategy = new JwtStrategy(
-    {
-      jwtFromRequest: ExtractJwt.fromExtractors([
-        ExtractJwt.fromAuthHeaderAsBearerToken(),
-        ExtractJwt.fromUrlQueryParameter('token'),
-      ]),
-      secretOrKeyProvider: jwksRsa.passportJwtSecret({
-        jwksUri: `${ACCESS_SERVICE_URL}/auth/realms/${TENANT_REALM}/protocol/openid-connect/certs`,
-        cache: true,
-      }),
-      issuer: `${ACCESS_SERVICE_URL}/auth/realms/${TENANT_REALM}`,
-    },
-    (payload, done) => {
-      const user: AccessUser = {
-        id: payload.sub,
-        name: payload.name || payload.preferred_username,
-        email: payload.email,
-        roles: payload.realm_access.roles,
-      }
-      done(null, user);
-    }
-  );
-
-  return strategy;
-};