## Bug fixed

・２段階認証有効時に、期限切れのパスワードの再設定がエラーとなる問題の解消。
Implem · Nov 29, 2024 · f6867d8 · f6867d8
1 parent 03f8a60
commit f6867d8
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 41 deletions.
diff --git a/Implem.CodeDefiner/Implem.CodeDefiner.csproj b/Implem.CodeDefiner/Implem.CodeDefiner.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
     <Description>This program does the automatic code creation and merging of existing code based on the definition. Also it will make the configuration change of sql server database.</Description>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 

diff --git a/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj b/Implem.DefinitionAccessor/Implem.DefinitionAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj b/Implem.DisplayAccessor/Implem.DisplayAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Factory/Implem.Factory.csproj b/Implem.Factory/Implem.Factory.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Libraries/Implem.Libraries.csproj b/Implem.Libraries/Implem.Libraries.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj b/Implem.ParameterAccessor/Implem.ParameterAccessor.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Implem.Pleasanter.sln b/Implem.Pleasanter.sln
@@ -18,6 +18,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C3803F6D-E5AE-44CC-AE9F-C907441572A4}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		global.json = global.json
 		LICENSE = LICENSE
 		README.md = README.md
 		README_Pleasanter.md = README_Pleasanter.md

diff --git a/Implem.Pleasanter/Implem.Pleasanter.csproj b/Implem.Pleasanter/Implem.Pleasanter.csproj
@@ -5,9 +5,9 @@
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
     <Description>Business application platform</Description>
     <AssemblyName>Implem.Pleasanter</AssemblyName>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
@@ -77,6 +77,10 @@
     <PackageReference Include="Sustainsys.Saml2.AspNetCore2" Version="2.10.0" />
     <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
     <PackageReference Include="System.DirectoryServices" Version="8.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Implem.Pleasanter/wwwroot/scripts/_form.js b/Implem.Pleasanter/wwwroot/scripts/_form.js
@@ -65,11 +65,11 @@ $p.send = function ($control, formId, _async, clearMessage) {
     var url = action !== undefined
         ? $form.attr('action').replace('_action_', action.toLowerCase())
         : location.href;
-    url += $p.isAuthenticationByMail();
+    url = $p.addAuthenticationByMailParameter(url);
     var fieldSetTab = $('li[role="tab"][aria-selected=true][aria-controls^=FieldSetTab]');
     var selectedTabIndex = fieldSetTab.parent().children().index(fieldSetTab);
     if (selectedTabIndex > 0) {
-        url += ((url + '').indexOf('?') > -1 ? '&' : '?') + "TabIndex=" + selectedTabIndex;
+        url = $p.addUrlParameter(url, 'TabIndex', selectedTabIndex);
     }
     _async = _async !== undefined ? _async : true;
     if (methodType !== 'get') {
@@ -114,6 +114,10 @@ $p.setFormChanged = function ($control) {
     }
 }
 
+$p.addUrlParameter = function (url, key, value) {
+    return url + ((url + '').indexOf('?') > -1 ? '&' : '?') + key + "=" + value;
+}
+
 $p.throttle = (function () {
     var lastTime = 0;
     return function (action, interval) {

diff --git a/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js b/Implem.Pleasanter/wwwroot/scripts/authenticatebymail.js
@@ -9,10 +9,10 @@
     });
 }
 
-$p.isAuthenticationByMail = function () {
+$p.addAuthenticationByMailParameter = function (url) {
     if ($('#AuthenticationByMail').length) {
-        return '&isAuthenticationByMail=' + $('#AuthenticationByMail').data('isauthenticationbymail');
+        return $p.addUrlParameter(url, 'isAuthenticationByMail', $('#AuthenticationByMail').data('isauthenticationbymail'));
     } else {
-        return '';
+        return url;
     }
 }
diff --git a/Implem.TestAutomation/implem.TestAutomation.csproj b/Implem.TestAutomation/implem.TestAutomation.csproj
@@ -4,9 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>  
   </PropertyGroup>
 
@@ -32,6 +32,10 @@
     <PackageReference Include="Selenium.WebDriver.MSEdgeDriver" Version="129.0.2792.65" />
     <PackageReference Include="Selenium.WebDriverBackedSelenium" Version="4.1.0" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+    <PackageReference Include="System.Drawing.Common" Version="4.7.3" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/Rds/Implem.IRds/Implem.IRds.csproj b/Rds/Implem.IRds/Implem.IRds.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Rds/Implem.MySql/Implem.MySql.csproj b/Rds/Implem.MySql/Implem.MySql.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj b/Rds/Implem.PostgreSql/Implem.PostgreSql.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/Rds/Implem.SqlServer/Implem.SqlServer.csproj b/Rds/Implem.SqlServer/Implem.SqlServer.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <Copyright>Copyright © Implem Inc 2014 - 2024</Copyright>
-    <AssemblyVersion>1.4.10.2</AssemblyVersion>
-    <FileVersion>1.4.10.2</FileVersion>
-    <Version>1.4.10.2</Version>
+    <AssemblyVersion>1.4.10.3</AssemblyVersion>
+    <FileVersion>1.4.10.3</FileVersion>
+    <Version>1.4.10.3</Version>
     <Nullable>disable</Nullable>
   </PropertyGroup>