Enhance Bicep validation email notifications and refactor user fetching logic

- Update email body handling in Bicep validation workflow to include fallback messages when HTML reports are not generated.
- Refactor `fetchCurrentUser` to `hydrateCurrentUser` in app slice, improving user state management.
- Remove unused `fetchCurrentUser` async thunk and related error handling.
- Adjust LoginButton component to streamline authentication logic.
- Minor documentation update for clarity in app registration instructions.

Author: Akhileswara-Microsoft

.github/workflows/validate-bicep-params.yml

@@ -77,7 +77,11 @@ jobs:
           LOGICAPP_URL: ${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}
           ACCELERATOR_NAME: ${{ env.accelerator_name }}
         run: |
-          EMAIL_BODY=$(cat email_body.html)
+          if [ -f email_body.html ]; then
+            EMAIL_BODY=$(cat email_body.html)
+          else
+            EMAIL_BODY="<p>Bicep parameter validation failed but no HTML report was generated. Check the <a href=\"https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}\">workflow run</a> for details.</p>"
+          fi
 
           jq -n \
             --arg name "${ACCELERATOR_NAME}" \
@@ -93,7 +97,11 @@ jobs:
           LOGICAPP_URL: ${{ secrets.EMAILNOTIFICATION_LOGICAPP_URL_TA }}
           ACCELERATOR_NAME: ${{ env.accelerator_name }}
         run: |
-          EMAIL_BODY=$(cat email_body.html)
+          if [ -f email_body.html ]; then
+            EMAIL_BODY=$(cat email_body.html)
+          else
+            EMAIL_BODY="<p>Bicep parameter validation passed. Check the <a href=\"https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}\">workflow run</a> for details.</p>"
+          fi
 
           jq -n \
             --arg name "${ACCELERATOR_NAME}" \

docs/create_new_app_registration.md

@@ -20,7 +20,7 @@
 
 ![Redirect URL](images/azure-app-service-auth-setup/AddRedirectURL.png)
 
-6. Click on `+Add redirect URI`.
+6. Click on `+ Add redirect URI`.
 
 ![+ Add platform](images/azure-app-service-auth-setup/AddPlatform.png)
 

infra/scripts/validate_bicep_params.py

@@ -671,14 +671,14 @@ def main() -> int:
     # Optional HTML email report
     if args.html_output:
         scan_dir = str(args.dir) if args.dir else ""
-        html = generate_html_report(
+        html_report = generate_html_report(
             results,
             accelerator_name=args.accelerator_name,
             run_url=args.run_url,
             scan_dir=scan_dir,
         )
         args.html_output.parent.mkdir(parents=True, exist_ok=True)
-        args.html_output.write_text(html, encoding="utf-8")
+        args.html_output.write_text(html_report, encoding="utf-8")
         print(f"HTML report written to {args.html_output}")
 
     has_errors = any(r.has_errors for r in results)

src/App/src/App.tsx

@@ -4,14 +4,15 @@ import { BrowserRouter as Router, Routes, Route, Navigate } from 'react-router-d
 import { HomePage, PlanPage } from './pages';
 import { useWebSocket } from './hooks/useWebSocket';
 import { useAppDispatch } from './store/hooks';
-import { fetchCurrentUser } from './store/slices/appSlice';
+import { hydrateCurrentUser } from './store/slices/appSlice';
+import { getUserInfoGlobal } from './api/config';
 
 function App() {
     useWebSocket();
     const dispatch = useAppDispatch();
 
     useEffect(() => {
-        dispatch(fetchCurrentUser());
+        dispatch(hydrateCurrentUser(getUserInfoGlobal()));
     }, [dispatch]);
 
   return (

src/App/src/components/auth/LoginButton.tsx

@@ -73,10 +73,6 @@ const LoginButton: React.FC<LoginButtonProps> = ({ showName = false }) => {
   const userEmail = useAppSelector(state => state.app.userEmail);
   const isAuthenticated = Boolean(userId && userId !== 'anonymous');
 
-  const login = useCallback(() => {
-    window.location.href = '/.auth/login/aad';
-  }, []);
-
   const logout = useCallback(() => {
     const logoutUrl = '/.auth/logout?post_logout_redirect_uri=' + encodeURIComponent('/.auth/login/aad');
     window.location.href = logoutUrl;

src/App/src/store/slices/appSlice.ts

@@ -1,9 +1,9 @@
 /**
  * App Slice — global application state: config, theme, WebSocket connection, auth.
  */
-import { createSlice, createAsyncThunk, PayloadAction } from '@reduxjs/toolkit';
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import type { RootState } from '../store';
-import { getUserInfo } from '../../api/config';
+import { UserInfo } from '../../models';
 
 export interface AppState {
     /** Has the runtime config been loaded from /config? */
@@ -29,40 +29,6 @@ const initialState: AppState = {
     userEmail: '',
 };
 
-export const fetchCurrentUser = createAsyncThunk(
-    'app/fetchCurrentUser',
-    async (_arg, { rejectWithValue }) => {
-        try {
-            const userInfo = await getUserInfo();
-
-            if (!userInfo.user_id) {
-                return rejectWithValue('No user identity found');
-            }
-
-            // Extract email from claims (preferred_username, email, or UPN)
-            const userClaims = userInfo.user_claims || [];
-            let emailVal = userInfo.user_email || '';
-            for (const claim of userClaims) {
-                if (claim.typ === 'preferred_username' ||
-                    claim.typ === 'email' ||
-                    claim.typ === 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' ||
-                    claim.typ === 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn') {
-                    emailVal = claim.val;
-                    break;
-                }
-            }
-
-            return {
-                userId: userInfo.user_id || 'anonymous',
-                userName: userInfo.user_first_last_name || '',
-                userEmail: emailVal,
-            };
-        } catch (error) {
-            return rejectWithValue('Failed to fetch user info');
-        }
-    }
-);
-
 const appSlice = createSlice({
     name: 'app',
     initialState,
@@ -76,26 +42,38 @@ const appSlice = createSlice({
         setWsConnected(state, action: PayloadAction<boolean>) {
             state.wsConnected = action.payload;
         },
-    },
-    extraReducers: (builder) => {
-        builder
-            .addCase(fetchCurrentUser.fulfilled, (state, action) => {
-                state.userId = action.payload.userId;
-                state.userName = action.payload.userName;
-                state.userEmail = action.payload.userEmail;
-            })
-            .addCase(fetchCurrentUser.rejected, (state) => {
+        hydrateCurrentUser(state, action: PayloadAction<UserInfo | null>) {
+            const userInfo = action.payload;
+            if (!userInfo || !userInfo.user_id) {
                 state.userId = 'anonymous';
                 state.userName = '';
                 state.userEmail = '';
-            });
+                return;
+            }
+            state.userId = userInfo.user_id || 'anonymous';
+            state.userName = userInfo.user_first_last_name || '';
+            // Extract email from claims
+            const userClaims = userInfo.user_claims || [];
+            let emailVal = userInfo.user_email || '';
+            for (const claim of userClaims) {
+                if (claim.typ === 'preferred_username' ||
+                    claim.typ === 'email' ||
+                    claim.typ === 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' ||
+                    claim.typ === 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn') {
+                    emailVal = claim.val;
+                    break;
+                }
+            }
+            state.userEmail = emailVal;
+        },
     },
 });
 
 export const {
     setConfigLoaded,
     setIsDarkMode,
     setWsConnected,
+    hydrateCurrentUser,
 } = appSlice.actions;
 
 /* ── Granular Selectors ───────────────────────────────────────── */