Merge branch 'release/6.40.0'

VirtoCommerce · Mar 4, 2024 · 0380cf9 · 0380cf9
2 parents d43e9f9 + a6af167
commit 0380cf9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -43,6 +43,9 @@ jobs:
           if [ ${{ github.ref }} == 'refs/heads/master' ]; then
             echo "IS master branch"
             echo "APP=vcptcore-qa" >> $GITHUB_OUTPUT
+          elif [ ${{ github.ref }} == 'refs/heads/dev' ]; then
+            echo "IS dev branch"
+            echo "APP=vcst-dev" >> $GITHUB_OUTPUT
           fi
     
     - name: Read deployment config
@@ -53,17 +56,23 @@ jobs:
         deployConfigPath: ${{ github.event.inputs.deployConfigPath }}
 
     - name: Start deployment
-      uses: bobheadxi/deployments@master
+      uses: VirtoCommerce/vc-github-actions/gh-deployments@master
       id: deployment
       with:
         step: start
         token: ${{ secrets.GITHUB_TOKEN }}
         env: ${{ steps.deployConfig.outputs.environmentName }}
         no_override: false
 
-    - name: Update environment
+    - name: Update vcptcore-qa environment
+      if: ${{ github.ref == 'refs/heads/master' }}
       run: |
         vc-build CloudEnvSetParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCPTCORE_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
+    
+    - name: Update vcst-dev environment
+      if: ${{ github.ref == 'refs/heads/dev' }}
+      run: |
+        vc-build CloudEnvSetParameter -EnvironmentName ${{ steps.app-name.outputs.APP }} -CloudToken ${{ secrets.VCST_PLATFORM_TOKEN }} -HelmParameters storefront.image.tag=${{ github.event.inputs.artifactUrl }}
 
     - name: DEPLOY_STATE::successful
       if: success()
@@ -74,7 +83,7 @@ jobs:
       run: echo "DEPLOY_STATE=failed"  >> $GITHUB_ENV
 
     - name: Update GitHub deployment status
-      uses: bobheadxi/deployments@master
+      uses: VirtoCommerce/vc-github-actions/gh-deployments@master
       if: always()
       with:
         step: finish

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -150,9 +150,9 @@ jobs:
 
     - name: Docker Login
       if: ${{ env.BUILD_DOCKER == 'true' }}
-      uses: azure/docker-login@v1
+      uses: docker/login-action@v3
       with:
-        login-server: ${{ env.PACKAGE_SERVER }}
+        registry: ${{ env.PACKAGE_SERVER }}
         username: $GITHUB_ACTOR
         password: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>VirtoCommerce</Authors>
   </PropertyGroup>
    <PropertyGroup>
-    <VersionPrefix>6.39.0</VersionPrefix>
+    <VersionPrefix>6.40.0</VersionPrefix>
     <VersionSuffix></VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>

diff --git a/VirtoCommerce.Storefront/Infrastructure/Autorest/UserPasswordAuthHandler.cs b/VirtoCommerce.Storefront/Infrastructure/Autorest/UserPasswordAuthHandler.cs
@@ -67,7 +67,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
         protected override async Task AddAuthenticationAsync(HttpRequestMessage request)
         {
-            if (!request.Headers.Contains("Authorization") && !request.RequestUri.AbsoluteUri.Contains("/connect/token"))
+            if (!request.Headers.Contains("Authorization") && !request.RequestUri.AbsoluteUri.EndsWith("/token"))
             {
                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", await GetOrRenewTokenAsync());
             }

diff --git a/VirtoCommerce.Storefront/Startup.cs b/VirtoCommerce.Storefront/Startup.cs
@@ -439,7 +439,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 }));
 
             app.UseWhen(
-                context => context.Request.Path.Value.EndsWith("connect/token"),
+                context => context.Request.Path.Value.EndsWith("/token"),
                 appInner => appInner
                     .RunProxy(context => context
                         .ForwardTo(platformEndpointOptions.Url)