Merge pull request #14 from microsoft/dev

fix: Handled logging and updated authentication set up

Author: Roopan-Microsoft

docs/ConfigureAppAuthentication.md

@@ -13,15 +13,15 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Add Authentication Provider in Web Application
 
-   - Go to deployed Container App and select `ca-<randomname>-web` and click **Add Identity Provider** button in Authentication.  
+   - Go to deployed Container App and select `ca-cps-<randomname>-web` and click **Add Identity Provider** button in Authentication.  
      ![add_auth_provider_web_1](./Images/add_auth_provider_web_1.png)
 
    - Select **Microsoft** and set **Client secret expiration**, then click **Add** button.  
      ![add_auth_provider_web_2](./Images/add_auth_provider_web_2.png)
 
 2. Add Authentication Provider in API Service
 
-   - Go to deployed Container App and select `ca-<randomname>-api` and click **Add Identity Provider** button in Authentication.  
+   - Go to deployed Container App and select `ca-cps-<randomname>-api` and click **Add Identity Provider** button in Authentication.  
      ![add_auth_provider_api_1](./Images/add_auth_provider_api_1.png)
 
    - Select **Microsoft** and set **Client secret expiration**.  
@@ -34,7 +34,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Set Redirect URI in Single Page Application Platform
 
-   - Go to deployed Container App `ca-<randomname>-web` and select **Authentication** menu, then select created Application Registration.  
+   - Go to deployed Container App `ca-cps-<randomname>-web` and select **Authentication** menu, then select created Application Registration.  
      ![configure_app_registration_web_1](./Images/configure_app_registration_web_1.png)
 
    - Select **Authentication**, then select **+ Add a platform** menu.  
@@ -43,15 +43,15 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
    - Select **Single-page application**.  
      ![configure_app_registration_web_3](./Images/configure_app_registration_web_3.png)
 
-   - Add Container App `ca-<randomname>-web`'s URL.  
+   - Add Container App `ca-cps-<randomname>-web`'s URL.  
      ![configure_app_registration_web_4](./Images/configure_app_registration_web_4.png)
 
    - You may get this URL from here in your Container App.  
      ![configure_app_registration_web_5](./Images/configure_app_registration_web_5.png)
 
 2. Add Permission and Grant Permission
 
-   - Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-<your environment name>-<unique string>-api`.  
+   - Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-cps-<randomname>-api`.  
      ![configure_app_registration_web_6](./Images/configure_app_registration_web_6.png)  
      ![configure_app_registration_web_7](./Images/configure_app_registration_web_7.png)
 
@@ -74,7 +74,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 1. Grab Scope Name for Impersonation
 
-   - Go to deployed Container App `ca-<randomname>-api` and select **Authentication** menu, then select created Application Registration.  
+   - Go to deployed Container App `ca-cps-<randomname>-api` and select **Authentication** menu, then select created Application Registration.  
      ![configure_app_registration_api_1](./Images/configure_app_registration_api_1.png)
 
    - Select **Expose an API** in the left menu. Copy the Scope name, then paste it in some temporary place.  
@@ -83,11 +83,11 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
 
 ## Step 4: Add Web Application's Client Id to Allowed Client Applications List in API Application Registration
 
-1. Go to the deployed Container App `ca-<randomname>-api`, select **Authentication**, and then click **Edit**.  
-   ![add_client_id_to_web_1](./Images/add_client_id_to_web_1.png)
+1. Go to the deployed Container App `ca-cps-<randomname>-api`, select **Authentication**, and then click **Edit**.  
+   ![add_client_id_to_api_1](./Images/add_client_id_to_api_1.png)
 
 2. Select **Allow requests from specific client applications**, then click the **pencil** icon to add the Client Id.  
-   ![add_client_id_to_web_2](./Images/add_client_id_to_web_2.png)
+   ![add_client_id_to_api_2](./Images/add_client_id_to_api_2.png)
 
 3. Add the **Client Id** obtained from [Step 2: Configure Application Registration - Web Application](#step-2-configure-application-registration---web-application), then save.  
    ![add_client_id_to_web_3](./Images/add_client_id_to_web_3.png)
@@ -101,7 +101,7 @@ Now, we will edit and deploy the Web Application Container with updated Environm
 1. Select **Containers** menu under **Application**. Then click **Environment variables** tab.
 ![update_env_app_1_1](./Images/update_env_app_1_1.png)
 2. Update 3 values which were taken in previous steps for **APP_MSAL_AUTH_CLIENT_ID**, **APP_MSAL_AUTH_SCOPE**, **APP_MSAL_TOKEN_SCOPE**.  
-Click on **Save as a new revision**
+Click on **Save as a new revision**.
    The updated revision will be activated soon.
 
 ## Conclusion

docs/DeploymentGuide.md

@@ -77,7 +77,7 @@ You can run this solution in VS Code Dev Containers, which will open the project
 If you're not using one of the above options for opening the project, then you'll need to:
 
 1. Make sure the following tools are installed:
-
+    - [PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-7.5) <small>(v7.0+)</small> - available for Windows, macOS, and Linux.
     - [Azure Developer CLI (azd)](https://aka.ms/install-azd)
     - [Python 3.9+](https://www.python.org/downloads/)
     - [Docker Desktop](https://www.docker.com/products/docker-desktop/)
@@ -172,8 +172,12 @@ If you need to rebuild the source code and push the updated container to the dep
      ```powershell
      $env:USE_LOCAL_BUILD = $true
      ```
+2. Run the `az login` command
+   ```bash
+   az login
+   ```
 
-2. Run the `azd up` command again to rebuild and push the updated container:
+3. Run the `azd up` command again to rebuild and push the updated container:
    ```bash
    azd up
    ```

docs/Images/add_client_id_to_api_1.png

@@ -29,9 +29,9 @@ class AppConfiguration(ModelBaseSettings):
     app_cps_processes: str
     app_message_queue_extract: str
     app_cps_max_filesize_mb: int
+    app_logging_enable: bool
+    app_logging_level: str
 
-
-logging.basicConfig(level=logging.DEBUG)
 # Read .env file
 # Get Current Path + .env file
 env_file_path = os.path.join(os.path.dirname(__file__), ".env")
@@ -44,6 +44,14 @@ class AppConfiguration(ModelBaseSettings):
 
 app_config = AppConfiguration()
 
+if app_config.app_logging_enable:
+# Read Configuration for Logging Level as a Text then retrive the logging level
+    logging_level = getattr(
+        logging, app_config.app_logging_level
+    )
+    logging.basicConfig(level=logging_level)
+else:
+    logging.disable(logging.CRITICAL)
 
 # Dependency Function
 def get_app_config() -> AppConfiguration: