@@ -24,26 +24,32 @@ function Confirm-TokenState {
2424 [CmdletBinding ()]
2525 param ()
2626
27+ # Refresh the global FabricConfig variable to be backwards compatible
28+ $script :FabricConfig.BaseUrl = Get-PSFConfigValue ' FabricTools.FabricApi.BaseUrl'
29+
2730 Write-Message - Message " Validating token..." - Level Verbose
2831
2932 try {
3033 # Ensure required properties have valid values
31- if ([string ]::IsNullOrWhiteSpace($FabricConfig.TenantId ) -or
32- [string ]::IsNullOrWhiteSpace($FabricConfig.TokenExpiresOn )) {
34+ $tenantId = Get-PSFConfigValue FabricTools.FabricApi.TenantId
35+ $tokenExpiresOn = Get-PSFConfigValue FabricTools.FabricSession.TokenExpiresOn
36+
37+ if ([string ]::IsNullOrWhiteSpace($tenantId ) -or
38+ [string ]::IsNullOrWhiteSpace($tokenExpiresOn )) {
3339 Write-Message - Message " Token details are missing. Please run 'Connect-FabricAccount' to configure the session." - Level Error
3440 throw " MissingTokenDetailsException: Token details are missing."
3541 }
3642
3743 # Convert the TokenExpiresOn value to a DateTime object
38- if ($FabricConfig .TokenExpiresOn. GetType () -eq [datetimeoffset ]) {
39- $tokenExpiryDate = $FabricConfig .TokenExpiresOn
44+ if ($tokenExpiresOn . GetType () -eq [DateTimeOffset ]) {
45+ $tokenExpiryDate = $tokenExpiresOn
4046 } else {
41- $tokenExpiryDate = [datetimeoffset ]::Parse($FabricConfig .TokenExpiresOn )
47+ $tokenExpiryDate = [DateTimeOffset ]::Parse($tokenExpiresOn )
4248 }
4349
4450 # Check if the token is expired
45- if ($tokenExpiryDate -le [datetimeoffset ]::Now) {
46- if ($FabricConfig .FeatureFlags.EnableTokenRefresh ) {
51+ if ($tokenExpiryDate -le [DateTimeOffset ]::Now) {
52+ if (Get-PSFConfigValue - FullName ' FabricTools .FeatureFlags.EnableTokenRefresh' ) {
4753 Write-Message - Message " Token has expired. Attempting to refresh the token..." - Level Warning
4854 Connect-FabricAccount - reset
4955 } else {
0 commit comments