tsai
/
openiddict-core
mirror of https://github.com/openiddict/openiddict-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Attach an IASWebAuthenticationPresentationContextProviding object on Mac Catalyst and macOS

pull/2509/head
Kévin Chalet 2 months ago
parent
b9f793cc14
commit
04409f5b6d
3 changed files with 18 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
  2. 24
      src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
  3. 4
      src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs

24
src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Authentication.cs
View File

@ -91,9 +91,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
[SupportedOSPlatform("ios12.0")] [SupportedOSPlatform("ios12.0")]
[SupportedOSPlatform("maccatalyst13.1")] [SupportedOSPlatform("maccatalyst13.1")]
[SupportedOSPlatform("macos10.15")] [SupportedOSPlatform("macos10.15")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context) public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);
@ -127,16 +125,16 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
using var session = CreateASWebAuthenticationSession(); using var session = CreateASWebAuthenticationSession();
// On iOS 13.0 and higher, a presentation context provider returning the UI window to // Note: a presentation context provider returning the UI window to which the Safari
// which the Safari web view will be attached MUST be provided (otherwise, a code 2 // web view will be attached MUST be provided (otherwise, a code 2 error is returned
// error is returned by ASWebAuthenticationSession). To avoid that, a default provider // by ASWebAuthenticationSession). To avoid that, a default provider pointing to the
// pointing to the current UI window is automatically attached on iOS 13.0 and higher. // current UI window is automatically attached to the ASWebAuthenticationSession object.
if (OperatingSystem.IsIOSVersionAtLeast(13)) if (OperatingSystem.IsIOSVersionAtLeast(13) ||
OperatingSystem.IsMacCatalystVersionAtLeast(13) ||
OperatingSystem.IsMacOSVersionAtLeast(10, 15))
{ {
#pragma warning disable CA1416
session.PresentationContextProvider = new ASWebAuthenticationPresentationContext( session.PresentationContextProvider = new ASWebAuthenticationPresentationContext(
GetCurrentUIWindow() ?? throw new InvalidOperationException(SR.GetResourceString(SR.ID0447))); GetCurrentUIWindow() ?? throw new InvalidOperationException(SR.GetResourceString(SR.ID0447)));
#pragma warning restore CA1416
} }
using var registration = context.CancellationToken.Register( using var registration = context.CancellationToken.Register(
@ -226,11 +224,11 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
return new ASWebAuthenticationSession(CreateUrl(), uri.Scheme, HandleCallback); return new ASWebAuthenticationSession(CreateUrl(), uri.Scheme, HandleCallback);
NSUrl CreateUrl() => new(OpenIddictHelpers.AddQueryStringParameters( NSUrl CreateUrl() => OpenIddictHelpers.AddQueryStringParameters(
uri: new Uri(context.AuthorizationEndpoint, UriKind.Absolute), uri: new Uri(context.AuthorizationEndpoint, UriKind.Absolute),
parameters: context.Request.GetParameters().ToDictionary( parameters: context.Request.GetParameters().ToDictionary(
static parameter => parameter.Key, static parameter => parameter.Key,
static parameter => (StringValues) parameter.Value)).AbsoluteUri); static parameter => (StringValues) parameter.Value))!;
void HandleCallback(NSUrl? url, NSError? error) void HandleCallback(NSUrl? url, NSError? error)
{ {
@ -311,9 +309,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
/// <inheritdoc/> /// <inheritdoc/>
[SupportedOSPlatform("android21.0")] [SupportedOSPlatform("android21.0")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context) public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);
@ -384,9 +380,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
/// <inheritdoc/> /// <inheritdoc/>
[SupportedOSPlatform("windows10.0.17763")] [SupportedOSPlatform("windows10.0.17763")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context) public async ValueTask HandleAsync(ApplyAuthorizationRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);

24
src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHandlers.Session.cs
View File

@ -91,9 +91,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
[SupportedOSPlatform("ios12.0")] [SupportedOSPlatform("ios12.0")]
[SupportedOSPlatform("maccatalyst13.1")] [SupportedOSPlatform("maccatalyst13.1")]
[SupportedOSPlatform("macos10.15")] [SupportedOSPlatform("macos10.15")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyEndSessionRequestContext context) public async ValueTask HandleAsync(ApplyEndSessionRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);
@ -127,16 +125,16 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
using var session = CreateASWebAuthenticationSession(); using var session = CreateASWebAuthenticationSession();
// On iOS 13.0 and higher, a presentation context provider returning the UI window to // Note: a presentation context provider returning the UI window to which the Safari
// which the Safari web view will be attached MUST be provided (otherwise, a code 2 // web view will be attached MUST be provided (otherwise, a code 2 error is returned
// error is returned by ASWebAuthenticationSession). To avoid that, a default provider // by ASWebAuthenticationSession). To avoid that, a default provider pointing to the
// pointing to the current UI window is automatically attached on iOS 13.0 and higher. // current UI window is automatically attached to the ASWebAuthenticationSession object.
if (OperatingSystem.IsIOSVersionAtLeast(13)) if (OperatingSystem.IsIOSVersionAtLeast(13) ||
OperatingSystem.IsMacCatalystVersionAtLeast(13) ||
OperatingSystem.IsMacOSVersionAtLeast(10, 15))
{ {
#pragma warning disable CA1416
session.PresentationContextProvider = new ASWebAuthenticationPresentationContext( session.PresentationContextProvider = new ASWebAuthenticationPresentationContext(
GetCurrentUIWindow() ?? throw new InvalidOperationException(SR.GetResourceString(SR.ID0447))); GetCurrentUIWindow() ?? throw new InvalidOperationException(SR.GetResourceString(SR.ID0447)));
#pragma warning restore CA1416
} }
using var registration = context.CancellationToken.Register( using var registration = context.CancellationToken.Register(
@ -226,11 +224,11 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
return new ASWebAuthenticationSession(CreateUrl(), uri.Scheme, HandleCallback); return new ASWebAuthenticationSession(CreateUrl(), uri.Scheme, HandleCallback);
NSUrl CreateUrl() => new(OpenIddictHelpers.AddQueryStringParameters( NSUrl CreateUrl() => OpenIddictHelpers.AddQueryStringParameters(
uri: new Uri(context.EndSessionEndpoint, UriKind.Absolute), uri: new Uri(context.EndSessionEndpoint, UriKind.Absolute),
parameters: context.Request.GetParameters().ToDictionary( parameters: context.Request.GetParameters().ToDictionary(
static parameter => parameter.Key, static parameter => parameter.Key,
static parameter => (StringValues) parameter.Value)).AbsoluteUri); static parameter => (StringValues) parameter.Value))!;
void HandleCallback(NSUrl? url, NSError? error) void HandleCallback(NSUrl? url, NSError? error)
{ {
@ -311,9 +309,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
/// <inheritdoc/> /// <inheritdoc/>
[SupportedOSPlatform("android21.0")] [SupportedOSPlatform("android21.0")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyEndSessionRequestContext context) public async ValueTask HandleAsync(ApplyEndSessionRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);
@ -384,9 +380,7 @@ public static partial class OpenIddictClientSystemIntegrationHandlers
/// <inheritdoc/> /// <inheritdoc/>
[SupportedOSPlatform("windows10.0.17763")] [SupportedOSPlatform("windows10.0.17763")]
#pragma warning disable CS1998
public async ValueTask HandleAsync(ApplyEndSessionRequestContext context) public async ValueTask HandleAsync(ApplyEndSessionRequestContext context)
#pragma warning restore CS1998
{ {
ArgumentNullException.ThrowIfNull(context); ArgumentNullException.ThrowIfNull(context);

4
src/OpenIddict.Client.SystemIntegration/OpenIddictClientSystemIntegrationHelpers.cs
View File

@ -245,12 +245,10 @@ public static class OpenIddictClientSystemIntegrationHelpers
{ {
try try
{ {
#pragma warning disable CA1416
using var scenes = UIApplication.SharedApplication.ConnectedScenes; using var scenes = UIApplication.SharedApplication.ConnectedScenes;
var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault(); var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
return scene?.Windows.FirstOrDefault(); return scene?.Windows.FirstOrDefault();
#pragma warning restore CA1416
} }
catch (InvalidCastException) catch (InvalidCastException)
@ -268,12 +266,10 @@ public static class OpenIddictClientSystemIntegrationHelpers
{ {
try try
{ {
#pragma warning disable CA1416
using var scenes = UIApplication.SharedApplication.ConnectedScenes; using var scenes = UIApplication.SharedApplication.ConnectedScenes;
var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault(); var scene = scenes.ToArray<UIWindowScene>().FirstOrDefault();
return scene?.Windows; return scene?.Windows;
#pragma warning restore CA1416
} }
catch (InvalidCastException) catch (InvalidCastException)

Write Preview
Loading…
Cancel
Save