@abgov/nx-oc 5.4.0 → 5.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/adsp/adsp-utils.d.ts +6 -0
- package/src/adsp/adsp-utils.js +33 -18
- package/src/adsp/adsp-utils.js.map +1 -1
package/package.json
CHANGED
package/src/adsp/adsp-utils.d.ts
CHANGED
|
@@ -2,6 +2,12 @@ import { Tree } from '@nrwl/devkit';
|
|
|
2
2
|
import { AdspConfiguration, AdspOptions } from './adsp';
|
|
3
3
|
import { EnvironmentName } from './environments';
|
|
4
4
|
export declare function hasDependency(host: Tree, dependency: string): boolean;
|
|
5
|
+
export declare function realmLogin(accessServiceUrl: string, realm: string): Promise<string>;
|
|
6
|
+
export declare function getServiceUrls(directoryUrl: string): Promise<Record<string, string>>;
|
|
7
|
+
export declare function selectTenant(tenantServiceUrl: string, token: string): Promise<{
|
|
8
|
+
name: string;
|
|
9
|
+
realm: string;
|
|
10
|
+
}>;
|
|
5
11
|
export declare function getAdspConfiguration(_host: Tree, options: {
|
|
6
12
|
env: EnvironmentName;
|
|
7
13
|
accessToken?: string;
|
package/src/adsp/adsp-utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isAdspOptions = exports.getAdspConfiguration = exports.hasDependency = void 0;
|
|
3
|
+
exports.isAdspOptions = exports.getAdspConfiguration = exports.selectTenant = exports.getServiceUrls = exports.realmLogin = exports.hasDependency = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const axios_1 = require("axios");
|
|
@@ -58,8 +58,35 @@ function realmLogin(accessServiceUrl, realm) {
|
|
|
58
58
|
return token['access_token'];
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
|
+
exports.realmLogin = realmLogin;
|
|
62
|
+
function getServiceUrls(directoryUrl) {
|
|
63
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
const { data: entries } = yield axios_1.default.get(new URL('/directory/v2/namespaces/platform/entries', directoryUrl).href, { decompress: true, responseEncoding: 'utf8', responseType: 'json' });
|
|
65
|
+
const urls = entries.reduce((values, item) => (Object.assign(Object.assign({}, values), { [item.urn]: item.url })), {});
|
|
66
|
+
return urls;
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
exports.getServiceUrls = getServiceUrls;
|
|
70
|
+
function selectTenant(tenantServiceUrl, token) {
|
|
71
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
const { data: tenants } = yield axios_1.default.get(new URL('v2/tenants', tenantServiceUrl).href, {
|
|
73
|
+
headers: { Authorization: `Bearer ${token}` },
|
|
74
|
+
});
|
|
75
|
+
const choices = tenants.results
|
|
76
|
+
.map((r) => r.name)
|
|
77
|
+
.sort((a, b) => a.localeCompare(b));
|
|
78
|
+
const result = yield (0, enquirer_1.prompt)({
|
|
79
|
+
type: 'autocomplete',
|
|
80
|
+
name: 'tenant',
|
|
81
|
+
message: 'Which tenant is the application or service for?',
|
|
82
|
+
choices,
|
|
83
|
+
});
|
|
84
|
+
const tenant = tenants.results.find((r) => r.name === result.tenant);
|
|
85
|
+
return tenant;
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
exports.selectTenant = selectTenant;
|
|
61
89
|
function getAdspConfiguration(_host, options) {
|
|
62
|
-
var _a;
|
|
63
90
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
91
|
const { env, accessToken } = options;
|
|
65
92
|
const environment = environments_1.environments[env || 'prod'];
|
|
@@ -68,25 +95,13 @@ function getAdspConfiguration(_host, options) {
|
|
|
68
95
|
return options.adsp;
|
|
69
96
|
}
|
|
70
97
|
else {
|
|
71
|
-
const
|
|
72
|
-
const urls = entries.reduce((values, item) => (Object.assign(Object.assign({}, values), { [item.urn]: item.url })), {});
|
|
98
|
+
const urls = yield getServiceUrls(environment.directoryServiceUrl);
|
|
73
99
|
const token = accessToken || (yield realmLogin(environment.accessServiceUrl, 'core'));
|
|
74
100
|
const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
|
|
75
|
-
const
|
|
76
|
-
headers: { Authorization: `Bearer ${token}` },
|
|
77
|
-
});
|
|
78
|
-
const choices = tenants.results
|
|
79
|
-
.map((r) => r.name)
|
|
80
|
-
.sort((a, b) => a.localeCompare(b));
|
|
81
|
-
const result = yield (0, enquirer_1.prompt)({
|
|
82
|
-
type: 'autocomplete',
|
|
83
|
-
name: 'tenant',
|
|
84
|
-
message: 'Which tenant is the application or service for?',
|
|
85
|
-
choices,
|
|
86
|
-
});
|
|
101
|
+
const tenant = yield selectTenant(tenantServiceUrl, token);
|
|
87
102
|
return {
|
|
88
|
-
tenant: (0, devkit_1.names)(
|
|
89
|
-
tenantRealm:
|
|
103
|
+
tenant: (0, devkit_1.names)(tenant.name).fileName,
|
|
104
|
+
tenantRealm: tenant.realm,
|
|
90
105
|
accessServiceUrl: environment.accessServiceUrl,
|
|
91
106
|
directoryServiceUrl: environment.directoryServiceUrl,
|
|
92
107
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/adsp-utils.ts"],"names":[],"mappings":";;;;AAAA,yCAAqD;AACrD,iCAA0B;AAC1B,uCAAkC;AAClC,mCAAmC;AACnC,6BAA6B;AAC7B,iDAA+D;AAE/D,iDAA+D;AAO/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,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,UAAU,CAAC,CAAA,IAAI,CAAC,CAAC,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAG,UAAU,CAAC,CAAA,CAAC;AACzE,CAAC;AAPD,sCAOC;AAED,
|
|
1
|
+
{"version":3,"file":"adsp-utils.js","sourceRoot":"","sources":["../../../../../packages/nx-oc/src/adsp/adsp-utils.ts"],"names":[],"mappings":"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"}
|