Merge branch 'main' into 63-orchestrator-statefull-netapp-support

5G-ERA · Mar 15, 2024 · 1ebe3ff · 1ebe3ff
2 parents bddcc8d + fb2ef78
commit 1ebe3ff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/gateway_docker_tag.yml b/.github/workflows/gateway_docker_tag.yml
@@ -36,7 +36,7 @@ jobs:
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')          
         docker tag $IMAGE_REPOSITORY $IMAGE_ID:$IMAGE_TAG
         docker push $IMAGE_ID:$IMAGE_TAG    
-        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta*]]; then
+        if [[ ${{ steps.get_version.outputs.VERSION }} != *rc* && ${{ steps.get_version.outputs.VERSION }} != *beta* ]]; then
             docker tag $IMAGE_ID:$IMAGE_TAG $IMAGE_ID:latest
             docker push $IMAGE_ID:latest
         fi

diff --git a/src/OcelotGateway/Services/TokenService.cs b/src/OcelotGateway/Services/TokenService.cs
@@ -21,7 +21,7 @@ public TokenService(JwtConfig jwtconfig)
 
         public TokenModel GenerateToken(Guid id, string userRole) 
         {
-            var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_jwtConfig.Key));
+            var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(string.IsNullOrEmpty(_jwtConfig.Key) ? "noawsdefaultkeygenerator" : _jwtConfig.Key));
             var credentials = new SigningCredentials(key, SecurityAlgorithms.HmacSha256Signature);
             var expirationDate = DateTime.UtcNow.AddHours(4);