Merge pull request #54 from contentstack/stage-to-dev

cs-raj · web-flow · commit 366455fae932 · 2024-10-18T18:19:50.000+05:30
Stage to dev
diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Push generated package to GitHub registry
         run: |
           cd out
-          dotnet nuget push "contentstack.management.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols true --source https://api.nuget.org/v3/index.json
+          dotnet nuget push "contentstack.management.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols --source https://api.nuget.org/v3/index.json
 
   publish-git:  
     runs-on: windows-latest
@@ -42,4 +42,4 @@ jobs:
       - name: Push generated package to GitHub registry
         run: |
           cd out
-          dotnet nuget push "contentstack.management.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols true --source https://api.nuget.org/v3/index.json
+          dotnet nuget push "contentstack.management.csharp.*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate --no-symbols --source https://api.nuget.org/v3/index.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Changelog
 
-## [v0.1.9](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.9)
+## [v0.1.10](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.10)
  - Feat
    - Add support for apiVersion in bulk publish unpublish methods
 
+## [v0.1.9](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.9)
+ - Fix
+   - Media header now added only to Assets API methods and removed from all others for both Sync and Async calls.
+
+
 ## [v0.1.8](https://github.com/contentstack/contentstack-management-dotnet/tree/v0.1.8)
  - Fix
    - Strong named assemblies
diff --git a/Contentstack.Management.Core.Unit.Tests/Mokes/MockHttpHandler.cs b/Contentstack.Management.Core.Unit.Tests/Mokes/MockHttpHandler.cs
@@ -14,9 +14,9 @@ public override Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool
             return base.InvokeAsync<T>(executionContext, addAcceptMediaHeader);
         }
 
-        public override void InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public override void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
-            base.InvokeSync(executionContext);
+            base.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);
         }
     }
 
@@ -43,7 +43,7 @@ public async Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool add
             return await Task.FromResult<T>((T)executionContext.ResponseContext.httpResponse);
         }
 
-        public void InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
             executionContext.ResponseContext.httpResponse = _response;
             if (executionContext.RequestContext.service != null)
diff --git a/Contentstack.Management.Core/ContentstackClient.cs b/Contentstack.Management.Core/ContentstackClient.cs
@@ -179,7 +179,7 @@ protected void BuildPipeline()
             }, LogManager);
         }
 
-        internal ContentstackResponse InvokeSync<TRequest>(TRequest request, string apiVersion = null) where TRequest : IContentstackService
+        internal ContentstackResponse InvokeSync<TRequest>(TRequest request, bool addAcceptMediaHeader = false, string apiVersion = null) where TRequest : IContentstackService
         {
             ThrowIfDisposed();
 
@@ -191,7 +191,7 @@ internal ContentstackResponse InvokeSync<TRequest>(TRequest request, string apiV
                 },
                 new ResponseContext());
 
-            return (ContentstackResponse)ContentstackPipeline.InvokeSync(context, apiVersion).httpResponse;
+            return (ContentstackResponse)ContentstackPipeline.InvokeSync(context, addAcceptMediaHeader, apiVersion).httpResponse;
         }
 
         internal Task<TResponse> InvokeAsync<TRequest, TResponse>(TRequest request, bool addAcceptMediaHeader = false, string apiVersion = null)
diff --git a/Contentstack.Management.Core/Runtime/Pipeline/ContentstackRuntimePipeline.cs b/Contentstack.Management.Core/Runtime/Pipeline/ContentstackRuntimePipeline.cs
@@ -90,11 +90,11 @@ public System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext execution
             return _handler.InvokeAsync<T>(executionContext, addAcceptMediaHeader, apiVersion);
         }
 
-        public IResponseContext InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public IResponseContext InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
             ThrowIfDisposed();
 
-            _handler.InvokeSync(executionContext, apiVersion);
+            _handler.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);
             return executionContext.ResponseContext;
         }
 
diff --git a/Contentstack.Management.Core/Runtime/Pipeline/HttpHandler/HttpHandler.cs b/Contentstack.Management.Core/Runtime/Pipeline/HttpHandler/HttpHandler.cs
@@ -57,14 +57,14 @@ public async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext exe
             }
         }
 
-        public void InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
             IHttpRequest httpRequest = null;
             try
             {
                 var requestContext = executionContext.RequestContext;
 
-                httpRequest = requestContext.service.CreateHttpRequest(_httpClient, requestContext.config, apiVersion: apiVersion);
+                httpRequest = requestContext.service.CreateHttpRequest(_httpClient, requestContext.config, addAcceptMediaHeader, apiVersion: apiVersion);
 
                 if (requestContext.service.HasRequestBody() && requestContext.service.Content != null)
                 {
diff --git a/Contentstack.Management.Core/Runtime/Pipeline/IPipelineHandler.cs b/Contentstack.Management.Core/Runtime/Pipeline/IPipelineHandler.cs
@@ -25,7 +25,7 @@ public interface IPipelineHandler
         /// </summary>
         /// <param name="executionContext"></param>
 
-        void InvokeSync(IExecutionContext executionContext, string apiVersion = null);
+        void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null);
 
         /// <summary>
         /// 
diff --git a/Contentstack.Management.Core/Runtime/Pipeline/PipelineHandler.cs b/Contentstack.Management.Core/Runtime/Pipeline/PipelineHandler.cs
@@ -20,11 +20,11 @@ public virtual Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool a
             throw new InvalidOperationException("Cannot invoke InnerHandler. InnerHandler is not set.");
         }
 
-        public virtual void InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public virtual void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
             if (this.InnerHandler != null)
             {
-                InnerHandler.InvokeSync(executionContext, apiVersion);
+                InnerHandler.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);
                 return;
             }
             throw new InvalidOperationException("Cannot invoke InnerHandler. InnerHandler is not set.");
diff --git a/Contentstack.Management.Core/Runtime/Pipeline/RetryHandler/RetryHandler.cs b/Contentstack.Management.Core/Runtime/Pipeline/RetryHandler/RetryHandler.cs
@@ -46,15 +46,15 @@ public override async Task<T> InvokeAsync<T>(IExecutionContext executionContext,
             throw new ContentstackException("No response was return nor exception was thrown");
         }
 
-        public override void InvokeSync(IExecutionContext executionContext, string apiVersion = null)
+        public override void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)
         {
             var requestContext = executionContext.RequestContext;
             bool shouldRetry = false;
             do
             {
                 try
                 {
-                    base.InvokeSync(executionContext, apiVersion);
+                    base.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);
                     return;
                 }
                 catch (Exception exception)

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ public override Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool`
`14`	`14`	`return base.InvokeAsync<T>(executionContext, addAcceptMediaHeader);`
`15`	`15`	`}`
`16`	`16`
`17`		`- public override void InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`17`	`+ public override void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`18`	`18`	`{`
`19`		`- base.InvokeSync(executionContext);`
	`19`	`+ base.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`@@ -43,7 +43,7 @@ public async Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool add`
`43`	`43`	`return await Task.FromResult<T>((T)executionContext.ResponseContext.httpResponse);`
`44`	`44`	`}`
`45`	`45`
`46`		`- public void InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`46`	`+ public void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`47`	`47`	`{`
`48`	`48`	`executionContext.ResponseContext.httpResponse = _response;`
`49`	`49`	`if (executionContext.RequestContext.service != null)`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ protected void BuildPipeline()`
`179`	`179`	`}, LogManager);`
`180`	`180`	`}`
`181`	`181`
`182`		`- internal ContentstackResponse InvokeSync<TRequest>(TRequest request, string apiVersion = null) where TRequest : IContentstackService`
	`182`	`+ internal ContentstackResponse InvokeSync<TRequest>(TRequest request, bool addAcceptMediaHeader = false, string apiVersion = null) where TRequest : IContentstackService`
`183`	`183`	`{`
`184`	`184`	`ThrowIfDisposed();`
`185`	`185`
`@@ -191,7 +191,7 @@ internal ContentstackResponse InvokeSync<TRequest>(TRequest request, string apiV`
`191`	`191`	`},`
`192`	`192`	`new ResponseContext());`
`193`	`193`
`194`		`- return (ContentstackResponse)ContentstackPipeline.InvokeSync(context, apiVersion).httpResponse;`
	`194`	`+ return (ContentstackResponse)ContentstackPipeline.InvokeSync(context, addAcceptMediaHeader, apiVersion).httpResponse;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`internal Task<TResponse> InvokeAsync<TRequest, TResponse>(TRequest request, bool addAcceptMediaHeader = false, string apiVersion = null)`
Original file line number	Diff line number	Diff line change
`@@ -90,11 +90,11 @@ public System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext execution`
`90`	`90`	`return _handler.InvokeAsync<T>(executionContext, addAcceptMediaHeader, apiVersion);`
`91`	`91`	`}`
`92`	`92`
`93`		`- public IResponseContext InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`93`	`+ public IResponseContext InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`94`	`94`	`{`
`95`	`95`	`ThrowIfDisposed();`
`96`	`96`
`97`		`- _handler.InvokeSync(executionContext, apiVersion);`
	`97`	`+ _handler.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);`
`98`	`98`	`return executionContext.ResponseContext;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,14 @@ public async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionContext exe`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`- public void InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`60`	`+ public void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`61`	`61`	`{`
`62`	`62`	`IHttpRequest httpRequest = null;`
`63`	`63`	`try`
`64`	`64`	`{`
`65`	`65`	`var requestContext = executionContext.RequestContext;`
`66`	`66`
`67`		`- httpRequest = requestContext.service.CreateHttpRequest(_httpClient, requestContext.config, apiVersion: apiVersion);`
	`67`	`+ httpRequest = requestContext.service.CreateHttpRequest(_httpClient, requestContext.config, addAcceptMediaHeader, apiVersion: apiVersion);`
`68`	`68`
`69`	`69`	`if (requestContext.service.HasRequestBody() && requestContext.service.Content != null)`
`70`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ public virtual Task<T> InvokeAsync<T>(IExecutionContext executionContext, bool a`
`20`	`20`	`throw new InvalidOperationException("Cannot invoke InnerHandler. InnerHandler is not set.");`
`21`	`21`	`}`
`22`	`22`
`23`		`- public virtual void InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`23`	`+ public virtual void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`24`	`24`	`{`
`25`	`25`	`if (this.InnerHandler != null)`
`26`	`26`	`{`
`27`		`- InnerHandler.InvokeSync(executionContext, apiVersion);`
	`27`	`+ InnerHandler.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);`
`28`	`28`	`return;`
`29`	`29`	`}`
`30`	`30`	`throw new InvalidOperationException("Cannot invoke InnerHandler. InnerHandler is not set.");`
Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,15 @@ public override async Task<T> InvokeAsync<T>(IExecutionContext executionContext,`
`46`	`46`	`throw new ContentstackException("No response was return nor exception was thrown");`
`47`	`47`	`}`
`48`	`48`
`49`		`- public override void InvokeSync(IExecutionContext executionContext, string apiVersion = null)`
	`49`	`+ public override void InvokeSync(IExecutionContext executionContext, bool addAcceptMediaHeader = false, string apiVersion = null)`
`50`	`50`	`{`
`51`	`51`	`var requestContext = executionContext.RequestContext;`
`52`	`52`	`bool shouldRetry = false;`
`53`	`53`	`do`
`54`	`54`	`{`
`55`	`55`	`try`
`56`	`56`	`{`
`57`		`- base.InvokeSync(executionContext, apiVersion);`
	`57`	`+ base.InvokeSync(executionContext, addAcceptMediaHeader, apiVersion);`
`58`	`58`	`return;`
`59`	`59`	`}`
`60`	`60`	`catch (Exception exception)`