cqrenet/macOS_IntuneManagement
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

3.6.0

Browse Source
This commit is contained in:
Mikael Karlsson
2022-06-29 22:56:52 +10:00
parent 4571341763
commit a60b83ede9
44 changed files with 7756 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Extensions/MSALAuthentication.psm1
View File

@@ -10,7 +10,7 @@ This module manages Authentication for the application with MSAL. It is also res
#>
function Get-ModuleVersion
{
'3.5.0'
'3.6.0'
}
$global:msalAuthenticator = $null
@@ -122,8 +122,6 @@ function Invoke-InitializeModule
}) "MSAL"
Add-MSALPrereq
#$script:MSALDLLMissing = $true #!!!!
}
function Get-MSALAuthenticationObject
@@ -569,11 +567,11 @@ function Connect-MSALClientApp
if($secret)
{
$ClientApplicationBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId).WithClientSecret($ClientSecret).WithAuthority([URI]::new($authority)) #.WithRedirectUri($redirectUri)
$ClientApplicationBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId).WithClientSecret($secret).WithAuthority([URI]::new($authority)) #.WithRedirectUri($redirectUri)
}
elseif($Certificate)
{
$ClientApplicationBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId).WithCertificate($ClientSecret).WithAuthority([URI]::new($authority)) #.WithRedirectUri($redirectUri)
$ClientApplicationBuilder = [Microsoft.Identity.Client.ConfidentialClientApplicationBuilder]::Create($clientId).WithCertificate($Certificate).WithAuthority([URI]::new($authority)) #.WithRedirectUri($redirectUri)
}
else
{
@@ -750,9 +748,6 @@ function Connect-MSALUser
$Tenant
)
# No login during first time the app is started
if($global:FirstTimeRunning -and $global:MainAppStarted -eq $false) { return }
if($global:hideUI -eq $true)
{
if($global:AzureAppId -and $global:ClientSecret -and $global:TenantId)
@@ -771,6 +766,9 @@ function Connect-MSALUser
return
}
# No login during first time the app is started
if($global:FirstTimeRunning -and $global:MainAppStarted -eq $false) { return }
Write-LogDebug "Authenticate"
if($ShowMenu -eq $true -and ((Get-SettingValue "AzureADLoginMenu") -eq $true))
@@ -1336,7 +1334,7 @@ function Disconnect-MSALUser
}
else
{
$msg = "Are you sure you want to forget user $($user.UserName)?" #!!!
$msg = "Are you sure you want to forget user $($user.UserName)?"
$title = "Forget user?"
}
@@ -1790,7 +1788,7 @@ function local:Add-CachedUser
Write-Status "Logging in with $($this.Tag.UserName)"
Hide-Popup
Clear-MSALCurentUserVaiables
Connect-MSALUser -Account $this.Tag #!!!.UserName
Connect-MSALUser -Account $this.Tag
if($global:curObjectType)
{