@abgov/nx-adsp 12.8.0-beta.7 → 12.8.0-beta.9
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/generators/mean/mean.js +5 -1
- package/src/generators/mean/mean.js.map +1 -1
- package/src/generators/mern/mern.js +5 -1
- package/src/generators/mern/mern.js.map +1 -1
- package/src/generators/react-app/files/src/app/config.slice.ts__tmpl__ +2 -2
- package/src/generators/react-app/files/src/app/intake.slice.ts__tmpl__ +1 -1
- package/src/generators/react-app/files/src/app/start.slice.ts__tmpl__ +7 -7
- package/src/generators/react-app/files/src/app/user.slice.ts__tmpl__ +1 -1
package/package.json
CHANGED
|
@@ -10,8 +10,12 @@ const agent_1 = require("../../utils/agent");
|
|
|
10
10
|
const plugin_version_1 = require("../../utils/plugin-version");
|
|
11
11
|
function normalizeOptions(host, options) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
var _a;
|
|
13
14
|
const adsp = yield (0, nx_oc_1.getAdspConfiguration)(host, options);
|
|
14
|
-
|
|
15
|
+
// Propagate the token from adsp to the Schema-level accessToken so that
|
|
16
|
+
// sub-generators (express-service, angular-app) that check options.accessToken
|
|
17
|
+
// see it and skip their own realmLogin fallback.
|
|
18
|
+
return Object.assign(Object.assign({}, options), { accessToken: (_a = adsp.accessToken) !== null && _a !== void 0 ? _a : options.accessToken, adsp });
|
|
15
19
|
});
|
|
16
20
|
}
|
|
17
21
|
function default_1(host, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mean/mean.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mean.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mean/mean.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,12 @@ const agent_1 = require("../../utils/agent");
|
|
|
10
10
|
const plugin_version_1 = require("../../utils/plugin-version");
|
|
11
11
|
function normalizeOptions(host, options) {
|
|
12
12
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
13
|
+
var _a;
|
|
13
14
|
const adsp = yield (0, nx_oc_1.getAdspConfiguration)(host, options);
|
|
14
|
-
|
|
15
|
+
// Propagate the token from adsp to the Schema-level accessToken so that
|
|
16
|
+
// sub-generators (express-service, react-app) that check options.accessToken
|
|
17
|
+
// see it and skip their own realmLogin fallback.
|
|
18
|
+
return Object.assign(Object.assign({}, options), { accessToken: (_a = adsp.accessToken) !== null && _a !== void 0 ? _a : options.accessToken, adsp });
|
|
15
19
|
});
|
|
16
20
|
}
|
|
17
21
|
function default_1(host, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"mern.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/mern/mern.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export const initializeConfig = createAsyncThunk(
|
|
|
12
12
|
'config/initialize',
|
|
13
13
|
async (environment?: Record<string, unknown>) => {
|
|
14
14
|
// Initialize state with environment and ADSP directory of services.
|
|
15
|
-
const directoryUrl = environment?.directory?.['url'];
|
|
15
|
+
const directoryUrl = (environment?.directory as Record<string, string> | undefined)?.['url'];
|
|
16
16
|
|
|
17
17
|
let directory: Record<string, string> = {};
|
|
18
18
|
if (directoryUrl) {
|
|
@@ -56,7 +56,7 @@ const configSlice = createSlice({
|
|
|
56
56
|
reducers: {},
|
|
57
57
|
extraReducers: (builder) => {
|
|
58
58
|
builder.addCase(initializeConfig.fulfilled, (state, { payload }) => {
|
|
59
|
-
state.environment = payload.environment;
|
|
59
|
+
state.environment = payload.environment ?? {};
|
|
60
60
|
state.directory = payload.directory;
|
|
61
61
|
state.initialized = true;
|
|
62
62
|
});
|
|
@@ -40,10 +40,10 @@ export const fetchPrivateResource = createAsyncThunk(
|
|
|
40
40
|
);
|
|
41
41
|
|
|
42
42
|
export const initialStartState: StartState = {
|
|
43
|
-
apiPublicMessage:
|
|
44
|
-
apiPrivateMessage:
|
|
43
|
+
apiPublicMessage: '',
|
|
44
|
+
apiPrivateMessage: '',
|
|
45
45
|
loadingStatus: 'not loaded',
|
|
46
|
-
error:
|
|
46
|
+
error: '',
|
|
47
47
|
};
|
|
48
48
|
|
|
49
49
|
export const startReducer = createReducer(initialStartState, (builder) => {
|
|
@@ -60,7 +60,7 @@ export const startReducer = createReducer(initialStartState, (builder) => {
|
|
|
60
60
|
)
|
|
61
61
|
.addCase(fetchPublicResource.rejected, (state: StartState, action) => {
|
|
62
62
|
state.loadingStatus = 'error';
|
|
63
|
-
state.error = action.error.message;
|
|
63
|
+
state.error = action.error.message ?? '';
|
|
64
64
|
})
|
|
65
65
|
.addCase(fetchPrivateResource.pending, (state: StartState) => {
|
|
66
66
|
state.loadingStatus = 'loading';
|
|
@@ -74,16 +74,16 @@ export const startReducer = createReducer(initialStartState, (builder) => {
|
|
|
74
74
|
)
|
|
75
75
|
.addCase(fetchPrivateResource.rejected, (state: StartState, action) => {
|
|
76
76
|
state.loadingStatus = 'error';
|
|
77
|
-
state.error = action.error.message;
|
|
77
|
+
state.error = action.error.message ?? '';
|
|
78
78
|
});
|
|
79
79
|
});
|
|
80
80
|
|
|
81
81
|
export const publicResourceSelector = createSelector(
|
|
82
|
-
(state:
|
|
82
|
+
(state: { [START_FEATURE_KEY]: StartState }) => state[START_FEATURE_KEY],
|
|
83
83
|
(start) => start.apiPublicMessage
|
|
84
84
|
);
|
|
85
85
|
|
|
86
86
|
export const privateResourceSelector = createSelector(
|
|
87
|
-
(state:
|
|
87
|
+
(state: { [START_FEATURE_KEY]: StartState }) => state[START_FEATURE_KEY],
|
|
88
88
|
(start) => start.apiPrivateMessage
|
|
89
89
|
);
|
|
@@ -48,7 +48,7 @@ export const logoutUser = createAsyncThunk('user/logout', async () => {
|
|
|
48
48
|
|
|
49
49
|
export async function getAccessToken(): Promise<string> {
|
|
50
50
|
await keycloak.updateToken(30);
|
|
51
|
-
return keycloak.token;
|
|
51
|
+
return keycloak.token as string;
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
const userSlice = createSlice({
|