fix: formatting

Author: DrIOSX

source/Private/Initialize-TkAppName.ps1

@@ -7,9 +7,11 @@
     .PARAMETER Prefix
     A short prefix for your app name (2-4 alphanumeric characters). This parameter is mandatory.
     .PARAMETER ScenarioName
-    An optional scenario name to include in the app name (e.g., AuditGraphEmail, MemPolicy, etc.). Defaults to "GraphApp".
+    An optional scenario name to include in the app name (e.g., AuditGraphEmail, MemPolicy, etc.). Defaults to "TkEmailApp".
     .PARAMETER UserId
     An optional user email to append an "As-[username]" suffix to the app name. The email must be in a valid format.
+    .PARAMETER DoNotUseDomainSuffix
+    A switch to add session domain suffix to the app name. If not specified, the domain suffix is derived from USERDNSDOMAIN.
     .EXAMPLE
     PS> Initialize-TkAppName -Prefix "MSN"
     Generates an app name with the prefix "MSN" and default scenario name "GraphApp".

source/Private/Initialize-TkEmailAppParamsObject.ps1

@@ -4,13 +4,13 @@
     .DESCRIPTION
     The Initialize-TkEmailAppParamsObject function creates and returns a new instance of the TkEmailAppParams class using the provided parameters. This function ensures that all necessary parameters are provided and initializes the object accordingly.
     .PARAMETER AppId
-    The application ID used to identify the email application.
+    The application ID used to uniquely identify the email application.
     .PARAMETER Id
-    The unique identifier for the email application instance.
+    The unique identifier for the specific email application instance.
     .PARAMETER AppName
     The name of the email application being initialized.
-    .PARAMETER ClientCertName
-    The name of the client certificate used by the email application.
+    .PARAMETER CertificateSubject
+    The subject name of the client certificate used by the email application.
     .PARAMETER AppRestrictedSendGroup
     The group that is restricted from sending emails within the application.
     .PARAMETER CertExpires
@@ -31,7 +31,7 @@
     [TkEmailAppParams]
     Returns a new instance of the TkEmailAppParams class initialized with the provided parameters.
     .EXAMPLE
-    $tkEmailAppParams = Initialize-TkEmailAppParamsObject -AppId "12345" -Id "67890" -AppName "MyEmailApp" -AppRestrictedSendGroup "RestrictedGroup" -CertExpires "2023-12-31" -CertThumbprint "ABCDEF123456" -ConsentUrl "https://consent.url" -DefaultDomain "example.com" -SendAsUser "[email protected]" -SendAsUserEmail "[email protected]" -TenantID "tenant123"
+    $tkEmailAppParams = Initialize-TkEmailAppParamsObject -AppId "12345" -Id "67890" -AppName "MyEmailApp" -CertificateSubject "CN=MyCert" -AppRestrictedSendGroup "RestrictedGroup" -CertExpires "2023-12-31" -CertThumbprint "ABCDEF123456" -ConsentUrl "https://consent.url" -DefaultDomain "example.com" -SendAsUser "[email protected]" -SendAsUserEmail "[email protected]" -TenantID "tenant123"
 
     This example initializes a TkEmailAppParams object with the specified parameters.
 #>

source/Public/Publish-TkMemPolicyManagerApp.ps1

@@ -1,4 +1,4 @@
-<#
+<#
     .SYNOPSIS
         Publishes a new MEM (Intune) Policy Manager App in Azure AD with read-only or read-write permissions.
     .DESCRIPTION

tests/Unit/Private/Connect-TkMsService.tests.ps1

@@ -8,82 +8,71 @@ Import-Module $ProjectName
 
 InModuleScope $ProjectName {
     Describe 'Connect-TkMsService' {
-
-        # -- Mock your own function from your module:
-        Mock -CommandName 'Write-AuditLog' -ModuleName 'GraphAppToolkit'
-
-        # -- Microsoft.Graph commands:
-        Mock -CommandName 'Get-MgUser' -ModuleName 'Microsoft.Graph'
-        Mock -CommandName 'Get-MgContext' -ModuleName 'Microsoft.Graph'
-        Mock -CommandName 'Connect-MgGraph' -ModuleName 'Microsoft.Graph'
-        Mock -CommandName 'Remove-MgContext' -ModuleName 'Microsoft.Graph'
-        Mock -CommandName 'Get-MgOrganization' -ModuleName 'Microsoft.Graph'
-
-        # -- ExchangeOnlineManagement commands:
-        Mock -CommandName 'Get-OrganizationConfig' -ModuleName 'ExchangeOnlineManagement'
-        Mock -CommandName 'Connect-ExchangeOnline' -ModuleName 'ExchangeOnlineManagement'
-        Mock -CommandName 'Disconnect-ExchangeOnline' -ModuleName 'ExchangeOnlineManagement'
+        BeforeAll {
+            # Mocks are now set up once for the entire Describe block
+            Mock -CommandName 'Write-AuditLog' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Get-MgUser' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Get-MgContext' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Get-MgOrganization' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Remove-MgContext' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Connect-MgGraph' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Get-OrganizationConfig' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Disconnect-ExchangeOnline' -ModuleName GraphAppToolkit
+            Mock -CommandName 'Connect-ExchangeOnline' -ModuleName GraphAppToolkit
+        }
 
         Context 'When connecting to Microsoft Graph' {
-
             It 'Should connect to Microsoft Graph with specified scopes' {
                 $params = @{
-                    MgGraph         = $true
+                    MgGraph = $true
                     GraphAuthScopes = @('User.Read', 'Mail.Read')
-                    Confirm         = $false
                 }
+
                 Connect-TkMsService @params
 
-                # Notice the -ModuleName arguments below, matching the mocks
-                Assert-MockCalled -CommandName 'Connect-MgGraph' -ModuleName 'Microsoft.Graph' -Times 1
-                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName 'GraphAppToolkit' -Times 1 `
-                    -ParameterFilter { $_ -eq 'Connected to Microsoft Graph.' }
+                Assert-MockCalled -CommandName 'Connect-MgGraph' -ModuleName GraphAppToolkit -Exactly -Times 1
+                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName GraphAppToolkit -Exactly -Times 1 -Scope It -ParameterFilter { $_ -eq 'Connected to Microsoft Graph.' }
             }
 
             It 'Should reuse existing Microsoft Graph session if valid' {
-                Mock -CommandName 'Get-MgUser' -ModuleName 'Microsoft.Graph' -MockWith { $null }
-                Mock -CommandName 'Get-MgContext' -ModuleName 'Microsoft.Graph' -MockWith { @{ Scopes = @('User.Read', 'Mail.Read') } }
+                Mock -CommandName 'Get-MgUser' -ModuleName GraphAppToolkit -MockWith { }
+                Mock -CommandName 'Get-MgContext' -ModuleName GraphAppToolkit -MockWith { @{ Scopes = @('User.Read', 'Mail.Read') } }
 
                 $params = @{
-                    MgGraph         = $true
+                    MgGraph = $true
                     GraphAuthScopes = @('User.Read', 'Mail.Read')
-                    Confirm         = $false
                 }
+
                 Connect-TkMsService @params
 
-                Assert-MockCalled -CommandName 'Get-MgUser' -ModuleName 'Microsoft.Graph' -Times 1
-                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName 'GraphAppToolkit' -Times 1 `
-                    -ParameterFilter { $_ -eq 'An active Microsoft Graph session is detected and all required scopes are present.' }
+                Assert-MockCalled -CommandName 'Get-MgUser' -ModuleName GraphAppToolkit -Exactly -Times 1
+                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName GraphAppToolkit -Exactly -Times 1 -Scope It -ParameterFilter { $_ -eq 'Using existing Microsoft Graph session.' }
             }
         }
 
         Context 'When connecting to Exchange Online' {
-
             It 'Should connect to Exchange Online' {
                 $params = @{
                     ExchangeOnline = $true
-                    Confirm        = $false
                 }
+
                 Connect-TkMsService @params
 
-                Assert-MockCalled -CommandName 'Connect-ExchangeOnline' -ModuleName 'ExchangeOnlineManagement' -Times 1
-                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName 'GraphAppToolkit' -Times 1 `
-                    -ParameterFilter { $_ -eq 'Connected to Exchange Online.' }
+                Assert-MockCalled -CommandName 'Connect-ExchangeOnline' -ModuleName GraphAppToolkit -Exactly -Times 1
+                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName GraphAppToolkit -Exactly -Times 1 -Scope It -ParameterFilter { $_ -eq 'Connected to Exchange Online.' }
             }
 
             It 'Should reuse existing Exchange Online session if valid' {
-                # Provide a mock for Get-OrganizationConfig from ExchangeOnlineManagement
-                Mock -CommandName 'Get-OrganizationConfig' -ModuleName 'ExchangeOnlineManagement' -MockWith { @{ Identity = 'TestOrg' } }
+                Mock -CommandName 'Get-OrganizationConfig' -ModuleName GraphAppToolkit -MockWith { }
 
                 $params = @{
                     ExchangeOnline = $true
-                    Confirm        = $false
                 }
+
                 Connect-TkMsService @params
 
-                Assert-MockCalled -CommandName 'Get-OrganizationConfig' -ModuleName 'ExchangeOnlineManagement' -Times 1
-                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName 'GraphAppToolkit' -Times 1 `
-                    -ParameterFilter { $_ -eq 'An active Exchange Online session is detected.' }
+                Assert-MockCalled -CommandName 'Get-OrganizationConfig' -ModuleName GraphAppToolkit -Exactly -Times 1
+                Assert-MockCalled -CommandName 'Write-AuditLog' -ModuleName GraphAppToolkit -Exactly -Times 1 -Scope It -ParameterFilter { $_ -eq 'Using existing Exchange Online session.' }
             }
         }
     }