@abgov/nx-adsp 12.3.0 → 12.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abgov/nx-adsp",
-  "version": "12.3.0",
+  "version": "12.4.0",
   "license": "Apache-2.0",
   "main": "src/index.js",
   "description": "Government of Alberta - Nx plugin for ADSP apps.",

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

@@ -1,39 +1,35 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import { getDefaultMiddleware } from '@reduxjs/toolkit';
 import { render } from '@testing-library/react';
+import { Provider } from 'react-redux';
 import { BrowserRouter } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 
 import App from './app';
+import { CONFIG_FEATURE_KEY } from './config.slice';
+import { START_FEATURE_KEY } from './start.slice';
+import { USER_FEATURE_KEY } from './user.slice';
 
-const mockStore = configureStore(getDefaultMiddleware());
+const mockStore = configureStore([]);
 
 describe('App', () => {
-  let store, userManager; 
-  
+  let store;
+
   beforeEach(() => {
     store = mockStore({
-      user: {},
+      [USER_FEATURE_KEY]: { initialized: false, authenticated: false, name: '', email: '' },
+      [CONFIG_FEATURE_KEY]: { initialized: false, environment: {}, directory: {} },
+      [START_FEATURE_KEY]: { apiPublicMessage: null, apiPrivateMessage: null, loadingStatus: 'not loaded', error: null },
       intake: {},
-      start: {}
     });
-
-    userManager = {
-      signoutRedirect: jest.fn(),
-      signinRedirect: jest.fn()
-    }
   });
 
   it('should render successfully', () => {
     const { baseElement } = render(
       <BrowserRouter>
         <Provider store={store}>
-          <App userManager={userManager} />
+          <App />
         </Provider>
       </BrowserRouter>
     );
-
     expect(baseElement).toBeTruthy();
   });
 
@@ -41,11 +37,10 @@ describe('App', () => {
     const { getByText } = render(
       <BrowserRouter>
         <Provider store={store}>
-          <App userManager={userManager} />
+          <App />
         </Provider>
       </BrowserRouter>
     );
-
     expect(getByText('Welcome to <%= projectName %>!')).toBeTruthy();
   });
 });

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

@@ -1,96 +1,66 @@
-import React, { useEffect } from 'react';
+import {
+  GoabAppHeader,
+  GoabButton,
+  GoabButtonGroup,
+  GoabHeroBanner,
+  GoabMicrositeHeader,
+} from '@abgov/react-components';
+import { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { UserManager } from 'oidc-client';
-import { UserState } from 'redux-oidc';
-import { GoAAppHeader, GoAButton, GoAMicrositeHeader, GoAHeroBanner } from '@abgov/react-components';
 
 import { AppDispatch } from '../store';
 import styles from './app.module.css';
-import '@abgov/web-components/index.css';
-import { 
-  fetchPrivateResource, 
-  fetchPublicResource, 
-  publicResourceSelector, 
-  privateResourceSelector 
-  } from './start.slice';
+import {
+  fetchPrivateResource,
+  fetchPublicResource,
+  privateResourceSelector,
+  publicResourceSelector,
+} from './start.slice';
+import { loginUser, logoutUser, userSelector } from './user.slice';
 
-interface AppProps {
-  userManager: UserManager;
-}
-
-export function App({ userManager }: AppProps) {
-  const user = useSelector(
-    (state: {user: UserState}) => state.user.user
-  );
+export function App() {
+  const dispatch = useDispatch<AppDispatch>();
+  const { authenticated, name } = useSelector(userSelector);
   const publicResource = useSelector(publicResourceSelector);
   const privateResource = useSelector(privateResourceSelector);
 
-  const dispatch = useDispatch<AppDispatch>();
-
   useEffect(() => {
     dispatch(fetchPublicResource());
-    if (user?.access_token) {
-      dispatch(fetchPrivateResource(user?.access_token));
+    if (authenticated) {
+      dispatch(fetchPrivateResource());
     }
-  }, [user, dispatch]);
+  }, [authenticated, dispatch]);
 
   return (
     <div className={styles.app}>
-      <GoAMicrositeHeader type="alpha" />
-      <GoAAppHeader
-        url="/"
-        heading="Digital Service Example"
-      />
-      <GoAHeroBanner
-        heading="Quick start of a digital service"
-        backgroundUrl={'../assets/banner.jpg'}
-      />
+      <GoabMicrositeHeader type="alpha" />
+      <GoabAppHeader url="/" heading="<%= projectName %>">
+        <GoabButtonGroup alignment="end">
+          {name && <span>{name}</span>}
+          {!authenticated ? (
+            <GoabButton type="tertiary" onClick={() => dispatch(loginUser())}>
+              Sign in
+            </GoabButton>
+          ) : (
+            <GoabButton type="tertiary" onClick={() => dispatch(logoutUser())}>
+              Sign out
+            </GoabButton>
+          )}
+        </GoabButtonGroup>
+      </GoabAppHeader>
+      <GoabHeroBanner heading="<%= projectName %>" backgroundUrl="/assets/banner.jpg" />
       <main>
         <section>
           <h2>Welcome to <%= projectName %>!</h2>
-          <p>
-            Don't panic. Start editing the project to build your digital service.
-          </p>
+          <p>Don't panic. Start editing the project to build your digital service.</p>
           <h3>A few things you might want to do next:</h3>
           <ul className={styles.nextSteps}>
-            <li>
-              Create the '<%= projectName %>' client in your realm to let users 
-              {
-                user ?
-                <GoAButton ml="s" onClick={() => userManager.signoutRedirect()}>
-                  Sign Out
-                </GoAButton> :
-                <GoAButton ml="s" onClick={() => userManager.signinRedirect()}>
-                  Sign In
-                </GoAButton>
-              }
-            </li>
-            <li>
-              Make requests to the backend API by either updating nginx.conf or enabling CORS on the API.
-            </li>
-            <li>
-              Add requests to public API resources: {publicResource || 'Not retrieved'}
-            </li>
-            <li>
-              Add requests to private API resources: {privateResource || 'Not retrieved'}
-            </li>
+            <li>Register the '<%= projectName %>' client in your realm and set CLIENT_SECRET.</li>
+            <li>Add requests to public API resources: {publicResource || 'Not retrieved'}</li>
+            <li>Add requests to private API resources: {privateResource || 'Not retrieved'}</li>
           </ul>
         </section>
       </main>
-      <footer className={styles.footer}>
-        <div className="goa-socialconnect">
-        <div className="goa-title">
-          Connect with us on
-        </div>
-          <ul>
-            <li className={styles.github}>
-              <a href="https://github.com/abgov" rel="noreferrer" target="_blank">
-                GitHub
-              </a>
-            </li>
-          </ul>
-        </div>
-      </footer>
     </div>
   );
 }

package/src/generators/react-app/files/src/app/intake.slice.ts__tmpl__

@@ -0,0 +1,21 @@
+import { createSlice } from '@reduxjs/toolkit';
+
+export const INTAKE_FEATURE_KEY = 'intake';
+
+export interface IntakeState {
+  loadingStatus: 'not loaded' | 'loading' | 'loaded' | 'error';
+  error: string;
+}
+
+export const initialIntakeState: IntakeState = {
+  loadingStatus: 'not loaded',
+  error: null,
+};
+
+const intakeSlice = createSlice({
+  name: INTAKE_FEATURE_KEY,
+  initialState: initialIntakeState,
+  reducers: {},
+});
+
+export const intakeReducer = intakeSlice.reducer;

package/src/generators/react-app/files/src/app/start.slice.ts__tmpl__

@@ -1,10 +1,12 @@
-import { 
-  createAsyncThunk, 
-  createReducer, 
-  createSelector, 
-  PayloadAction 
+import {
+  createAsyncThunk,
+  createReducer,
+  createSelector,
+  PayloadAction,
 } from '@reduxjs/toolkit';
 
+import { getAccessToken } from './user.slice';
+
 export const START_FEATURE_KEY = 'start';
 
 export interface StartState {
@@ -18,23 +20,21 @@ interface ApiResourceResponse {
   message: string;
 }
 
-// Redux thunk to get value from a public API.
 export const fetchPublicResource = createAsyncThunk(
   'start/fetchPublicResource',
-  async (_, _thunkAPI) => {
+  async () => {
     const response = await fetch('/api/v1/public');
     return response.json();
   }
 );
 
-// Redux thunk to get value from a private API; access token is a required input.
 export const fetchPrivateResource = createAsyncThunk(
   'start/fetchPrivateResource',
-  async (token: string, _thunkAPI) => {
-    const response = await fetch(
-      '/api/v1/private', 
-      { headers: { Authorization: `Bearer ${token}` } }
-    );
+  async () => {
+    const token = await getAccessToken();
+    const response = await fetch('/api/v1/private', {
+      headers: { Authorization: `Bearer ${token}` },
+    });
     return response.json();
   }
 );
@@ -46,52 +46,37 @@ export const initialStartState: StartState = {
   error: null,
 };
 
-export const startReducer= createReducer(
-  initialStartState,
-  (builder) => {
-    builder
-      .addCase(
-        fetchPublicResource.pending, 
-        (state: StartState) => {
-          state.loadingStatus = 'loading';
-        }
-      )
-      .addCase(
-        fetchPublicResource.fulfilled,
-        (state: StartState, action: PayloadAction<ApiResourceResponse>) => {
-          state.loadingStatus = 'loaded';
-          state.apiPublicMessage = action.payload.message;
-        }
-      )
-      .addCase(
-        fetchPublicResource.rejected, 
-        (state: StartState, action) => {
-          state.loadingStatus = 'error';
-          state.error = action.error.message;
-        }
-      )
-      .addCase(
-        fetchPrivateResource.pending, 
-        (state: StartState) => {
-          state.loadingStatus = 'loading';
-        }
-      )
-      .addCase(
-        fetchPrivateResource.fulfilled,
-        (state: StartState, action: PayloadAction<ApiResourceResponse>) => {
-          state.loadingStatus = 'loaded';
-          state.apiPrivateMessage = action.payload.message;
-        }
-      )
-      .addCase(
-        fetchPrivateResource.rejected, 
-        (state: StartState, action) => {
-          state.loadingStatus = 'error';
-          state.error = action.error.message;
-        }
-      );
-  }
-);
+export const startReducer = createReducer(initialStartState, (builder) => {
+  builder
+    .addCase(fetchPublicResource.pending, (state: StartState) => {
+      state.loadingStatus = 'loading';
+    })
+    .addCase(
+      fetchPublicResource.fulfilled,
+      (state: StartState, action: PayloadAction<ApiResourceResponse>) => {
+        state.loadingStatus = 'loaded';
+        state.apiPublicMessage = action.payload.message;
+      }
+    )
+    .addCase(fetchPublicResource.rejected, (state: StartState, action) => {
+      state.loadingStatus = 'error';
+      state.error = action.error.message;
+    })
+    .addCase(fetchPrivateResource.pending, (state: StartState) => {
+      state.loadingStatus = 'loading';
+    })
+    .addCase(
+      fetchPrivateResource.fulfilled,
+      (state: StartState, action: PayloadAction<ApiResourceResponse>) => {
+        state.loadingStatus = 'loaded';
+        state.apiPrivateMessage = action.payload.message;
+      }
+    )
+    .addCase(fetchPrivateResource.rejected, (state: StartState, action) => {
+      state.loadingStatus = 'error';
+      state.error = action.error.message;
+    });
+});
 
 export const publicResourceSelector = createSelector(
   (state: unknown): StartState => state[START_FEATURE_KEY],

package/src/generators/react-app/files/src/app/user.slice.ts__tmpl__

@@ -0,0 +1,71 @@
+import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import Keycloak from 'keycloak-js';
+
+import { environment } from '../environments/environment';
+
+const keycloak = new Keycloak({
+  url: environment.access.url,
+  realm: environment.access.realm,
+  clientId: environment.access.client_id,
+});
+
+export const USER_FEATURE_KEY = 'user';
+
+export interface UserState {
+  initialized: boolean;
+  authenticated: boolean;
+  name: string;
+  email: string;
+}
+
+export const initialUserState: UserState = {
+  initialized: false,
+  authenticated: false,
+  name: '',
+  email: '',
+};
+
+export const initializeUser = createAsyncThunk('user/initialize', async () => {
+  const authenticated = await keycloak.init({
+    onLoad: 'check-sso',
+    pkceMethod: 'S256',
+    silentCheckSsoRedirectUri: `${window.location.origin}/silent-check-sso.html`,
+  });
+  return {
+    authenticated,
+    name: keycloak.tokenParsed?.name as string,
+    email: keycloak.tokenParsed?.email as string,
+  };
+});
+
+export const loginUser = createAsyncThunk('user/login', async () => {
+  await keycloak.login();
+});
+
+export const logoutUser = createAsyncThunk('user/logout', async () => {
+  await keycloak.logout({ redirectUri: window.location.origin });
+});
+
+export async function getAccessToken(): Promise<string> {
+  await keycloak.updateToken(30);
+  return keycloak.token;
+}
+
+const userSlice = createSlice({
+  name: USER_FEATURE_KEY,
+  initialState: initialUserState,
+  reducers: {},
+  extraReducers: (builder) => {
+    builder.addCase(initializeUser.fulfilled, (state, { payload }) => {
+      state.initialized = true;
+      state.authenticated = payload.authenticated;
+      state.name = payload.name || '';
+      state.email = payload.email || '';
+    });
+  },
+});
+
+export const userReducer = userSlice.reducer;
+
+export const userSelector = (state: { [USER_FEATURE_KEY]: UserState }) =>
+  state[USER_FEATURE_KEY];

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

@@ -1,13 +1,10 @@
-// This file can be replaced during build by using the `fileReplacements` array.
-// When building for production, this file is replaced with `environment.prod.ts`.
-
 export const environment = {
   production: false,
   directory: {
     url: '<%= directoryServiceUrl %>',
   },
   access: {
-    url: '<%= accessServiceUrl %>',
+    url: '<%= accessServiceUrl %>/auth',
     realm: '<%= tenantRealm %>',
     client_id: 'urn:ads:<%= tenant %>:<%= projectName %>'
   }

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

@@ -1,70 +1,23 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import '@abgov/web-components';
+import '@abgov/web-components/index.css';
+import { StrictMode } from 'react';
+import { createRoot } from 'react-dom/client';
 import { Provider } from 'react-redux';
-import {
-  CallbackComponent,
-  loadUser,
-  OidcProvider,
-  SignoutCallbackComponent,
-} from 'redux-oidc';
+import { BrowserRouter } from 'react-router-dom';
 
-import { environment } from './environments/environment';
-import { createUserManager } from './access';
 import App from './app/app';
-import { initializeConfig } from './app/config.slice';
+import { initializeUser } from './app/user.slice';
 import { store } from './store';
 
-// Fetch configuration from web server; otherwise fallback to static environment.
-fetch('/config/config.json')
-  .then(res => res.ok ? 
-    res.json() : 
-    environment
-  )
-  .then((env) => {
+const root = createRoot(document.getElementById('root') as HTMLElement);
+root.render(
+  <Provider store={store}>
+    <StrictMode>
+      <BrowserRouter>
+        <App />
+      </BrowserRouter>
+    </StrictMode>
+  </Provider>
+);
 
-    store.dispatch(initializeConfig(env));
-    const userManager = createUserManager(env.access);
-    loadUser(store, userManager);
-    
-    ReactDOM.render(
-      <Provider store={store}>
-        <OidcProvider store={store} userManager={userManager}>
-          <React.StrictMode>
-            <Router>
-              <Switch>
-                <Route 
-                  path="/auth/callback" 
-                  render={({history}) => 
-                    <CallbackComponent 
-                      userManager={userManager} 
-                      successCallback={() => history.push('/')}
-                      errorCallback={() => history.push('/')}
-                    >
-                      <span>signing in...</span>
-                    </CallbackComponent>
-                  }
-                />
-                <Route
-                  path="/signout/callback" 
-                  render={({history}) => 
-                    <SignoutCallbackComponent 
-                      userManager={userManager} 
-                      successCallback={() => history.push('/')}
-                      errorCallback={() => history.push('/')}
-                    >
-                      <span>signing out...</span>
-                    </SignoutCallbackComponent>
-                  }
-                />
-                <Route>
-                  <App userManager={userManager} />
-                </Route>
-              </Switch>
-            </Router>
-          </React.StrictMode>
-        </OidcProvider>
-      </Provider>,
-      document.getElementById('root')
-    );
-  });
+store.dispatch(initializeUser());

package/src/generators/react-app/files/src/silent-check-sso.html__tmpl__

@@ -0,0 +1,5 @@
+<html>
+<body>
+<script>parent.postMessage(location.href, location.origin);</script>
+</body>
+</html>

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

@@ -1,42 +1,19 @@
 import { configureStore } from '@reduxjs/toolkit';
-import {
-  reducer as oidcReducer,
-  LOAD_USER_ERROR,
-  LOADING_USER,
-  USER_EXPIRED,
-  USER_EXPIRING,
-  USER_FOUND,
-  USER_LOADED,
-  USER_SIGNED_OUT,
-} from 'redux-oidc';
+
 import { CONFIG_FEATURE_KEY, configReducer } from './app/config.slice';
-import { START_FEATURE_KEY, startReducer } from './app/start.slice';
 import { INTAKE_FEATURE_KEY, intakeReducer } from './app/intake.slice';
+import { START_FEATURE_KEY, startReducer } from './app/start.slice';
+import { USER_FEATURE_KEY, userReducer } from './app/user.slice';
 
 export const store = configureStore({
   reducer: {
-    user: oidcReducer,
+    [USER_FEATURE_KEY]: userReducer,
     [CONFIG_FEATURE_KEY]: configReducer,
     [START_FEATURE_KEY]: startReducer,
     [INTAKE_FEATURE_KEY]: intakeReducer,
   },
   devTools: process.env.NODE_ENV !== 'production',
-  // Optional Redux store enhancers
-  enhancers: [],
-  middleware: (getDefault) =>
-    getDefault({
-      serializableCheck: {
-        ignoredActions: [
-          LOAD_USER_ERROR,
-          LOADING_USER,
-          USER_EXPIRED,
-          USER_EXPIRING,
-          USER_FOUND,
-          USER_LOADED,
-          USER_SIGNED_OUT,
-        ],
-        ignoredPaths: ['user'],
-      },
-    }),
 });
+
 export type AppDispatch = typeof store.dispatch;
+export type RootState = ReturnType<typeof store.getState>;

package/src/generators/react-app/files/webpack.config.js__tmpl__

@@ -6,13 +6,14 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 module.exports = composePlugins(withNx(), withReact(), (config) => {
   // Update the webpack config as needed here.
   // e.g. `config.plugins.push(new MyPlugin())`
-  config.entry['renew'] = ['./src/renew.ts'];
 
+  // Required for keycloak-js silent SSO check.
   config.plugins.push(
     new HtmlWebpackPlugin({
-      template: './src/renew.html',
-      chunks: ['renew'],
-      filename: 'renew.html',
+      templateContent:
+        '<html><body><script>parent.postMessage(location.href, location.origin);</script></body></html>',
+      chunks: [],
+      filename: 'silent-check-sso.html',
     })
   );
 

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

@@ -54,16 +54,16 @@ function addFiles(host, options) {
 function removeFiles(host, options) {
     host.delete(`${options.projectRoot}/src/app/logo.svg`);
     host.delete(`${options.projectRoot}/src/app/star.svg`);
+    host.delete(`${options.projectRoot}/src/app/nx-welcome.tsx`);
 }
 function default_1(host, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const normalizedOptions = yield normalizeOptions(host, options);
         const { applicationGenerator: initReact } = yield Promise.resolve().then(() => require('@nx/react'));
-        const { reduxGenerator: initRedux } = yield Promise.resolve().then(() => require('@nx/react'));
         // Setting strict to false because of: https://github.com/nrwl/nx/issues/8180
         yield initReact(host, {
             name: options.name,
-            style: 'styled-components',
+            style: 'css',
             skipFormat: true,
             linter: eslint_1.Linter.EsLint,
             unitTestRunner: 'jest',
@@ -71,19 +71,16 @@ function default_1(host, options) {
             strict: false,
             directory: `apps/${options.name}`,
         });
-        yield initRedux(host, {
-            name: 'intake',
-            path: `apps/${options.name}/src/state/intake.slice.ts`,
-        });
-        (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@abgov/react-components': '^4.18.0',
-            '@abgov/web-components': '^1.19.0',
-            '@types/react-router-dom': '~5.3.3',
-            '@types/redux-mock-store': '~1.0.2',
+        (0, devkit_1.addDependenciesToPackageJson)(host, {
+            '@abgov/design-tokens': '1.8.0',
+            '@abgov/react-components': '6.10.0',
+            '@abgov/web-components': '1.39.3',
+            '@reduxjs/toolkit': '^2.5.1',
+            'keycloak-js': '^23.0.7',
+            'react-redux': '^9.2.0',
+            'react-router-dom': '6.30.3',
+        }, {
             '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',
         });
         const addedProxy = addFiles(host, normalizedOptions);

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/files/src/access.ts__tmpl__

@@ -1,26 +0,0 @@
-import { createUserManager as createOidcUserManager } from 'redux-oidc';
-
-interface CreateUserManagerProps {
-  url: string;
-  realm: string;
-  client_id: string;
-}
-
-export function createUserManager({ 
-  url, 
-  realm, 
-  client_id 
-}: CreateUserManagerProps) {
-  
-  const appUrl = `${window.location.protocol}//${window.location.hostname}${window.location.port ? `:${window.location.port}` : ''}`;
-  const settings = {
-    client_id,
-    redirect_uri: `${appUrl}/auth/callback`,
-    post_logout_redirect_uri: `${appUrl}/signout/callback`,
-    silent_redirect_uri: `${appUrl}/renew.html`,
-    response_type: 'code',
-    authority: `${url}/auth/realms/${realm}`,
-    automaticSilentRenew: true,
-  };
-  return createOidcUserManager(settings);
-}

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

@@ -1,14 +0,0 @@
-// 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/renew.html__tmpl__

@@ -1 +0,0 @@
-<!DOCTYPE html><html><head></head><body><script></script></body></html>

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

@@ -1,3 +0,0 @@
-import { processSilentRenew } from 'redux-oidc';
-
-processSilentRenew();