fixed #125

fixed #146

Author: daisukenishino2

root/files/resource/MultiPurposeAuthSite/Sql/pstgrs/Create_UserStore.sql

@@ -106,6 +106,17 @@ CREATE TABLE FIDO2Data(
     CONSTRAINT PK_FIDO2Data PRIMARY KEY (PublicKeyId)
 );
 
+CREATE TABLE DeviceAuthZData(
+    Id serial NOT NULL,                               -- PK (キー長に問題があるためId intを使用)
+    DeviceCode varchar(38) NOT NULL,                  -- device_code(guid)
+    UserCode varchar(10) NOT NULL,                    -- user_code(10文字以下)
+    AuthReqExp bigint NOT NULL,                       -- UNIX時刻(long)
+    TempData varchar(256) NOT NULL,                   -- TempData
+    AuthZCode varchar(64) NULL,                       -- AuthZCode
+    Result boolean NULL,                              -- Result of Verify
+    CONSTRAINT PK_DeviceAuthZData PRIMARY KEY (Id)
+);
+
 CREATE TABLE CibaData(
     Id serial NOT NULL,                               -- PK (キー長に問題があるためId intを使用)
     ClientNotificationToken varchar(800) NOT NULL,    -- 乱数(800)
@@ -148,6 +159,9 @@ CREATE UNIQUE INDEX ClientIDIndex ON Users (ClientID);
 ---- Roles
 CREATE UNIQUE INDEX RoleNameIndex ON Roles (Name);
 CREATE UNIQUE INDEX NormalizedNameIndex ON Roles (NormalizedName);
+---- DeviceAuthZData
+CREATE UNIQUE INDEX DeviceAuthZDeviceCodeIndex ON CibaData (DeviceAuthZData);
+CREATE UNIQUE INDEX DeviceAuthZUserCodeIndex ON CibaData (DeviceAuthZData);
 ---- CibaData
 CREATE UNIQUE INDEX CibaClientNotificationTokenIndex ON CibaData (ClientNotificationToken);
 CREATE UNIQUE INDEX CibaAuthReqIdIndex ON CibaData (AuthReqId);

root/programs/CommonLibrary/Data/CmnUserStore.cs

@@ -31,6 +31,7 @@
 //*  2018/12/04  西野 大介         新規
 //*  2020/02/27  西野 大介         DeviceToken追加(プッシュ通知)
 //*  2020/07/22  西野 大介         クリーンアーキテクチャ維持or放棄 → 放棄
+//*  2020/12/23  西野 大介         NormalizedUserNamenの所、userName.ToUpper()
 //**********************************************************************************
 
 using MultiPurposeAuthSite.Co;
@@ -380,7 +381,7 @@ public static ApplicationUser FindByName(string userName)
                                             "SELECT * FROM [Users] WHERE [UserName] = @userName", new { userName = userName });
 #else
                                         users = cnn.Query<ApplicationUser>(
-                                            "SELECT * FROM [Users] WHERE [NormalizedUserName] = @userName", new { userName = userName });
+                                            "SELECT * FROM [Users] WHERE [NormalizedUserName] = @userName", new { userName = userName.ToUpper() });
 #endif
                                         break;
 
@@ -390,7 +391,7 @@ public static ApplicationUser FindByName(string userName)
                                             "SELECT * FROM \"Users\" WHERE \"UserName\" = :userName", new { userName = userName });
 #else
                                         users = cnn.Query<ApplicationUser>(
-                                            "SELECT * FROM \"Users\" WHERE \"NormalizedUserName\" = :userName", new { userName = userName });
+                                            "SELECT * FROM \"Users\" WHERE \"NormalizedUserName\" = :userName", new { userName = userName.ToUpper() });
 #endif
                                         break;
 
@@ -400,7 +401,7 @@ public static ApplicationUser FindByName(string userName)
                                             "SELECT * FROM \"users\" WHERE \"username\" = :userName", new { userName = userName });
 #else
                                         users = cnn.Query<ApplicationUser>(
-                                            "SELECT * FROM \"users\" WHERE \"normalizedusername\" = :userName", new { userName = userName });
+                                            "SELECT * FROM \"users\" WHERE \"normalizedusername\" = :userName", new { userName = userName.ToUpper() });
 #endif
                                         break;
                                 }