Unified global variables & usage of Confirm-FabricAuthToken everywhere

Author: NowinskiK

FabricTools/FabricTools.psm1

@@ -23,8 +23,7 @@
 #>
 
 $script:FabricSession = [ordered]@{
-   BaseFabricUrl       = 'https://api.fabric.microsoft.com'
-   ApiUrl              = 'https://api.fabric.microsoft.com/v1'
+   BaseApiUrl          = 'https://api.fabric.microsoft.com/v1'
    FabricToken         = $null
    HeaderParams        = $null
    ContentType         = @{'Content-Type' = "application/json"}
@@ -33,12 +32,16 @@ $script:FabricSession = [ordered]@{
 }
 
 $script:AzureSession = [ordered]@{
-   BaseUrl             = "https://management.azure.com"
+   BaseApiUrl          = "https://management.azure.com"
    AccessToken         = $null
    Token               = $null
    HeaderParams        = $null
 }
 
+$script:PowerBI = [ordered]@{
+   BaseApiUrl          = "https://api.powerbi.com/v1.0/myorg"
+}
+
 # Get all .ps1 files in the (public) Functions folder
 $functions = Get-ChildItem -Path "$PSScriptRoot\public" -Filter *.ps1
 

FabricTools/public/Add-FabricWorkspaceRoleAssignment.ps1

@@ -71,7 +71,7 @@ begin {
             -Depth 1
 
     # Create Workspace API URL
-    $workspaceApiUrl = "$($FabricSession.BaseFabricUrl)/v1/admin/workspaces/$WorkspaceId/roleassignments"
+    $workspaceApiUrl = "$($FabricSession.BaseApiUrl)/admin/workspaces/$WorkspaceId/roleassignments"
 }
 
 process {

FabricTools/public/Confirm-FabricAuthToken.ps1

@@ -24,6 +24,8 @@ function Confirm-FabricAuthToken {
    [CmdletBinding()]
    param  (   )
 
+   Write-Verbose "Check if session is established and token not expired."
+
    # Check if the Fabric token is already set
    if (!$FabricSession.FabricToken -or !$AzureSession.AccessToken) {
       Write-Output "Confirm-FabricAuthToken::Set-FabricAuthToken"
@@ -32,7 +34,7 @@ function Confirm-FabricAuthToken {
 
    $now = (Get-Date)
    $s = Get-FabricDebugInfo
-   if ($s.FabricSession.AccessToken.ExpiresOn -lt $now ) {
+   if ($FabricSession.AccessToken.ExpiresOn -lt $now ) {
       Write-Output "Confirm-FabricAuthToken::Set-FabricAuthToken#1"
       Set-FabricAuthToken -reset | Out-Null
    }

FabricTools/public/Connect-FabricAccount.ps1

@@ -39,12 +39,10 @@ begin {
 
 process {
     Write-Verbose "Connect to Azure Account"
-    Connect-AzAccount `
-            -TenantId $TenantId | `
-                Out-Null
+    Connect-AzAccount -TenantId $TenantId | Out-Null
 
     Write-Verbose "Get authentication token"
-    $FabricSession.FabricToken = (Get-AzAccessToken -ResourceUrl $FabricSession.BaseFabricUrl).Token
+    $FabricSession.FabricToken = (Get-AzAccessToken -ResourceUrl $FabricSession.BaseApiUrl).Token
     Write-Verbose "Token: $($FabricSession.FabricToken)"
 
     Write-Verbose "Setup headers for API calls"

FabricTools/public/Get-AllFabricDatasetRefreshes.ps1

@@ -19,6 +19,8 @@ function Get-AllFabricDatasetRefreshes {
     # Define aliases for the function for flexibility.
     [Alias("Get-AllFabDatasetRefreshes")]
 
+    Confirm-FabricAuthToken | Out-Null
+
     # Retrieve all PowerBI workspaces.
     $wsps = Get-FabricWorkspace
     # Initialize an array to store the refreshes.

FabricTools/public/Get-FabricAPIClusterURI.ps1

@@ -24,10 +24,10 @@ function Get-FabricAPIclusterURI  {
     Param (
     )
 
-    $s = Confirm-FabricAuthToken
+    Confirm-FabricAuthToken | Out-Null
 
     # Make a GET request to the PowerBI API to retrieve the datasets.
-    $reply = Invoke-RestMethod -uri "https://api.powerbi.com/v1.0/myorg/datasets" -Headers $s.FabricSession.HeaderParams -Method GET
+    $reply = Invoke-RestMethod -uri "$($PowerBI.BaseApiUrl)/datasets" -Headers $FabricSession.HeaderParams -Method GET
 
     # Extract the '@odata.context' property from the response.
     $unaltered = $reply.'@odata.context'

FabricTools/public/Get-FabricCapacityRefreshables.ps1

@@ -28,9 +28,9 @@ function Get-FabricCapacityRefreshables  {
         [string]$top = 5
     )
 
-    $s = Confirm-FabricAuthToken
+    Confirm-FabricAuthToken | Out-Null
 
     # Make a GET request to the PowerBI API to retrieve the top refreshable capacities.
     # The function returns the 'value' property of the response.
-    return (Invoke-RestMethod -uri "https://api.powerbi.com/v1.0/myorg/capacities/refreshables?`$top=$top" -Headers $s.FabricSession.HeaderParams -Method GET).value
+    return (Invoke-RestMethod -uri "$($PowerBI.BaseApiUrl)/capacities/refreshables?`$top=$top" -Headers $FabricSession.HeaderParams -Method GET).value
 }

FabricTools/public/Get-FabricCapacitySkus.ps1

@@ -29,7 +29,7 @@ function Get-FabricCapacitySkus  {
     Confirm-FabricAuthToken | Out-Null
 
     #GET https://management.azure.com/subscriptions/548B7FB7-3B2A-4F46-BB02-66473F1FC22C/resourceGroups/TestRG/providers/Microsoft.Fabric/capacities/azsdktest/skus?api-version=2023-11-01
-    $uri = "$($AzureSession.BaseUrl)/subscriptions/$subscriptionID/resourceGroups/$ResourceGroupName/providers/Microsoft.Fabric/capacities/$capacity/skus?api-version=2023-11-01"
+    $uri = "$($AzureSession.BaseApiUrl)/subscriptions/$subscriptionID/resourceGroups/$ResourceGroupName/providers/Microsoft.Fabric/capacities/$capacity/skus?api-version=2023-11-01"
     $result = Invoke-RestMethod -Headers $AzureSession.HeaderParams -Uri $uri -Method GET
 
     return $result.value

FabricTools/public/Get-FabricCapacityState.ps1

@@ -41,7 +41,7 @@ function Get-FabricCapacityState {
     Confirm-FabricAuthToken | Out-Null
 
     # Define the URL for the GET request.
-    $getCapacityState = "$($AzureSession.BaseUrl)/subscriptions/$subscriptionID/resourceGroups/$resourcegroup/providers/Microsoft.Fabric/capacities/$capacity/?api-version=2022-07-01-preview"
+    $getCapacityState = "$($AzureSession.BaseApiUrl)/subscriptions/$subscriptionID/resourceGroups/$resourcegroup/providers/Microsoft.Fabric/capacities/$capacity/?api-version=2022-07-01-preview"
 
     # Make the GET request and return the response.
     return Invoke-RestMethod -Method GET -Uri $getCapacityState -Headers $script:AzureSession.HeaderParams -ErrorAction Stop

FabricTools/public/Get-FabricCapacityTenantOverrides.ps1

@@ -25,9 +25,9 @@ function Get-FabricCapacityTenantOverrides  {
     Param (
     )
 
-    $s = Confirm-FabricAuthToken
+    Confirm-FabricAuthToken | Out-Null
 
     # Make a GET request to the Fabric API to retrieve the tenant overrides for all capacities.
     # The function returns the response of the GET request.
-    return Invoke-RestMethod -uri "$($FabricSession.ApiUrl)/admin/capacities/delegatedTenantSettingOverrides" -Headers $s.FabricSession.HeaderParams -Method GET
+    return Invoke-RestMethod -uri "$($FabricSession.BaseApiUrl)/admin/capacities/delegatedTenantSettingOverrides" -Headers $FabricSession.HeaderParams -Method GET
 }