fix: merging dev changes to main branch #1716

Roopan-Microsoft · 2025-04-01T07:18:39Z

Purpose

This pull request introduces several changes to enforce authentication and adds a guide for migrating Azure Web App Service to a new container registry. The most important changes include adding a new environment variable to enforce authentication, creating a new API endpoint to check if authentication is enforced, updating the frontend to utilize this new endpoint, and adding a comprehensive migration guide.

Authentication enforcement:

code/backend/batch/utilities/helpers/env_helper.py: Added a new environment variable ENFORCE_AUTH to enforce authentication.
code/create_app.py: Added a new API endpoint /api/checkauth to check if authentication is enforced.

Frontend updates:

code/frontend/src/api/api.ts: Added a new function checkAuthEnforced to fetch the authentication enforcement status from the backend.
code/frontend/src/pages/layout/Layout.tsx: Updated the Layout component to check if authentication is enforced before fetching user information.
code/frontend/src/pages/layout/Layout.test.tsx: Updated tests to mock the checkAuthEnforced function and handle its response. [1] [2]

Documentation:

docs/container_registry_migration.md: Added a detailed guide for migrating Azure Web App Service to a new container registry.

Does this introduce a breaking change?

Yes
No

How to Test

Get the code

git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install

Test the code

What to Check

Verify that the following are valid

...

Other Information

… changes (#1509)

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

…-data-solution-accelerator into dev

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com>

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com>

…1569)

…nd Update Conversation flow based on template selection (#1567) Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>

…1572)

…1574)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com>

…WYD (#1603)

Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com> Co-authored-by: AjitPadhi-Microsoft <v-padhiajit@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: Prasanjeet-Microsoft <v-singhprasa@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

)

…`gpt-4o` (#1665)

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roopan P M <v-roopanpm@microsoft.com> Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com> Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com> Co-authored-by: Ross Smith <ross-p-smith@users.noreply.github.com> Co-authored-by: gpickett <122489228+gpickett@users.noreply.github.com> Co-authored-by: Francia Riesco <friesco@microsoft.com> Co-authored-by: Francia Riesco <Fr4nc3@users.noreply.github.com> Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com> Co-authored-by: Harmanpreet-Microsoft <v-harmanprka@microsoft.com> Co-authored-by: UtkarshMishra-Microsoft <v-utkamishra@microsoft.com> Co-authored-by: Priyanka-Microsoft <v-prisinghal@microsoft.com> Co-authored-by: Kiran-Siluveru-Microsoft <v-ksiluveru@microsoft.com> Co-authored-by: Prashant-Microsoft <v-pmalusare@microsoft.com> Co-authored-by: Rohini-Microsoft <v-rwalunj@microsoft.com> Co-authored-by: Avijit-Microsoft <v-aghorui@microsoft.com> Co-authored-by: RaviKiran-Microsoft <v-ravikirans@microsoft.com> Co-authored-by: Somesh Joshi <v-somejoshi@microsoft.com> Co-authored-by: Himanshi Agrawal <v-himagrawal@microsoft.com> Co-authored-by: pradeepjha-microsoft <v-pradeepjha@microsoft.com> Co-authored-by: Harmanpreet Kaur <v-harmanpkau@microsoft.com> Co-authored-by: Bangarraju-Microsoft <v-golib@microsoft.com> Co-authored-by: Harsh-Microsoft <v-hbangera@microsoft.com>

Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com>

…ORCE_AUTH" (#1634)

Roopan-Microsoft and others added 30 commits November 25, 2024 16:02

ci: Updated workflow to handle main, dev and demo branch | Dependabot…

2dbb0b1

… changes (#1509)

fix: SFI Fixes & scope reverted to subscription (#1513)

97ced9f

ci: workflow updated for build docker (#1514)

903c259

ci: build docker updated for dev (#1522)

4cf2972

ci: workflow branch code updated (#1525)

9158819

updated comment

4545a48

updated workflow

84a33b5

updated workflow

f8c1c8f

updated workflow

e31a661

updated bicep for registry

847ce7e

fixed bicep

8f8cc98

fix: bicep updated (#1527)

15b948c

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

Merge branch 'main' into dev

1645e43

Merge branch 'dev' of https://github.com/Azure-Samples/chat-with-your…

8df387a

…-data-solution-accelerator into dev

fix: Container issue fix for multiple branch (#1539)

e4dd5f2

fix: Updated workflow (#1540)

88d06dc

Co-authored-by: Roopan P M <v-roopanpm@microsoft.com>

ci: Psl container fix for checkout code from head branch (#1541)

e5cf4dd

Co-authored-by: Ajit Padhi <v-padhiajit@microsoft.com>

fix: multiple container tag issue fix (#1552)

02d0056

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

fix: Workflow issue fix on docker image (#1554)

90e1040

Co-authored-by: Roopan-Microsoft <168007406+Roopan-Microsoft@users.noreply.github.com>

fix: CWYD Citation Links to Documents Break After Specific Timeframe (#…

131c323

…1569)

fix: Commit changes bug (#1568)

93b84ed

fix: Post-Deployment Script for Managing Bicep Outputs in .env File a…

0875b92

…nd Update Conversation flow based on template selection (#1567) Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>

fix: import error in env_helper.py (#1571)

76190b3

fix: add conversation flow in environment variable for adminweb app (#…

c65bf01

…1572)

fix: Update Hosting Model Configuration in ARM/Bicep Template (#1570)

1f326d9

fix: Update main.json for changes conversation flow changes in bicep (#…

fc688c2

…1574)

Merge branch 'main' into dev

56adb59

build: Dependabotchanges merge to Dev branch (#1602)

afaabdc

Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <v-kupavan@microsoft.com>

feat: Configurable System Prompts for Flexibility and Maintenance - C…

03f52b3

…WYD (#1603)

Pavan-Microsoft and others added 23 commits January 24, 2025 13:51

fix: Warning message displayed twice in chat history update (#1630)

3789d45

Update default.json

461779f

Update default_contract_assistant_prompt.txt

e0be943

Update open_ai_functions.py

f28ddc6

Update build-docker.yml

63ec389

Update create_app.py

e1d37f1

Update test_conversation.py

ec42447

Update test_iv_question_answer_tool.py

86dd916

Update test_response_with_search_documents_tool.py

b1f2615

Update test_conversation_flow.py

3431205

ci: update docker registry logic for main, dev, and demo branches (#1660

7025c6e

)

fix: Updates to change the Azure OpenAI model from gpt-35-turbo to …

8fca481

…`gpt-4o` (#1665)

docs: updated numerical queries section in best practices readme (#1670)

18e1dca

Merge branch 'main' into dev

c13b4e3

fix: Admin configuration issue fix (#1676)

1ed3f43

Merge branch 'main' into dev

f083af8

Merge branch 'main' into dev

2803e48

Package lock updated

b5f35ac

Merge remote-tracking branch 'origin/main' into dev

0b01abb

docs: Added migration readme file (#1668)

21b57da

Co-authored-by: Prajwal D C <v-dcprajwal@microsoft.com>

refactor: enforcing authentication based on environment variable "ENF…

6f30b3f

…ORCE_AUTH" (#1634)

Roopan-Microsoft requested review from Avijit-Microsoft, Prajwal-Microsoft and Fr4nc3 as code owners April 1, 2025 07:18

Avijit-Microsoft approved these changes Apr 3, 2025

View reviewed changes

Roopan-Microsoft added this pull request to the merge queue Apr 3, 2025

Merged via the queue into main with commit d0269a9 Apr 3, 2025
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix: merging dev changes to main branch #1716

fix: merging dev changes to main branch #1716

Uh oh!

Roopan-Microsoft commented Apr 1, 2025

Uh oh!

Uh oh!

Uh oh!