Merge branch 'main' into fix/IdentityClaim

masastack · May 7, 2024 · 9b54080 · 9b54080
2 parents 8c36cbe + 007387c
commit 9b54080
Show file tree

Hide file tree

Showing 286 changed files with 17 additions and 5,266 deletions.
diff --git a/src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/MasaException.cs b/src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/MasaException.cs
@@ -91,6 +91,14 @@ public MasaException(string errorCode, LogLevel? logLevel, params object[] param
     {
     }
 
+    public MasaException(string message, Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
+        : base(message, innerException)
+    {
+        _errorCode = errorCode;
+        _parameters = parameters;
+        _logLevel = logLevel;
+    }
+
     public MasaException(Exception? innerException, string errorCode, LogLevel? logLevel = null, params object[] parameters)
         : base(null, innerException)
     {

diff --git a/src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/UserFriendlyException.cs b/src/BuildingBlocks/Exception/Masa.BuildingBlocks.Exceptions/UserFriendlyException.cs
@@ -33,6 +33,15 @@ public UserFriendlyException(
     {
     }
 
+    public UserFriendlyException(
+        string errorCode,
+        string message,
+        LogLevel? logLevel,
+        params object[] parameters)
+        : base(message, null, errorCode, logLevel, parameters)
+    {
+    }
+
     public UserFriendlyException(
         Exception? innerException,
         string errorCode,

diff --git a/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/CacheKeyConsts.cs b/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/CacheKeyConsts.cs
diff --git a/...StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/IdentityClaimConsts.cs b/...StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/IdentityClaimConsts.cs
diff --git a/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/PropertyConsts.cs b/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Consts/PropertyConsts.cs
diff --git a/...s/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/AuthenticationTypes.cs b/...s/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/AuthenticationTypes.cs
diff --git a/...ingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/GenderTypes.cs b/...ingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/GenderTypes.cs
diff --git a/...gBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/PasswordTypes.cs b/...gBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/PasswordTypes.cs
diff --git a/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/RegisterFieldTypes.cs b/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/RegisterFieldTypes.cs
diff --git a/...Blocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SendEmailTypes.cs b/...Blocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SendEmailTypes.cs
diff --git a/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SendMsgCodeTypes.cs b/...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SendMsgCodeTypes.cs
diff --git a/...dingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/StaffTypes.cs b/...dingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/StaffTypes.cs
diff --git a/...ngBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SubjectTypes.cs b/...ngBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/SubjectTypes.cs
diff --git a/...ldingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/TeamTypes.cs b/...ldingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/TeamTypes.cs
diff --git a/...s/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/ThirdPartyIdpLoginResultTypes.cs b/...s/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/ThirdPartyIdpLoginResultTypes.cs
diff --git a/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/ThirdPartyIdpTypes.cs b/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/ThirdPartyIdpTypes.cs
diff --git a/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/UserRegisterTypes.cs b/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Enum/UserRegisterTypes.cs
diff --git a/...ildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj b/...ildingBlocks.StackSdks.Auth.Contracts/Masa.BuildingBlocks.StackSdks.Auth.Contracts.csproj
diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/MasaUser.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/MasaUser.cs
diff --git a/...ackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddThirdPartyUserModel.cs b/...ackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddThirdPartyUserModel.cs
diff --git a/...gBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddUserModel.cs b/...gBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddUserModel.cs
diff --git a/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddressValueModel.cs b/...ks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AddressValueModel.cs
diff --git a/...ldingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AppModel.cs b/...ldingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/AppModel.cs
diff --git a/...s/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/BindUserRolesModel.cs b/...s/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/BindUserRolesModel.cs
diff --git a/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/CollectMenuModel.cs b/...cks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/CollectMenuModel.cs