forked from jenius-apps/beeskie
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Andromeda-compatible Beeskie replica
- Loading branch information
1 parent
39f7095
commit b4f05ed
Showing
75 changed files
with
2,638 additions
and
271 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| ############################################################################### | ||
| # Set default behavior to automatically normalize line endings. | ||
| ############################################################################### | ||
| * text=auto | ||
|
|
||
| ############################################################################### | ||
| # Set default behavior for command prompt diff. | ||
| # | ||
| # This is need for earlier builds of msysgit that does not have it on by | ||
| # default for csharp files. | ||
| # Note: This is only used by command line | ||
| ############################################################################### | ||
| #*.cs diff=csharp | ||
|
|
||
| ############################################################################### | ||
| # Set the merge driver for project and solution files | ||
| # | ||
| # Merging from the command prompt will add diff markers to the files if there | ||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | ||
| # the diff markers are never inserted). Diff markers may cause the following | ||
| # file extensions to fail to load in VS. An alternative would be to treat | ||
| # these files as binary and thus will always conflict and require user | ||
| # intervention with every merge. To do so, just uncomment the entries below | ||
| ############################################################################### | ||
| #*.sln merge=binary | ||
| #*.csproj merge=binary | ||
| #*.vbproj merge=binary | ||
| #*.vcxproj merge=binary | ||
| #*.vcproj merge=binary | ||
| #*.dbproj merge=binary | ||
| #*.fsproj merge=binary | ||
| #*.lsproj merge=binary | ||
| #*.wixproj merge=binary | ||
| #*.modelproj merge=binary | ||
| #*.sqlproj merge=binary | ||
| #*.wwaproj merge=binary | ||
|
|
||
| ############################################################################### | ||
| # behavior for image files | ||
| # | ||
| # image files are treated as binary by default. | ||
| ############################################################################### | ||
| #*.jpg binary | ||
| #*.png binary | ||
| #*.gif binary | ||
|
|
||
| ############################################################################### | ||
| # diff behavior for common document formats | ||
| # | ||
| # Convert binary document formats to text before diffing them. This feature | ||
| # is only available from the command line. Turn it on by uncommenting the | ||
| # entries below. | ||
| ############################################################################### | ||
| #*.doc diff=astextplain | ||
| #*.DOC diff=astextplain | ||
| #*.docx diff=astextplain | ||
| #*.DOCX diff=astextplain | ||
| #*.dot diff=astextplain | ||
| #*.DOT diff=astextplain | ||
| #*.pdf diff=astextplain | ||
| #*.PDF diff=astextplain | ||
| #*.rtf diff=astextplain | ||
| #*.RTF diff=astextplain |
File renamed without changes.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| for /d /r . %%d in (bin,obj) do @if exist "%%d" rd /s /q "%%d" |
122 changes: 122 additions & 0 deletions
122
Src/JeniusApps.Common.Uwp/Authentication/WindowsMsalClient.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| using JeniusApps.Common.Telemetry; | ||
| using Microsoft.Identity.Client; | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Net.Http; | ||
| using System.Threading.Tasks; | ||
|
|
||
| #nullable enable | ||
|
|
||
| namespace JeniusApps.Common.Authentication.Uwp; | ||
|
|
||
| public class WindowsMsalClient : IMsalClient | ||
| { | ||
| // Ref: https://docs.microsoft.com/en-us/azure/active-directory/develop/msal-client-application-configuration#effective-audience | ||
| public const string ConsumerAuthority = "https://login.microsoftonline.com/consumers"; | ||
| public const string CommonAuthority = "https://login.microsoftonline.com/common"; | ||
|
|
||
| private readonly ITelemetry _telemetry; | ||
| private readonly string _clientId; | ||
| private readonly IPublicClientApplication _msalSdkClient; | ||
|
|
||
| public event EventHandler<string?>? InteractiveSignInCompleted; | ||
|
|
||
| public WindowsMsalClient(ITelemetry telemetry, string clientId, string authorityUrl) | ||
| { | ||
| _telemetry = telemetry; | ||
| _clientId = clientId; | ||
|
|
||
| _msalSdkClient = PublicClientApplicationBuilder | ||
| .Create(_clientId) | ||
| .WithAuthority(authorityUrl) | ||
| .WithBroker() // See note below. | ||
| .Build(); | ||
|
|
||
| // ****** WithBroker notes ****** | ||
| // | ||
| // If using WithBroker(), no need for WithRedirectUri(). | ||
| // Instead, withBroker works only when we include special redirect URIs in Azure Portal: | ||
| // ms-appx-web://microsoft.aad.brokerplugin/<package SID here> | ||
| // | ||
| // To find your SID, go to partner center > Product Identity. | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public async Task<string?> GetTokenSilentAsync(string[] scopes) | ||
| { | ||
| try | ||
| { | ||
| var accounts = await _msalSdkClient.GetAccountsAsync(); | ||
| var firstAccount = accounts.FirstOrDefault(); | ||
| var authResult = await _msalSdkClient | ||
| .AcquireTokenSilent(scopes, firstAccount) | ||
| .ExecuteAsync(); | ||
| return authResult.AccessToken; | ||
| } | ||
| catch (MsalUiRequiredException) | ||
| { | ||
| // this is fine | ||
| } | ||
| catch (MsalException e) when (e.ErrorCode == "user_null") | ||
| { | ||
| // this is fine | ||
| } | ||
| catch (MsalException e) | ||
| { | ||
| _telemetry.TrackError(e, new Dictionary<string, string> | ||
| { | ||
| { "trace", e.StackTrace }, | ||
| { "scopes", string.Join(",", scopes) } | ||
| }); | ||
| } | ||
| catch (HttpRequestException) | ||
| { | ||
| // no internet | ||
| } | ||
|
|
||
| return ""; | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public async Task RequestInteractiveSignIn(string[] scopes, string[]? extraScopes = null) | ||
| { | ||
| try | ||
| { | ||
| var builder = _msalSdkClient.AcquireTokenInteractive(scopes); | ||
|
|
||
| if (extraScopes is not null) | ||
| { | ||
| builder = builder.WithExtraScopesToConsent(extraScopes); | ||
| } | ||
|
|
||
| var authResult = await builder.ExecuteAsync(); | ||
| InteractiveSignInCompleted?.Invoke(this, authResult?.AccessToken); | ||
| } | ||
| catch (MsalException e) when (e.ErrorCode == "authentication_canceled") | ||
| { | ||
| InteractiveSignInCompleted?.Invoke(this, string.Empty); | ||
| } | ||
| catch (MsalException e) | ||
| { | ||
| InteractiveSignInCompleted?.Invoke(this, string.Empty); | ||
|
|
||
| _telemetry.TrackError(e, new Dictionary<string, string> | ||
| { | ||
| { "trace", e.StackTrace }, | ||
| { "scopes", string.Join(",", scopes) }, | ||
| { "extraScopes", string.Join(",", extraScopes ?? Array.Empty<string>()) } | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| /// <inheritdoc/> | ||
| public async Task SignOutAsync() | ||
| { | ||
| var accounts = await _msalSdkClient.GetAccountsAsync(); | ||
| foreach (var a in accounts) | ||
| { | ||
| await _msalSdkClient.RemoveAsync(a); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.