azist · itadapter · Mar 17, 2025 · Mar 5, 2025 · Mar 5, 2025 · Mar 17, 2025
diff --git a/elm/build/build-packages.cmd b/elm/build/build-packages.cmd
@@ -1,7 +1,7 @@
 @echo on
 
-set VER=3.10.0.11
-set HEADLINE=IDP Identity cfg conversion
+set VER=3.10.2.1
+set HEADLINE=EntityId deserialization glitch fix
 call build-all Release %VER%
 
 if errorlevel 1 goto BUILD_ERROR

diff --git a/src/Azos.Wave/Security/Services/OAuthControllerBase.cs b/src/Azos.Wave/Security/Services/OAuthControllerBase.cs
@@ -379,7 +379,7 @@ public async Task<object> Token_POST(string client_id, string client_secret,
       var isRefreshToken = grant_type.EqualsOrdSenseCase("refresh_token");
 
       if (!isAccessToken && !isRefreshToken)
-        return ReturnError("unsupported_grant_type", "Unsupported grant_type");
+        return ReturnError("unsupported_grant_type", "Unsupported grant_type", trace: "A1");
 
       var clcred = client_id.IsNotNullOrWhiteSpace() ? new IDPasswordCredentials(client_id, client_secret)
                                                      : IDPasswordCredentials.FromBasicAuth(WorkContext.Request.Headers[WebConsts.HTTP_HDR_AUTHORIZATION]);
@@ -389,11 +389,11 @@ public async Task<object> Token_POST(string client_id, string client_secret,
           clcred.ID.IsNullOrWhiteSpace() ||
           (isAccessToken && code.IsNullOrWhiteSpace()) ||
           (isRefreshToken && refresh_token.IsNullOrWhiteSpace())
-         ) return ReturnError("invalid_request", "Invalid client spec");
+         ) return ReturnError("invalid_request", "Invalid client spec", trace: "A2");
 
       //1. Check client/app credentials and get app's permissions
       var cluser = await OAuth.ClientSecurity.AuthenticateAsync(clcred).ConfigureAwait(false);
-      if (!cluser.IsAuthenticated) return GateError(ReturnError("invalid_client", "Client denied", code: 401));
+      if (!cluser.IsAuthenticated) return GateError(ReturnError("invalid_client", "Client denied", code: 401, trace: "B1"));
 
       //2. Validate the supplied client access code (token), that it exists (was issued and not expired), and it was issued for THIS client
       ClientAccessTokenBase clientToken;
@@ -411,23 +411,23 @@ public async Task<object> Token_POST(string client_id, string client_secret,
       }
 
       if (clientToken == null)
-        return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403));
+        return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403, trace: "C1"));
 
       //check that client_id supplied now matches the original one that was supplied during client access code issuance
       if (!clcred.ID.EqualsOrdSenseCase(clientToken.ClientId))
-        return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403));
+        return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403, trace: "C2"));
 
 
       //3. Check that the requested redirect_uri is indeed in the list of permitted URIs for this client
       var redirectPermission = new OAuthClientAppPermission(redirect_uri, WorkContext.EffectiveCallerIPEndPoint.Address.ToString());
       var uriAllowed = await redirectPermission.CheckAsync(OAuth.ClientSecurity, cluser).ConfigureAwait(false);
-      if (!uriAllowed) return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403));
+      if (!uriAllowed) return GateError(ReturnError("invalid_grant", "Invalid grant", code: 403, trace: "D1"));
 
       //4. Fetch subject/target user
       var auth = SysAuthToken.Parse(clientToken.SubjectSysAuthToken);
       var targetUser = await App.SecurityManager.AuthenticateAsync(auth).ConfigureAwait(false); //re-authenticate the user using the original token.
       if (!targetUser.IsAuthenticated)                                    //the returned AuthToken must be logically the same as the one granted on login above
-        return ReturnError("invalid_grant", "Invalid grant", code: 403);//no need for gate, the token just got denied
+        return ReturnError("invalid_grant", "Invalid grant", code: 403, trace: "E1");//no need for gate, the token just got denied
 
       //5. Issue the API access token for this access code
       var accessToken = OAuth.TokenRing.GenerateNew<AccessToken>(OAuth.AccessTokenLifespanSec);

diff --git a/src/Azos.Wave/Security/Services/OAuthControllerBase.override.cs b/src/Azos.Wave/Security/Services/OAuthControllerBase.override.cs
@@ -222,7 +222,7 @@ protected virtual void AddExtraFieldsToResponseBody(User clientUser, User subjec
     {
     }
 
-    protected object ReturnError(string error, string error_description, string error_uri = null, int code = 400)
+    protected object ReturnError(string error, string error_description, string error_uri = null, int code = 400, string trace = null)
     {
       if (error.IsNullOrWhiteSpace())
         error_uri = "invalid_request";
@@ -241,6 +241,22 @@ protected object ReturnError(string error, string error_description, string erro
       };
       WorkContext.Response.StatusCode = code;
       WorkContext.Response.StatusDescription = "Bad request";
+
+      if (trace.IsNotNullOrWhiteSpace())
+      {
+        WorkContext.Log(Log.MessageType.Error,
+                        $"OAuth error trace",
+                        $"{this.GetType().Name}.{nameof(ReturnError)}",
+                        pars: new
+                        {
+                          e = error,
+                          d = error_description,
+                          uri = error_uri,
+                          http = code,
+                          trace = trace
+                        }.ToJson(JsonWritingOptions.CompactASCII));
+      }
+
       return new JsonResult(json, JsonWritingOptions.PrettyPrint);
     }
 

diff --git a/src/Azos.Wave/WorkContext.cs b/src/Azos.Wave/WorkContext.cs
@@ -533,7 +533,7 @@ public void Log(MessageType type, string text, string from = null, Exception err
       if (related.HasValue)
         msg.RelatedTo = related.Value;
       else
-        msg.RelatedTo = this.m_ID;
+        msg.RelatedTo = (Ambient.CurrentCallFlow?.ID) ?? this.m_ID;
 
       App.Log.Write(msg);
     }

diff --git a/src/Azos/IO/SlimReader.cs b/src/Azos/IO/SlimReader.cs
@@ -827,7 +827,7 @@ public override Data.EntityId ReadEntityId()
       var sch = ReadAtom();
       var addr = ReadString();
 
-      return new Data.EntityId(sys, typ, sch, addr);
+      return new Data.EntityId(addr, sys, typ, sch);
     }
 
     public override Data.EntityId? ReadNullableEntityId()