Skip to content

Commit c48db22

Browse files
committed
fix Environment
1 parent 66bd231 commit c48db22

File tree

8 files changed

+52
-18
lines changed

8 files changed

+52
-18
lines changed

README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,35 @@ For more information about keys please check [Amazon Selling Partner Api develop
127127
var report= amazonConnection.Reports.CreateReport(parameters);
128128
```
129129

130+
131+
### Report GET_MERCHANT_LISTINGS_ALL_DATA sample
132+
```CSharp
133+
var parameters = new ParameterCreateReportSpecification();
134+
parameters.reportType = ReportTypes.GET_MERCHANT_LISTINGS_ALL_DATA;
135+
136+
parameters.marketplaceIds = new MarketplaceIds();
137+
parameters.marketplaceIds.Add(MarketPlace.UnitedArabEmirates.ID);
138+
139+
parameters.reportOptions = new FikaAmazonAPI.AmazonSpApiSDK.Models.Reports.ReportOptions();
140+
141+
var reportId = amazonConnection.Reports.CreateReport(parameters);
142+
var filePath = string.Empty;
143+
string ReportDocumentId = string.Empty;
144+
145+
while (string.IsNullOrEmpty(ReportDocumentId))
146+
{
147+
Thread.Sleep(1000 * 60);
148+
var reportData = amazonConnection.Reports.GetReport(reportId);
149+
if (!string.IsNullOrEmpty(reportData.ReportDocumentId))
150+
{
151+
filePath = amazonConnection.Reports.GetReportFile(reportData.ReportDocumentId);
152+
break;
153+
}
154+
}
155+
156+
//filePath for report
157+
```
158+
130159
### Product Pricing ,For more Pricing sample please check [Here](https://github.com/abuzuhri/Amazon-SP-API-CSharp/blob/main/Source/FikaAmazonAPI.Test/ProductPricing.cs).
131160
```CSharp
132161

Source/FikaAmazonAPI.Sample/Program.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ static async Task Main(string[] args)
3939
ClientSecret = Environment.GetEnvironmentVariable("ClientSecret"),
4040
RefreshToken = Environment.GetEnvironmentVariable("RefreshToken"),
4141
MarketPlace = MarketPlace.UnitedArabEmirates,
42-
IsActiveLimitRate=true
42+
IsActiveLimitRate = true,
43+
Environment = Environments.Production
4344

44-
});
45+
}) ;
4546

4647

4748
var data4 = amazonConnection.ProductPricing.GetItemOffers(new Parameter.ProductPricing.ParameterGetItemOffers()

Source/FikaAmazonAPI/AmazonCredential.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
using FikaAmazonAPI.AmazonSpApiSDK.Models.Token;
2+
using FikaAmazonAPI.AmazonSpApiSDK.Services;
23
using FikaAmazonAPI.Utils;
34
using System;
45
using System.Collections.Generic;
56
using System.Text;
67
using static FikaAmazonAPI.AmazonSpApiSDK.Models.Token.CacheTokenData;
8+
using static FikaAmazonAPI.Utils.Constants;
79

810
namespace FikaAmazonAPI
911
{
@@ -18,6 +20,8 @@ public class AmazonCredential
1820
public MarketPlace MarketPlace { get; set; }
1921
private CacheTokenData CacheTokenData { get; set; }
2022
public bool IsActiveLimitRate { get; set; } = true;
23+
public Environments Environment { get; set; } = Environments.Production;
24+
2125

2226

2327
public AmazonCredential()

Source/FikaAmazonAPI/AmazonSpApiSDK/Models/Token/CacheTokenData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class CacheTokenData
1313

1414
public AWSAuthenticationTokenData GetAWSAuthenticationTokenData()
1515
{
16-
if (AWSAuthenticationTokenData != null && AWSAuthenticationTokenData.Expiration > DateTime.Now)
16+
if (AWSAuthenticationTokenData != null && AWSAuthenticationTokenData.Expiration > DateTime.Now.Date.AddSeconds(-10))
1717
return AWSAuthenticationTokenData;
1818
else return null;
1919
}

Source/FikaAmazonAPI/FikaAmazonAPI.csproj

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
<Product>CSharp Amazon Sp API</Product>
99
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1010
<LangVersion>8.0</LangVersion>
11-
<Version>1.0.10</Version>
12-
<AssemblyVersion>1.0.1.10</AssemblyVersion>
13-
<FileVersion>1.0.1.10</FileVersion>
11+
<Version>1.0.12</Version>
12+
<AssemblyVersion>1.0.1.12</AssemblyVersion>
13+
<FileVersion>1.0.1.12</FileVersion>
1414
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1515
<PackageProjectUrl>https://github.com/abuzuhri/Amazon-SP-API-CSharp</PackageProjectUrl>
1616
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1717
<RepositoryUrl>https://github.com/abuzuhri/Amazon-SP-API-CSharp</RepositoryUrl>
1818
<PackageReadmeFile>README.md</PackageReadmeFile>
19+
<PackageTags>Amazon SP-API MWS Amazon-SP-API Amazon Selling</PackageTags>
20+
<PackageReleaseNotes></PackageReleaseNotes>
21+
<NeutralLanguage>en-US</NeutralLanguage>
22+
<Description>.Net C# library for the new Amazon Selling Partner API</Description>
1923

2024
</PropertyGroup>
2125
<ItemGroup>

Source/FikaAmazonAPI/Services/ApiUrls.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22

33
namespace FikaAmazonAPI.AmazonSpApiSDK.Services
44
{
5-
6-
public static class EnvironemntManager
7-
{
8-
public static Environments Environemnt { get; set; } = Environments.Production;
9-
public enum Environments
10-
{
11-
Sandbox, Production
12-
}
13-
}
14-
155
public class ApiUrls
166
{
177

Source/FikaAmazonAPI/Services/RequestService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using FikaAmazonAPI.Search;
1717
using System.Linq;
1818
using System.Threading;
19+
using static FikaAmazonAPI.Utils.Constants;
1920

2021
namespace FikaAmazonAPI.Services
2122
{
@@ -35,7 +36,7 @@ protected string ApiBaseUrl
3536
{
3637
get
3738
{
38-
return EnvironemntManager.Environemnt == EnvironemntManager.Environments.Sandbox ? AmazonSandboxUrl : AmazonProductionUrl;
39+
return AmazonCredential.Environment == Environments.Sandbox ? AmazonSandboxUrl : AmazonProductionUrl;
3940
}
4041
}
4142

Source/FikaAmazonAPI/Utils/Constants.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ public class Constants
1111
{
1212
public readonly static string AmazonToeknEndPoint = "https://api.amazon.com/auth/o2/token";
1313
public readonly static string DateISO8601Format = "yyyy-MM-ddTHH:mm:ss.fffZ";
14-
14+
15+
[JsonConverter(typeof(StringEnumConverter))]
16+
public enum Environments
17+
{
18+
Sandbox, Production
19+
}
1520
[JsonConverter(typeof(StringEnumConverter))]
1621
public enum GranularityEnum {
1722
Hour,

0 commit comments

Comments
 (0)