Skip to content
Open
Changes from all commits
Commits
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
14 changes: 12 additions & 2 deletions src/lib/PnP.Framework/Extensions/ClientContextExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,6 @@ public static ClientContext GetSiteCollectionContext(this ClientRuntimeContext c
/// <returns>True if app-only, false otherwise</returns>
public static bool IsAppOnly(this ClientRuntimeContext clientContext)
{

// Set initial result to false
var result = false;

Expand Down Expand Up @@ -690,7 +689,18 @@ public static string GetAccessToken(this ClientRuntimeContext clientContext)
};
// Issue a dummy request to get it from the Authorization header
clientContext.ExecutingWebRequest += handler;
clientContext.ExecuteQuery();
try
{
clientContext.ExecuteQuery();
}
catch (Exception ex)
{
// This can fail for whatever reason, but if we already have the AccessToken, it doesn't matter
if (String.IsNullOrEmpty(accessToken))
{
throw new AggregateException("Fetching the AccessToken to inspect whether the ClientContext is AppOnly or not failed. There might be more information in the InnerExceptions.", ex);
}
}
clientContext.ExecutingWebRequest -= handler;
}
}
Expand Down
Loading