FreeBusyChecker Final Version

Diagnostics/FreeBusyChecker/FreeBusyChecker.ps1

@@ -97,7 +97,11 @@ param(
     [Parameter(Mandatory = $false, ParameterSetName = "Test")]
     [string]$OnPremEWSUrl,
     [Parameter(Mandatory = $false, ParameterSetName = "Test")]
-    [string]$OnPremLocalDomain
+    [string]$OnPremLocalDomain,
+    [Parameter(Mandatory = $true, ParameterSetName = "ScriptUpdateOnly", HelpMessage = "Update only script.")]
+    [switch]$ScriptUpdateOnly,
+    [Parameter(Mandatory = $false, ParameterSetName = "SkipVersionCheck", HelpMessage = "Skip version check.")]
+    [switch]$SkipVersionCheck
 )
 begin {
     . $PSScriptRoot\Functions\OnPremDAuthFunctions.ps1
@@ -107,14 +111,15 @@ begin {
     . $PSScriptRoot\Functions\htmlContent.ps1
     . $PSScriptRoot\Functions\hostOutput.ps1
     . $PSScriptRoot\Functions\CommonFunctions.ps1
+    . $PSScriptRoot\..\..\Shared\Confirm-ExchangeShell.ps1
+    . $PSScriptRoot\..\..\Shared\ScriptUpdateFunctions\GenericScriptUpdate.ps1
 } end {
     $Script:countOrgRelIssues = (0)
     $Script:WebServicesVirtualDirectory = $null
     $Script:Server = hostname
     $Script:startingDate = (Get-Date -Format yyyyMMdd_HHmmss)
     $Script:htmlFile = "$PSScriptRoot\FBCheckerOutput_$($Script:startingDate).html"
 
-    CheckIfExchangeServer($Script:Server)
     loadingParameters
     #Parameter input
 
@@ -147,14 +152,9 @@ begin {
     $Script:ExchangeOnPremDomain = ($Script:UserOnPrem -split "@")[1]
 
     if (-not $OnPremEWSUrl) {
-
-        $EWSVirtualDirectory = Get-WebServicesVirtualDirectory -server $Script:Server -ErrorAction SilentlyContinue
-        if ($EWSVirtualDirectory.externalURL.AbsoluteUri.Count -gt 1) {
-            $Script:ExchangeOnPremEWS = ($EWSVirtualDirectory.externalURL.AbsoluteUri)[0]
-        } else {
-            $Script:ExchangeOnPremEWS = ($EWSVirtualDirectory.externalURL.AbsoluteUri)
-        }
+        FetchEWSInformation
     } else {
+        FetchEWSInformation
         $Script:ExchangeOnPremEWS = ($OnPremEWSUrl)
     }
 
@@ -182,13 +182,13 @@ begin {
         exit
     }
     #region Show Parameters
-    $Script:IntraOrgCon = Get-IntraOrganizationConnector -WarningAction SilentlyContinue -ErrorAction SilentlyContinue | Select-Object Name, TarGetAddressDomains, DiscoveryEndpoint, Enabled
+    $Script:IntraOrgCon = Get-IntraOrganizationConnector -WarningAction SilentlyContinue -ErrorAction SilentlyContinue | Where-Object { $_.TargetAddressDomains -contains $Script:ExchangeOnlineDomain } | Select-Object Name, TarGetAddressDomains, DiscoveryEndpoint, Enabled
     ShowParameters
     CheckParameters
-    if ($Script:IntraOrgCon.enabled -like "True") {
+    if ($Script:IntraOrgCon.enabled -eq $true) {
         $Auth = hostOutputIntraOrgConEnabled($Auth)
     }
-    if ($Script:IntraOrgCon.enabled -like "False") {
+    if ($Script:IntraOrgCon.enabled -eq $false) {
         hostOutputIntraOrgConNotEnabled
     }
     # Free busy Lookup methods
@@ -249,7 +249,6 @@ begin {
         if (-not ($Exo)) {
             Write-Host -ForegroundColor Red "`n Please connect to Exchange Online Using the EXO V3 module using EO as connection Prefix to collect Exchange OnLine Free Busy configuration Information."
             Write-Host -ForegroundColor Cyan "`n`n   Example: PS C:\Connect-ExchangeOnline -Prefix EO"
-            Write-Host -ForegroundColor Cyan "`n   Example: PS C:\Connect-ExchangeOnline -Prefix EO -Org ExchangeOnline"
             Write-Host -ForegroundColor Yellow "`n   More Info at:https://learn.microsoft.com/en-us/powershell/exchange/exchange-online-powershell-v2?view=exchange-ps"
             exit
         }

Diagnostics/FreeBusyChecker/Functions/CommonFunctions.ps1

@@ -4,7 +4,7 @@ function Test-ExchangeOnlineConnection {
     Write-Host -ForegroundColor Green " Checking Exchange Online Configuration"
     Write-Host " Testing Connection to Exchange Online with EO Prefix."
     try {
-        $CheckExoMailbox = get-EOMailbox $Script:UserOnline -ErrorAction Stop
+        $CheckExoMailbox = Get-EOMailbox $Script:UserOnline -ErrorAction Stop
         if ($null -ne $CheckExoMailbox) {
             return $true
         } else {
@@ -24,14 +24,12 @@ function FetchEWSInformation {
     if (-not $Script:WebServicesVirtualDirectory -or -not $Script:WebServicesVirtualDirectoryOAuth) {
         $Script:WebServicesVirtualDirectory = Get-WebServicesVirtualDirectory -Server $Script:Server | Select-Object Identity, Name, ExchangeVersion, *Authentication*, *url -ErrorAction SilentlyContinue
         $Script:WebServicesVirtualDirectoryOAuth = $Script:WebServicesVirtualDirectory
+        $Script:ExchangeOnPremEWS = ($Script:WebServicesVirtualDirectory.externalURL.AbsoluteUri)
     }
 }
 function CheckIfExchangeServer {
-    param (
-        [string]$Server
-    )
-    $exchangeServer = Get-ExchangeServer $Server -ErrorAction SilentlyContinue
-    if (!$exchangeServer) {
+    $exchangeShell = Confirm-ExchangeShell
+    if (-not($exchangeShell.ShellLoaded)) {
         Write-Host "$Server is not an Exchange Server. This script should be run in Exchange Server Management Shell"
         exit
     }

Diagnostics/FreeBusyChecker/Functions/OnPremDAuthFunctions.ps1

@@ -428,7 +428,6 @@ function AutoDVirtualDCheck {
 function EWSVirtualDirectoryCheck {
     Write-Host -ForegroundColor Green " Get-WebServicesVirtualDirectory -Server $($server)| Select Identity,Name,ExchangeVersion,*Authentication*,*url"
     PrintDynamicWidthLine
-    FetchEWSInformation
     $Script:WebServicesVirtualDirectory
     PrintDynamicWidthLine
     Write-Host -ForegroundColor Green " Summary - Get-WebServicesVirtualDirectory"

Diagnostics/FreeBusyChecker/Functions/OnPremOAuthFunctions.ps1

@@ -541,7 +541,6 @@ function AutoDVirtualDCheckOauth {
 function EWSVirtualDirectoryCheckOAuth {
     Write-Host -ForegroundColor Green " Get-WebServicesVirtualDirectory  -Server $($server)| Select Identity,Name,ExchangeVersion,*Authentication*,*url"
     PrintDynamicWidthLine
-    FetchEWSInformation
     $W = $WebServicesVirtualDirectoryOAuth | Format-List
     $W
     EWSVirtualDirectoryCheckOAuthHtmlHead
@@ -624,7 +623,6 @@ function EWSVirtualDirectoryCheckOAuth {
         }
         Write-Host -ForegroundColor White "  Should be True"
     }
-    #PrintDynamicWidthLine
     Write-Host -ForegroundColor White "`n  WindowsAuthentication:"
     if ($WebServicesVirtualDirectoryOauth.WindowsAuthentication -eq "True") {
         foreach ( $ser in $WebServicesVirtualDirectoryOauth) {

docs/Diagnostics/FreeBusyChecker/FreeBusyChecker.md

@@ -12,6 +12,11 @@ To Provide Feedback about this tool: [Feedback Form](https://forms.office.com/pa
 
 Use: Collects OAuth and DAuth Hybrid Availability Configuration Settings Both for Exchange On Premises and Exchange Online if connected to Exchange Online using -Prefix EO before executing this script (see Usage bellow).
 
+How To Run:
+
+This script must be run as Administrator in Exchange Management Shell on an Exchange Server. You can provide no parameters, and the script will just run against Exchange On-Premises and Exchange Online to query for OAuth and DAuth configuration settings. It will compare existing values with standard values and provide details of what may not be correct.
+Please take note that though this script may output that a specific setting is not a standard setting, it does not mean that your configurations are incorrect. For example, DNS may be configured with specific mappings that this script cannot evaluate.
+
 Example Screen Output:
 
 ![image](./image1.png)
@@ -40,17 +45,6 @@ Please make sure that the account used is a member of the Local Administrator gr
 
 Other Pre Requisites:
 
-AD management Tools:
-
-If not available, they can be installed with the following command:
-
-```powershell
-  Install-WindowsFeature -name AD-Domain-Services -IncludeManagementTools
-```
-Imports and Installs the following Modules (if not available):
-
-PSSnapin: microsoft.exchange.management.powershell.snapin
-
 Module  : ActiveDirectory Module
 Module  : ExchangeOnlineManagement Module