diff --git a/Services/DataX.Flow/Flow.ManagementService/appsettings.json b/Services/DataX.Flow/Flow.ManagementService/appsettings.json index 982e5b08a..dcb43303a 100644 --- a/Services/DataX.Flow/Flow.ManagementService/appsettings.json +++ b/Services/DataX.Flow/Flow.ManagementService/appsettings.json @@ -19,7 +19,7 @@ } }, "JwtBearerOptions": { - "Audience": "APPID", - "Authority": "APP AUTHORITY/JWT ISS" + "Audience": "6d4ee66c-3c1e-4693-86b1-2aff3e1cc47a", + "Authority": "https://login.windows.net/microsoft.com" } } \ No newline at end of file diff --git a/Services/DataX.Flow/Flow.ManagementService/local.db b/Services/DataX.Flow/Flow.ManagementService/local.db new file mode 100644 index 000000000..7e442cd63 Binary files /dev/null and b/Services/DataX.Flow/Flow.ManagementService/local.db differ diff --git a/Services/DataX.ServiceHost/DataX.ServiceHost.AspNetCore/Authorization/DataXPolicyBuilder.cs b/Services/DataX.ServiceHost/DataX.ServiceHost.AspNetCore/Authorization/DataXPolicyBuilder.cs index 492e17fcc..dd15632f3 100644 --- a/Services/DataX.ServiceHost/DataX.ServiceHost.AspNetCore/Authorization/DataXPolicyBuilder.cs +++ b/Services/DataX.ServiceHost/DataX.ServiceHost.AspNetCore/Authorization/DataXPolicyBuilder.cs @@ -51,7 +51,13 @@ private AuthorizationPolicyBuilder AddDataXRequirements(Autho Settings = _settings }; - policy.RequireAuthenticatedUser(); + + if (!_settings.EnableOneBox) + { + policy.RequireAuthenticatedUser(); + } + + policy.AddRequirements(requirement); _configurePolicy?.Invoke(policy); diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs new file mode 100644 index 000000000..51b486b60 --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyTitleAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache new file mode 100644 index 000000000..4806b545e --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +ddf4dff5977667b2d8a961c06e96702ee468021d diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache new file mode 100644 index 000000000..e2cfb43ee --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Debug/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +c5d178742e491dcb97c2aa3ee47dfc87ae0c20ac diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs new file mode 100644 index 000000000..26df24f2a --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyProductAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyTitleAttribute("DataX.Utility.CodeSign")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache new file mode 100644 index 000000000..01f5a920a --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +5a0711eb30e039d6556a4c027224de09a19b31e8 diff --git a/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache new file mode 100644 index 000000000..dfa9188c3 --- /dev/null +++ b/Website/Website/deploy/DataX.Utilities/DataX.Utility.CodeSign/obj/Release/netcoreapp2.1/DataX.Utility.CodeSign.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +157d3a35bbd4d6b3a6dd9359dd0b2e198fb61786