Skip to content

Add TikTok as AuthProvider #154

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.

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 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
10 changes: 0 additions & 10 deletions .csharpierrc

This file was deleted.

14 changes: 12 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
###############################
# Core EditorConfig Options #
# Core EditorConfig Options #
###############################

root = true

###############################
# .NET Coding Conventions #
# Configurable behaviors #
###############################

[*.{cs,csx}]
end_of_line = crlf
indent_style = space
indent_size = 4
max_line_length = 200

###############################
# .NET Coding Conventions #
###############################

[*.{cs,vb}]
Expand Down
4 changes: 1 addition & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@
<DefaultVersion>2.24.0</DefaultVersion>
<DefaultTargetFrameworks>netstandard2.1;net6.0;net7.0;net8.0</DefaultTargetFrameworks>
</PropertyGroup>

<PropertyGroup Label="C#">
<LangVersion>latest</LangVersion>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<PropertyGroup>
<DefaultAssemblyVersion>$(DefaultVersion)</DefaultAssemblyVersion>
<DefaultPackageVersion>$(DefaultVersion)</DefaultPackageVersion>
<DefaultFileVersion>$(DefaultVersion)</DefaultFileVersion>
</PropertyGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
<PackageVersion Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageVersion Include="Nethereum.HdWallet" Version="4.14.0" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion Thirdweb.Console/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@

#region InAppWallet - OAuth

// var inAppWalletOAuth = await InAppWallet.Create(client: client, authProvider: AuthProvider.Github);
// var inAppWalletOAuth = await InAppWallet.Create(client: client, authProvider: AuthProvider.TikTok);
// if (!await inAppWalletOAuth.IsConnected())
// {
// _ = await inAppWalletOAuth.LoginWithOauth(
Expand Down
8 changes: 1 addition & 7 deletions Thirdweb.Console/Thirdweb.Console.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">


<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Thirdweb\Thirdweb.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="dotenv.net" />
</ItemGroup>

<ItemGroup>
<None Update=".env">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</Project>
8 changes: 4 additions & 4 deletions Thirdweb.Tests/Thirdweb.Contracts/Thirdweb.Contracts.Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ public async Task SignatureMint_Generate()
Value = BigInteger.Zero,
Gas = BigInteger.Zero,
Nonce = BigInteger.Zero,
Data = "0x"
Data = "0x",
};
var signature = await EIP712.GenerateSignature_MinimalForwarder(randomDomain, randomVersion, randomChainId, randomContractAddress, forwardRequest, signer);
Assert.NotNull(signature);
Expand All @@ -243,7 +243,7 @@ public async Task SignatureMint_Generate()
Currency = Constants.ADDRESS_ZERO,
ValidityEndTimestamp = 0,
ValidityStartTimestamp = Utils.GetUnixTimeStampIn10Years(),
Uid = new byte[] { 0x01 }
Uid = new byte[] { 0x01 },
};
var signature20 = await EIP712.GenerateSignature_TokenERC20(randomDomain, randomVersion, randomChainId, randomContractAddress, mintRequest20, signer);
Assert.NotNull(signature20);
Expand All @@ -261,7 +261,7 @@ public async Task SignatureMint_Generate()
Currency = Constants.ADDRESS_ZERO,
ValidityEndTimestamp = 0,
ValidityStartTimestamp = Utils.GetUnixTimeStampIn10Years(),
Uid = new byte[] { 0x01 }
Uid = new byte[] { 0x01 },
};
var signature721 = await EIP712.GenerateSignature_TokenERC721(randomDomain, randomVersion, randomChainId, randomContractAddress, mintRequest721, signer);
Assert.NotNull(signature721);
Expand All @@ -281,7 +281,7 @@ public async Task SignatureMint_Generate()
Currency = Constants.ADDRESS_ZERO,
ValidityEndTimestamp = 0,
ValidityStartTimestamp = Utils.GetUnixTimeStampIn10Years(),
Uid = new byte[] { 0x01 }
Uid = new byte[] { 0x01 },
};
var signature1155 = await EIP712.GenerateSignature_TokenERC1155(randomDomain, randomVersion, randomChainId, randomContractAddress, mintRequest1155, signer);
Assert.NotNull(signature1155);
Expand Down
56 changes: 28 additions & 28 deletions Thirdweb.Tests/Thirdweb.Extensions/Thirdweb.Extensions.Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -716,26 +716,26 @@ public async Task ERC1155_NullChecks()
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () => await contract.ERC1155_SafeTransferFrom(wallet, validAddress, validAddress, BigInteger.MinusOne, validAmount, validData));

// ERC1155_SafeBatchTransferFrom
_ = await Assert.ThrowsAsync<ArgumentNullException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(null, null, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(null, null, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, null, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, null, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, string.Empty, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, string.Empty, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, null, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, string.Empty, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, string.Empty, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, null, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, null, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, null, validData)
_ = await Assert.ThrowsAsync<ArgumentException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, null, validData)
);

// ERC1155_URI
Expand All @@ -749,8 +749,8 @@ public async Task ERC1155_NullChecks()

_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_SetApprovalForAll(wallet, validAddress, false));
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_SafeTransferFrom(wallet, validAddress, validAddress, validTokenId, validAmount, validData));
_ = await Assert.ThrowsAsync<ArgumentNullException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);

// Null contract checks
Expand All @@ -761,8 +761,8 @@ public async Task ERC1155_NullChecks()
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_SetApprovalForAll(wallet, validAddress, false));
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_IsApprovedForAll(validAddress, validAddress));
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_SafeTransferFrom(wallet, validAddress, validAddress, validTokenId, validAmount, validData));
_ = await Assert.ThrowsAsync<ArgumentNullException>(
async () => await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () =>
await contract.ERC1155_SafeBatchTransferFrom(wallet, validAddress, validAddress, new BigInteger[] { validTokenId }, new BigInteger[] { validAmount }, validData)
);
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_URI(validTokenId));
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await contract.ERC1155_TotalSupply(validTokenId));
Expand Down Expand Up @@ -1375,7 +1375,7 @@ public async Task TokenERC20_NullChecks()
Currency = Constants.NATIVE_TOKEN_ADDRESS,
ValidityStartTimestamp = 0,
ValidityEndTimestamp = 0,
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes()
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes(),
};

// TokenERC20_MintTo null checks
Expand Down Expand Up @@ -1422,7 +1422,7 @@ public async Task TokenERC20_GenerateMintSignature_WithVerify()
var contract = await this.GetTokenERC20Contract();
var fakeAuthorizedSigner = await PrivateKeyWallet.Generate(this.Client);
var randomReceiver = await PrivateKeyWallet.Generate(this.Client);
var mintRequest = new TokenERC20_MintRequest { To = await randomReceiver.GetAddress(), Quantity = BigInteger.Parse("1.5".ToWei()), };
var mintRequest = new TokenERC20_MintRequest { To = await randomReceiver.GetAddress(), Quantity = BigInteger.Parse("1.5".ToWei()) };

(var payload, var signature) = await contract.TokenERC20_GenerateMintSignature(fakeAuthorizedSigner, mintRequest);

Expand Down Expand Up @@ -1477,7 +1477,7 @@ public async Task TokenERC721_NullChecks()
Currency = Constants.NATIVE_TOKEN_ADDRESS,
ValidityStartTimestamp = 0,
ValidityEndTimestamp = 0,
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes()
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes(),
};

// TokenERC721_MintTo (with URI) null checks
Expand Down Expand Up @@ -1530,7 +1530,7 @@ public async Task TokenERC721_GenerateMintSignature_WithUri_WithVerify()
var contract = await this.GetTokenERC721Contract();
var fakeAuthorizedSigner = await PrivateKeyWallet.Generate(this.Client);
var randomReceiver = await PrivateKeyWallet.Generate(this.Client);
var mintRequest = new TokenERC721_MintRequest { To = await randomReceiver.GetAddress(), Uri = "", };
var mintRequest = new TokenERC721_MintRequest { To = await randomReceiver.GetAddress(), Uri = "" };

(var payload, var signature) = await contract.TokenERC721_GenerateMintSignature(fakeAuthorizedSigner, mintRequest);

Expand Down Expand Up @@ -1637,7 +1637,7 @@ public async Task TokenERC1155_NullChecks()
Currency = Constants.NATIVE_TOKEN_ADDRESS,
ValidityStartTimestamp = 0,
ValidityEndTimestamp = 0,
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes()
Uid = Guid.NewGuid().ToByteArray().PadTo32Bytes(),
};

// TokenERC1155_MintTo (with URI) null checks
Expand All @@ -1654,11 +1654,11 @@ public async Task TokenERC1155_NullChecks()
_ = await Assert.ThrowsAsync<ArgumentNullException>(async () => await ThirdwebExtensions.TokenERC1155_MintTo(contract, null, validAddress, validTokenId, validQuantity, new NFTMetadata()));
_ = await Assert.ThrowsAsync<ArgumentException>(async () => await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, null, validTokenId, validQuantity, new NFTMetadata()));
_ = await Assert.ThrowsAsync<ArgumentException>(async () => await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, string.Empty, validTokenId, validQuantity, new NFTMetadata()));
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
async () => await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, validAddress, invalidTokenId, validQuantity, new NFTMetadata())
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, validAddress, invalidTokenId, validQuantity, new NFTMetadata())
);
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(
async () => await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, validAddress, validTokenId, invalidQuantity, new NFTMetadata())
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
await ThirdwebExtensions.TokenERC1155_MintTo(contract, wallet, validAddress, validTokenId, invalidQuantity, new NFTMetadata())
);

// TokenERC1155_MintWithSignature null checks
Expand Down Expand Up @@ -1698,7 +1698,7 @@ public async Task TokenERC1155_GenerateMintSignature_WithUri_WithVerify()
var contract = await this.GetTokenERC1155Contract();
var fakeAuthorizedSigner = await PrivateKeyWallet.Generate(this.Client);
var randomReceiver = await PrivateKeyWallet.Generate(this.Client);
var mintRequest = new TokenERC1155_MintRequest { To = await randomReceiver.GetAddress(), Uri = "", };
var mintRequest = new TokenERC1155_MintRequest { To = await randomReceiver.GetAddress(), Uri = "" };

(var payload, var signature) = await contract.TokenERC1155_GenerateMintSignature(fakeAuthorizedSigner, mintRequest);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task Marketplace_DirectListings_CreateListing_Success()
PricePerToken = 1,
StartTimestamp = Utils.GetUnixTimeStampNow(),
EndTimestamp = Utils.GetUnixTimeStampNow() + 3600,
Reserved = false
Reserved = false,
};

var receipt = await contract.Marketplace_DirectListings_CreateListing(wallet, listingParams, true);
Expand Down Expand Up @@ -92,7 +92,7 @@ public async Task Marketplace_DirectListings_UpdateListing_Success()
PricePerToken = 1,
StartTimestamp = Utils.GetUnixTimeStampNow() + 1800,
EndTimestamp = Utils.GetUnixTimeStampNow() + 3600,
Reserved = false
Reserved = false,
};

var receipt = await contract.Marketplace_DirectListings_CreateListing(wallet, originalListing, true);
Expand Down Expand Up @@ -130,7 +130,7 @@ public async Task Marketplace_DirectListings_CancelListing_Success()
PricePerToken = 1,
StartTimestamp = Utils.GetUnixTimeStampNow() + 1800,
EndTimestamp = Utils.GetUnixTimeStampNow() + 3600,
Reserved = false
Reserved = false,
};

var receipt = await contract.Marketplace_DirectListings_CreateListing(wallet, originalListing, true);
Expand Down Expand Up @@ -159,7 +159,7 @@ public async Task Marketplace_DirectListings_ApproveBuyerForListing()
PricePerToken = 1,
StartTimestamp = Utils.GetUnixTimeStampNow(),
EndTimestamp = Utils.GetUnixTimeStampNow() + 3600,
Reserved = true
Reserved = true,
};

var receipt = await contract.Marketplace_DirectListings_CreateListing(wallet, reservedListing, true);
Expand Down
6 changes: 3 additions & 3 deletions Thirdweb.Tests/Thirdweb.Http/Thirdweb.Http.Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ public void StatusCode_ShouldSetAndGet()
var responseMessage = new ThirdwebHttpResponseMessage(200, new ThirdwebHttpContent("Test Content"), true)
{
// Act
StatusCode = 404
StatusCode = 404,
};

// Assert
Expand All @@ -340,7 +340,7 @@ public void Content_ShouldSetAndGet()
var responseMessage = new ThirdwebHttpResponseMessage(200, initialContent, true)
{
// Act
Content = newContent
Content = newContent,
};

// Assert
Expand All @@ -354,7 +354,7 @@ public void IsSuccessStatusCode_ShouldSetAndGet()
var responseMessage = new ThirdwebHttpResponseMessage(200, new ThirdwebHttpContent("Test Content"), true)
{
// Act
IsSuccessStatusCode = false
IsSuccessStatusCode = false,
};

// Assert
Expand Down
8 changes: 1 addition & 7 deletions Thirdweb.Tests/Thirdweb.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild">
<PrivateAssets>all</PrivateAssets>
Expand All @@ -23,21 +21,17 @@
<PackageReference Include="dotenv.net" />
<PackageReference Include="Moq" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Thirdweb\Thirdweb.csproj" />
</ItemGroup>

<ItemGroup>
<None Update=".env">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<None Update="xunit.runner.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
</Project>
Loading