Invoke-FabricRestMethod can execute PowerBI API when needed

Fixed Get-FabricWorkspaceUsers function

Author: NowinskiK

helper/GetFunctionList.ps1

@@ -1,12 +1,25 @@
-$path = ".\FabricTools\public"
+$path = ".\source\public"
 $op = Get-ChildItem -Path $path -Recurse -Filter *.ps1 | Select-Object -ExpandProperty Name | Sort-Object
 #$op = $op | ForEach-Object { "        ""$_""," }
 $op | Out-File '.\Output\FunctionList-main-public.txt'
 
-$path = ".\FabricTools\tiago\public"
-$tp = Get-ChildItem -Path $path -Recurse -Filter *.ps1 | Select-Object -ExpandProperty Name | Sort-Object
-$tp | Out-File '.\Output\FunctionList-tiago-public.txt'
+# Author Table
+# This script generates a table of PowerShell script authors from the specified directory.
+$authorTable = @{}
+$op | ForEach-Object {
+    $file = $_.FullName
+    $name = $_.Name
+    $content = Get-Content $file
+    $authorLine = $content | Where-Object { $_ -match 'Author:\s*(.+)' } | Select-Object -First 1
+    if ($authorLine -match 'Author:\s*(.+)') {
+        $author = $matches[1].Trim()
+        $authorTable[$name] = $author
+    } else {
+        $authorTable[$name] = $null
+    }
+}
+$authorTable
 
-$common = Compare-Object -ReferenceObject $op -DifferenceObject $tp -IncludeEqual -ExcludeDifferent | Select-Object -ExpandProperty InputObject
-$common
-$common | Out-File '.\Output\FunctionList-public-collision.txt'
+## Not a singular name option for functions (#26)
+Get-Command -Module FabricTools |where Name -like '*s'
+Get-Command -Module FabricTools|ForEach-Object { $name = $_.Name; $_.Parameters.Values | Where Name -like '*s' | Select @{N='FunctionName';E={$Name}},Name}

source/Public/Invoke-FabricRestMethod.ps1

@@ -19,6 +19,9 @@ Function Invoke-FabricRestMethod {
 .PARAMETER TestTokenExpired
     A switch parameter to test if the Fabric token is expired before making the request. If the token is expired, it will attempt to refresh it.
 
+.PARAMETER PowerBIApi
+    A switch parameter to indicate that the request should be sent to the Power BI API instead of the Fabric API.
+
 .EXAMPLE
     Invoke-FabricRestMethod -uri "/api/resource" -method "GET"
 
@@ -47,17 +50,27 @@ Function Invoke-FabricRestMethod {
         [Parameter(Mandatory = $false)]
         $Body,
 
-        [switch] $TestTokenExpired
+        [switch] $TestTokenExpired,
+
+        [switch] $PowerBIApi
     )
 
     if ($TestTokenExpired) {
         Test-TokenExpired
     }
 
+    $baseUrl = $FabricConfig.BaseUrl
+    if ($PowerBIApi) {
+        $baseUrl = $PowerBI.BaseApiUrl
+    }
+
     if ($Uri -notmatch '^https?://.*') {
-        $Uri = "{0}/{1}" -f $FabricConfig.BaseUrl, $Uri
+        $Uri = "{0}/{1}" -f $baseUrl, $Uri
+        if ($PowerBIApi) {
+            Write-Message -Message "PowerBIApi param is ignored when full Uri is provided." -Level Warning
+        }
     }
-    Write-Message -Message "Fabric API Endpoint: $Uri" -Level Verbose
+    Write-Message -Message "Target API Endpoint: $Uri" -Level Verbose
 
     if ($Body -is [hashtable]) {
         $Body = $Body | ConvertTo-Json -Depth 10

source/Public/Workspace/Get-FabricWorkspaceUsers.ps1

@@ -44,14 +44,14 @@ The function defines parameters for the workspace ID and workspace object. If th
     }
 
     process {
-        # If the parameter set name is 'WorkspaceId', retrieve the workspace object.
-        if ($PSCmdlet.ParameterSetName -eq 'WorkspaceId') {
-            $workspace = Get-PowerBIWorkspace -Id $WorkspaceId
+        # If the parameter set name is 'WorkspaceObject', retrieve the workspace object.
+        if ($PSCmdlet.ParameterSetName -eq 'WorkspaceObject') {
+            $WorkspaceId = $Workspace.id
         }
 
         # Make a GET request to the PowerBI API to retrieve the users of the workspace.
         # The function returns the 'value' property of the response, which contains the users.
-        return (Invoke-FabricRestMethod -Method get -uri ("groups/$($workspace.Id)/users") | ConvertFrom-Json).value
+        return (Invoke-FabricRestMethod -Method get -PowerBIApi -uri ("groups/$WorkspaceId/users")).value
     }
 
 }