Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dotnet] Remove IdentityModel nuget from bazel workspace #12834

Merged
merged 3 commits into from
Sep 29, 2023
Merged

[dotnet] Remove IdentityModel nuget from bazel workspace #12834

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8b9351
Remove IdentityModel from bazel workspace
nvborisenko Sep 28, 2023
722dd56
Make Base64UrlEncoder as public
nvborisenko Sep 28, 2023
35df2dd
Make Base64UrlEncoder back to internal
nvborisenko Sep 28, 2023
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
6 changes: 0 additions & 6 deletions dotnet/src/webdriver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ csharp_library(
],
visibility = ["//visibility:public"],
deps = [
"@identitymodel.abstractions//:Microsoft.IdentityModel.Abstractions",
"@identitymodel.logging//:Microsoft.IdentityModel.Logging",
"@identitymodel.tokens//:Microsoft.IdentityModel.Tokens",
"@json.net//:Newtonsoft.Json",
"@system.drawing.common//:System.Drawing.Common",
],
Expand Down Expand Up @@ -101,9 +98,6 @@ csharp_library(
],
visibility = ["//visibility:public"],
deps = [
"@identitymodel.abstractions//:Microsoft.IdentityModel.Abstractions",
"@identitymodel.logging//:Microsoft.IdentityModel.Logging",
"@identitymodel.tokens//:Microsoft.IdentityModel.Tokens",
"@json.net//:Newtonsoft.Json",
"@system.drawing.common//:System.Drawing.Common",
],
Expand Down
2 changes: 1 addition & 1 deletion dotnet/src/webdriver/Internal/Base64UrlEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace OpenQA.Selenium.Internal
/// <summary>
/// Encodes and Decodes strings as Base64Url encoding.
/// </summary>
internal static class Base64UrlEncoder
public static class Base64UrlEncoder
nvborisenko marked this conversation as resolved.
Show resolved Hide resolved
{
private const char base64PadCharacter = '=';
private const string doubleBase64PadCharacter = "==";
Expand Down
13 changes: 5 additions & 8 deletions dotnet/test/common/VirtualAuthn/VirtualAuthenticatorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
using System.Collections.ObjectModel;
using System.Linq;
using OpenQA.Selenium.Environment;
using OpenQA.Selenium.Internal;
using NUnit.Framework;
using Microsoft.IdentityModel.Tokens;

using static OpenQA.Selenium.VirtualAuth.VirtualAuthenticatorOptions;

Expand Down Expand Up @@ -207,9 +207,8 @@ public void ShouldAddNonResidentCredentialWhenAuthenticatorUsesU2FProtocol()
{
CreateRKDisabledU2FAuthenticator();

/**
* A pkcs#8 encoded unencrypted EC256 private key as a base64url string.
*/

// A pkcs#8 encoded unencrypted EC256 private key as a base64url string.
string base64EncodedEC256PK =
"MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8_zMDQDYAxlU-Q"
+ "hk1Dwkf0v18GZca1DMF3SaJ9HPdmShRANCAASNYX5lyVCOZLzFZzrIKmeZ2jwU"
Expand Down Expand Up @@ -272,9 +271,7 @@ public void AddResidentCredentialNotSupportedWhenAuthenticatorUsesU2FProtocol()
// Add a resident credential using the testing API.
CreateRKEnabledU2FAuthenticator();

/**
* A pkcs#8 encoded unencrypted EC256 private key as a base64url string.
*/
// A pkcs#8 encoded unencrypted EC256 private key as a base64url string.
string base64EncodedEC256PK =
"MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8_zMDQDYAxlU-Q"
+ "hk1Dwkf0v18GZca1DMF3SaJ9HPdmShRANCAASNYX5lyVCOZLzFZzrIKmeZ2jwU"
Expand Down Expand Up @@ -475,4 +472,4 @@ public void testSetUserVerified()
Assert.True(error.StartsWith("NotAllowedError"));
}
}
}
}
1 change: 0 additions & 1 deletion dotnet/test/common/WebDriver.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.IdentityModel.Tokens" Version="6.19.0" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 0 additions & 18 deletions dotnet/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,6 @@ def selenium_register_dotnet():

native.register_toolchains("//third_party/dotnet/ilmerge:all")

import_nuget_package(
name = "identitymodel.tokens",
file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.tokens.6.19.0.nupkg",
sha256 = "9ef0cd1a0f36716e20a39a7d612292c1ea0b1a6f196395db0c7552518ac0f0bd",
)

import_nuget_package(
name = "identitymodel.logging",
file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.logging.6.19.0.nupkg",
sha256 = "0f0c738bf4ce27c5b4f6a441ce067a888b3e3b2a6783517b5d8caa46eec4516a",
)

import_nuget_package(
name = "identitymodel.abstractions",
file = "third_party/dotnet/nuget/packages/microsoft.identitymodel.abstractions.6.19.0.nupkg",
sha256 = "eaa7f4995eb68edf7b6d1586a3a35027f6f9252ab82cb1478cec347a42895ee0",
)

import_nuget_package(
name = "json.net",
file = "third_party/dotnet/nuget/packages/newtonsoft.json.13.0.1.nupkg",
Expand Down