Skip to content

Cleanup of some PSScriptAnalyzer warnings, unapproved verbs, and module management #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JefTek wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Cleanup of some PSScriptAnalyzer warnings, unapproved verbs, and module management #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ab1a2a
Added Manfiest file for PSGallery
JefTek May 16, 2018
577d6fe
Updated Manfiest with Disclaimer, removed export-function in PSM1, an…
JefTek May 16, 2018
2df4c23
Removed Import-Module on install
JefTek May 24, 2018
d1347d1
Renamed Decode-JWT to ConvertFrom-RawToken to adhere to approved verbs
JefTek May 24, 2018
906c287
Renamed unapproved verb for internal cmdlets
JefTek May 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added MSCloudIdUtils/MSCloudIdUtils.psd1
View file
Open in desktop
Binary file not shown.
68 changes: 24 additions & 44 deletions MSCloudIdUtils/MSCloudIdUtils.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ function Initialize-ActiveDirectoryAuthenticationLibrary()
{
Write-Host "Fixing Active Directory Authentication Library package directories ..." -ForegroundColor Yellow
$adalPackageDirectories | Remove-Item -Recurse -Force | Out-Null
Write-Host "Not able to load ADAL assembly. Delete the Nugets folder under" $modulePath ", restart PowerShell session and try again ..."
Write-Host ("Not able to load ADAL assembly. Delete the Nugets folder under {0}, restart PowerShell session and try again ..." -f $modulePath)
return $false
}
}
Expand Down Expand Up @@ -301,7 +301,7 @@ Function Get-MSCloudIdGraphAPIAccessTokenFromAppKey
$body = @{grant_type="client_credentials";resource="https://graph.microsoft.com";client_id=$ClientID;client_secret=$ClientSecret}
$oauth = Invoke-RestMethod -Method Post -Uri $loginURL/$TenantDomain/oauth2/token?api-version=1.0 -Body $body

if ($oauth.access_token -eq $null)
if ($null -eq $oauth.access_token)
{
throw "ERROR: No Access Token"
}
Expand Down Expand Up @@ -540,7 +540,7 @@ Function Invoke-MSCloudIdAzureADGraphQuery
while (-not [String]::IsNullOrEmpty($queryUrl))
{
$batchResult = (Invoke-WebRequest -Headers $headerParams -Uri $queryUrl).Content | ConvertFrom-Json
if ($batchResult.value -ne $null)
if ($null -ne $batchResult.value)
{
$queryResults += $batchResult.value
}
Expand All @@ -554,14 +554,14 @@ Function Invoke-MSCloudIdAzureADGraphQuery

$odataNextLink = $batchResult | Select-Object -ExpandProperty "@odata.nextLink" -ErrorAction SilentlyContinue

if ($odataNextLink -ne $null)
if ($null -ne $odataNextLink)
{
$queryUrl = $odataNextLink
}
else
{
$odataNextLink = $batchResult | Select-Object -ExpandProperty "odata.nextLink" -ErrorAction SilentlyContinue
if ($odataNextLink -ne $null)
if ($null -ne $odataNextLink)
{
$absoluteUri = [Uri]"https://bogus/$odataNextLink"
$skipToken = $absoluteUri.Query.TrimStart("?")
Expand Down Expand Up @@ -621,7 +621,7 @@ Function Invoke-MSCloudIdMSGraphQuery
while (-not [String]::IsNullOrEmpty($queryUrl))
{
$batchResult = (Invoke-WebRequest -Headers $headerParams -Uri $queryUrl).Content | ConvertFrom-Json
if ($batchResult.value -ne $null)
if ($null -ne $batchResult.value)
{
$queryResults += $batchResult.value
}
Expand All @@ -635,14 +635,14 @@ Function Invoke-MSCloudIdMSGraphQuery

$odataNextLink = $batchResult | Select-Object -ExpandProperty "@odata.nextLink" -ErrorAction SilentlyContinue

if ($odataNextLink -ne $null)
if ($null -ne $odataNextLink)
{
$queryUrl = $odataNextLink
}
else
{
$odataNextLink = $batchResult | Select-Object -ExpandProperty "odata.nextLink" -ErrorAction SilentlyContinue
if ($odataNextLink -ne $null)
if ($null -ne $odataNextLink)
{
$absoluteUri = [Uri]"https://bogus/$odataNextLink"
$skipToken = $absoluteUri.Query.TrimStart("?")
Expand Down Expand Up @@ -726,7 +726,9 @@ $script:TenantSkus = $null

Function Get-AzureADTenantSkus
{
if ($script:TenantSkus -eq $null)
[CmdletBinding()]
param()
if ($null -eq $script:TenantSkus)
{
$script:TenantSkus = Get-AzureADSubscribedSku
}
Expand Down Expand Up @@ -762,7 +764,7 @@ Function Get-MSCloudIdUserLastSigninDateTime
#If we had at least one result, then get-member will retrieve the property metadata
$atLeastOneSignIn = $signInActivity | Get-Member userId

if ($atLeastOneSignIn -eq $null)
if ($null -eq $atLeastOneSignIn)
{
Write-Output $null
}
Expand Down Expand Up @@ -800,22 +802,22 @@ Function Get-MSCloudIdAppStaleLicensingReportByUser

$skuString = ""

if ($userSkus -ne $null)
if ($Null -ne $userSkus)
{

$skuString = ""

foreach ($userSku in $userSkus)
{
$skuName = $TenantSKUs | where {$_.SkuId -eq $userSku.SkuId} | Select-Object -ExpandProperty SkuPartNumber
$skuName = $TenantSKUs | Where-Object {$_.SkuId -eq $userSku.SkuId} | Select-Object -ExpandProperty SkuPartNumber
$skuString += $skuName + ";"

}
}

$signinStaleStatus = $null

if ($LastSignIn -eq $null)
if ($null -eq $LastSignIn)
{
$signinStaleStatus = "Stale"
}
Expand Down Expand Up @@ -1040,9 +1042,9 @@ Function Remove-MSCloudIdSyncUsers
Write-Progress -Id 10 -Activity "Removing On-Premises users from your tenant..." -CurrentOperation "Connecting to Azure AD"
Connect-MsolService
Write-Progress -Id 10 -Activity "Removing On-Premises users from your tenant..." -CurrentOperation "Removing users the cloud"
$UsersToRemove = Get-MsolUser -Synchronized | Where {$_.UserPrincipalName -notlike "Sync*"}
$UsersToRemove | %{Remove-MsolUser -ObjectId $_.ObjectId -Force }
Get-MsolUser -ReturnDeletedUsers | %{ Remove-MsolUser -ObjectId $_.ObjectId -RemoveFromRecycleBin -Force }
$UsersToRemove = Get-MsolUser -Synchronized | Where-Object {$_.UserPrincipalName -notlike "Sync*"}
$UsersToRemove | ForEach-Object {Remove-MsolUser -ObjectId $_.ObjectId -Force }
Get-MsolUser -ReturnDeletedUsers | ForEach-Object { Remove-MsolUser -ObjectId $_.ObjectId -RemoveFromRecycleBin -Force }
$UsersCount = $UsersToRemove | Measure-Object | Select-Object -ExpandProperty Count
"$UsersCount have been deleted from the tenant. To Resynchronize, clean the Azure AD Connect connector spaces and force an Initial Sync Cycle"
}
Expand Down Expand Up @@ -1167,7 +1169,7 @@ function Convert-FromBase64StringWithNoPadding([string]$data)
return [System.Convert]::FromBase64String($data)
}

function Decode-JWT([string]$rawToken)
function ConvertFrom-RawToken([string]$rawToken)
{
$parts = $rawToken.Split('.');
$headers = [System.Text.Encoding]::UTF8.GetString((Convert-FromBase64StringWithNoPadding $parts[0]))
Expand Down Expand Up @@ -1209,13 +1211,13 @@ function ConvertFrom-MSCloudIDJWT
if ($Recurse)
{
$decoded = [System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Token))
$DecodedJwt = Decode-JWT -rawToken $decoded
$DecodedJwt = ConvertFrom-RawToken -rawToken $decoded
}
else
{
$DecodedJwt = Decode-JWT -rawToken $Token
$DecodedJwt = ConvertFrom-RawToken -rawToken $Token
}
Write-Host ($DecodedJwt | Select headers,claims | ConvertTo-Json)
Write-Host ($DecodedJwt | Select-Object headers,claims | ConvertTo-Json)
return $DecodedJwt
}

Expand All @@ -1237,7 +1239,7 @@ function Install-MSCloudIdUtilsModule
param()

$myDocumentsModuleFolderIsInPSModulePath = $false
[Environment]::GetEnvironmentVariable("PSModulePath") -Split ';' | % {
[Environment]::GetEnvironmentVariable("PSModulePath") -Split ';' | ForEach-Object {
if ($_.ToLower() -eq ([Environment]::GetFolderPath("MyDocuments") + "\WindowsPowerShell\Modules").ToLower()){
$myDocumentsModuleFolderIsInPSModulePath = $true
}
Expand Down Expand Up @@ -1287,29 +1289,7 @@ function Install-MSCloudIdUtilsModule

}

Copy-Item "$PSScriptRoot\MSCloudIdUtils.psm1" -Destination $modulePath -Force

Import-Module MSCloudIdUtils

Get-Command -Module MSCloudIdUtils

}

Export-ModuleMember Install-MSCloudIdUtilsModule
Export-ModuleMember New-MSCloudIdApplicationCertificateCredential
Export-ModuleMember New-MSCloudIdServicePrincipalSigningCertificate
Export-ModuleMember Get-MSCloudIdGraphAPIAccessTokenFromAppKey
Export-ModuleMember Get-MSCloudIdAzureADGraphAccessTokenFromUser
Export-ModuleMember Get-MSCloudIdAzureADGraphAccessTokenFromCert
Export-ModuleMember Invoke-MSCloudIdAzureADGraphQuery
Export-ModuleMember Get-MSCloudIdMSGraphAccessTokenFromCert
Export-ModuleMember Invoke-MSCloudIdMSGraphQuery
Export-ModuleMember Get-MSCloudIdAppAssignmentReport
Export-ModuleMember Remove-MSCloudIdSyncUsers
Export-ModuleMember Get-MSCloudIdApplicationKeyExpirationReport
Export-ModuleMember Get-MSCloudIdAppStaleLicensingReport
Export-ModuleMember Get-MSCloudIdAccessTokenFromUser
Export-ModuleMember Get-MSCloudIdAccessTokenOnBehalfOfUser
Export-ModuleMember Get-MSCloudIdAppStaleLicensingReportByUser
Export-ModuleMember Get-MSCloudIdUserLastSigninDateTime
Export-ModuleMember Get-MSCloudIdIdTokenFromUser
Export-ModuleMember ConvertFrom-MSCloudIDJWT