From 0316fc948dd77b91b0ccf508826f66a175cb1e83 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 5 Nov 2023 21:22:21 -0500 Subject: user/acc updates and fix social oauth --- .../src/Endpoints/DiscordOauth.cs | 5 +---- .../src/Endpoints/GitHubOauth.cs | 11 ++++------- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints') diff --git a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/DiscordOauth.cs b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/DiscordOauth.cs index 2136d8a..f64d1c4 100644 --- a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/DiscordOauth.cs +++ b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/DiscordOauth.cs @@ -56,10 +56,7 @@ namespace VNLib.Plugins.Essentials.SocialOauth.Endpoints * Creates a user-id from the users discord username, that is repeatable * and matches the Auth0 social user-id format */ - private static string GetUserIdFromPlatform(string userName) - { - return ManagedHash.ComputeHash($"discord|{userName}", HashAlg.SHA1, HashEncodingMode.Hexadecimal); - } + private static string GetUserIdFromPlatform(string userName) => $"discord|{userName}"; /// diff --git a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/GitHubOauth.cs b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/GitHubOauth.cs index 1fd691b..e8abf5a 100644 --- a/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/GitHubOauth.cs +++ b/plugins/VNLib.Plugins.Essentials.SocialOauth/src/Endpoints/GitHubOauth.cs @@ -65,19 +65,16 @@ namespace VNLib.Plugins.Essentials.SocialOauth.Endpoints .WithEndpoint() .WithMethod(Method.Get) .WithUrl(UserEmailUrl) - .WithHeader("Authorization", at => $"{at.AccessToken.Type} {at.AccessToken.Token}") - .WithHeader("Accept", GITHUB_V3_ACCEPT); + .WithHeader("Accept", GITHUB_V3_ACCEPT) + .WithHeader("Authorization", at => $"{at.AccessToken.Type} {at.AccessToken.Token}"); } - + /* * Creates a repeatable, and source specific user id for * GitHub users. This format is identical to the algorithim used * in the Auth0 Github connection, so it is compatible with Auth0 */ - private static string GetUserIdFromPlatform(int userId) - { - return ManagedHash.ComputeHash($"github|{userId}", HashAlg.SHA1, HashEncodingMode.Hexadecimal); - } + private static string GetUserIdFromPlatform(int userId) => $"github|{userId}"; protected override async Task GetLoginDataAsync(IOAuthAccessState accessToken, CancellationToken cancellationToken) -- cgit