Skip to content

Commit b20c5a3

Browse files
fix: update environment variables for API base URL and authentication flag
1 parent dfe2244 commit b20c5a3

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

src/ContentProcessorWeb/.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
REACT_APP_API_BASE_URL=https://ca-cps-d4ecoervb6ab-api.salmonbay-e4fea35b.eastus2.azurecontainerapps.io/
1+
REACT_APP_API_BASE_URL = APP_API_BASE_URL
22

33
REACT_APP_WEB_CLIENT_ID = APP_WEB_CLIENT_ID
44
REACT_APP_WEB_AUTHORITY = APP_WEB_AUTHORITY
@@ -12,4 +12,4 @@ REACT_APP_WEB_SCOPE = APP_WEB_SCOPE
1212
REACT_APP_API_SCOPE = APP_API_SCOPE
1313
REACT_APP_CONSOLE_LOG_ENABLED = APP_CONSOLE_LOG_ENABLED
1414

15-
REACT_APP_AUTH_ENABLED=false
15+
REACT_APP_AUTH_ENABLED = APP_AUTH_ENABLED

src/ContentProcessorWeb/src/Components/Header/Header.tsx

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ const HeaderPage: React.FC<HeaderPageProps> = ({ toggleTheme, isDarkMode }) => {
5757
const { shortcutLabel } = useHeaderHooks({ toggleTheme, isDarkMode });
5858
const { user, logout, getToken } = useAuth();
5959

60+
const authEnabled = process.env.REACT_APP_AUTH_ENABLED?.toLowerCase() !== 'false'; // Defaults to true if not set
61+
6062
const { openSwaggerUI } = useSwaggerPreview();
6163
const store = useSelector((state: RootState) => ({
6264
swaggerJSON: state.leftPanel.swaggerJSON,
@@ -126,24 +128,26 @@ const HeaderPage: React.FC<HeaderPageProps> = ({ toggleTheme, isDarkMode }) => {
126128
</div>
127129

128130
{/* Tools Section */}
129-
<div className="headerTools">
130-
<Menu hasIcons positioning={{ autoSize: true }}>
131-
<MenuTrigger disableButtonEnhancement>
132-
<Avatar
133-
color="colorful"
134-
name={user?.name}
135-
aria-label="App"
136-
className="clickable-avatar"
137-
/>
138-
</MenuTrigger>
139-
<MenuPopover style={{ minWidth: "192px" }}>
140-
<MenuList>
141-
<MenuDivider />
142-
<MenuItem icon={<ArrowExit />} onClick={logout}>Logout</MenuItem>
143-
</MenuList>
144-
</MenuPopover>
145-
</Menu>
146-
</div>
131+
{ authEnabled &&
132+
<div className="headerTools">
133+
<Menu hasIcons positioning={{ autoSize: true }}>
134+
<MenuTrigger disableButtonEnhancement>
135+
<Avatar
136+
color="colorful"
137+
name={user?.name}
138+
aria-label="App"
139+
className="clickable-avatar"
140+
/>
141+
</MenuTrigger>
142+
<MenuPopover style={{ minWidth: "192px" }}>
143+
<MenuList>
144+
<MenuDivider />
145+
<MenuItem icon={<ArrowExit />} onClick={logout}>Logout</MenuItem>
146+
</MenuList>
147+
</MenuPopover>
148+
</Menu>
149+
</div>
150+
}
147151
</Header>
148152
);
149153
};

src/ContentProcessorWeb/src/msal-auth/AuthWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import useAuth from './useAuth';
1010
const AuthWrapper: React.FC<{ children: React.ReactNode }> = ({ children }) => {
1111

1212
const { isAuthenticated, login, inProgress,token } = useAuth();
13-
const authEnabled = process.env.REACT_APP_AUTH_ENABLED !== 'false'; // Defaults to true if not set
13+
const authEnabled = process.env.REACT_APP_AUTH_ENABLED?.toLowerCase() !== 'false'; // Defaults to true if not set
1414

1515
useEffect(() => {
1616
if (authEnabled && !isAuthenticated && inProgress === InteractionStatus.None) {

0 commit comments

Comments
 (0)