feat: fix user cannot logout issue about bug in GetSessionToken()

* feat: add FaceIdSigninBegin() to verify user information before face login

* Update face.go

---------

Co-authored-by: Eric Luo <hsluoyz@qq.com>

authz/authz.go

@@ -98,6 +98,7 @@ p, *, *, GET, /api/get-all-objects, *, *
 p, *, *, GET, /api/get-all-actions, *, *
 p, *, *, GET, /api/get-all-roles, *, *
 p, *, *, GET, /api/get-invitation-info, *, *
+p, *, *, GET, /api/faceid-signin-begin, *, *
 `
 
 		sa := stringadapter.NewAdapter(ruleText)

controllers/account.go

@@ -307,6 +307,7 @@ func (c *ApiController) Logout() {
 		}
 
 		c.ClearUserSession()
+		c.ClearTokenSession()
 		owner, username := util.GetOwnerAndNameFromId(user)
 		_, err := object.DeleteSessionId(util.GetSessionId(owner, username, object.CasdoorApplication), c.Ctx.Input.CruSession.SessionID())
 		if err != nil {
@@ -353,6 +354,7 @@ func (c *ApiController) Logout() {
 		}
 
 		c.ClearUserSession()
+		c.ClearTokenSession()
 		// TODO https://github.com/casdoor/casdoor/pull/1494#discussion_r1095675265
 		owner, username := util.GetOwnerAndNameFromId(user)
 
@@ -433,6 +435,17 @@ func (c *ApiController) GetAccount() {
 		return
 	}
 
+	accessToken := c.GetSessionToken()
+	if accessToken == "" {
+		accessToken, err = object.GetAccessTokenByUser(user, c.Ctx.Request.Host)
+		if err != nil {
+			c.ResponseError(err.Error())
+			return
+		}
+		c.SetSessionToken(accessToken)
+	}
+	u.AccessToken = accessToken
+
 	resp := Response{
 		Status: "ok",
 		Sub:    user.Id,

controllers/base.go

@@ -122,6 +122,15 @@ func (c *ApiController) GetSessionUsername() string {
 	return user.(string)
 }
 
+func (c *ApiController) GetSessionToken() string {
+	accessToken := c.GetSession("accessToken")
+	if accessToken == nil {
+		return ""
+	}
+
+	return accessToken.(string)
+}
+
 func (c *ApiController) GetSessionApplication() *object.Application {
 	clientId := c.GetSession("aud")
 	if clientId == nil {
@@ -141,6 +150,10 @@ func (c *ApiController) ClearUserSession() {
 	c.SetSessionData(nil)
 }
 
+func (c *ApiController) ClearTokenSession() {
+	c.SetSessionToken("")
+}
+
 func (c *ApiController) GetSessionOidc() (string, string) {
 	sessionData := c.GetSessionData()
 	if sessionData != nil &&
@@ -167,6 +180,10 @@ func (c *ApiController) SetSessionUsername(user string) {
 	c.SetSession("username", user)
 }
 
+func (c *ApiController) SetSessionToken(accessToken string) {
+	c.SetSession("accessToken", accessToken)
+}
+
 // GetSessionData ...
 func (c *ApiController) GetSessionData() *SessionData {
 	session := c.GetSession("SessionData")

controllers/face.go

@@ -0,0 +1,55 @@
+// Copyright 2024 The Casdoor Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Casdoor will expose its providers as services to SDK
+// We are going to implement those services as APIs here
+
+package controllers
+
+import (
+	"fmt"
+
+	"github.com/casdoor/casdoor/object"
+	"github.com/casdoor/casdoor/util"
+)
+
+// FaceIDSigninBegin
+// @Title FaceIDSigninBegin
+// @Tag Login API
+// @Description FaceId Login Flow 1st stage
+// @Param   owner     query    string  true        "owner"
+// @Param   name     query    string  true        "name"
+// @Success 200 {object} controllers.Response The Response object
+// @router /faceid-signin-begin [get]
+func (c *ApiController) FaceIDSigninBegin() {
+	userOwner := c.Input().Get("owner")
+	userName := c.Input().Get("name")
+
+	user, err := object.GetUserByFields(userOwner, userName)
+	if err != nil {
+		c.ResponseError(err.Error())
+		return
+	}
+	if user == nil {
+		c.ResponseError(fmt.Sprintf(c.T("general:The user: %s doesn't exist"), util.GetId(userOwner, userName)))
+		return
+	}
+
+	if len(user.FaceIds) == 0 {
+		c.ResponseError(c.T("check:Face data does not exist, cannot log in"))
+		return
+	}
+
+	c.ResponseOk()
+}

init_data.json.template

@@ -110,6 +110,11 @@
           "name": "WebAuthn",
           "displayName": "WebAuthn",
           "rule": "None"
+        },
+        {
+          "name": "Face ID",
+          "displayName": "Face ID",
+          "rule": "None"
         }
       ],
       "signupItems": [
@@ -179,8 +184,10 @@
         "refresh_token"
       ],
       "redirectUris": [
-        ""
+        "http://localhost:9000/callback"
       ],
+      "tokenFormat": "JWT",
+      "tokenFields": [],
       "expireInHours": 168,
       "failedSigninLimit": 5,
       "failedSigninFrozenTime": 15

object/application.go

@@ -311,6 +311,9 @@ func extendApplicationWithSigninMethods(application *Application) (err error) {
 			signinMethod := &SigninMethod{Name: "WebAuthn", DisplayName: "WebAuthn", Rule: "None"}
 			application.SigninMethods = append(application.SigninMethods, signinMethod)
 		}
+
+		signinMethod := &SigninMethod{Name: "Face ID", DisplayName: "Face ID", Rule: "None"}
+		application.SigninMethods = append(application.SigninMethods, signinMethod)
 	}
 
 	if len(application.SigninMethods) == 0 {

object/init.go

@@ -184,6 +184,7 @@ func initBuiltInApplication() {
 			{Name: "Password", DisplayName: "Password", Rule: "All"},
 			{Name: "Verification code", DisplayName: "Verification code", Rule: "All"},
 			{Name: "WebAuthn", DisplayName: "WebAuthn", Rule: "None"},
+			{Name: "Face ID", DisplayName: "Face ID", Rule: "None"},
 		},
 		SignupItems: []*SignupItem{
 			{Name: "ID", Visible: false, Required: true, Prompted: false, Rule: "Random"},
@@ -197,6 +198,7 @@ func initBuiltInApplication() {
 		},
 		Tags:          []string{},
 		RedirectUris:  []string{},
+		TokenFormat:   "JWT",
 		TokenFields:   []string{},
 		ExpireInHours: 168,
 		FormOffset:    2,

object/token_cas.go

@@ -261,7 +261,7 @@ func GetValidationBySaml(samlRequest string, host string) (string, string, error
 
 	ok, _, service, userId := GetCasTokenByTicket(ticket)
 	if !ok {
-		return "", "", fmt.Errorf("ticket %s found", ticket)
+		return "", "", fmt.Errorf("the CAS token for ticket %s is not found", ticket)
 	}
 
 	user, err := GetUser(userId)
@@ -270,7 +270,7 @@ func GetValidationBySaml(samlRequest string, host string) (string, string, error
 	}
 
 	if user == nil {
-		return "", "", fmt.Errorf("user %s found", userId)
+		return "", "", fmt.Errorf("the user %s is not found", userId)
 	}
 
 	application, err := GetApplicationByUser(user)
@@ -279,7 +279,7 @@ func GetValidationBySaml(samlRequest string, host string) (string, string, error
 	}
 
 	if application == nil {
-		return "", "", fmt.Errorf("application for user %s found", userId)
+		return "", "", fmt.Errorf("the application for user %s is not found", userId)
 	}
 
 	samlResponse, err := NewSamlResponse11(user, request.RequestID, host)

object/token_jwt.go

@@ -359,6 +359,10 @@ func generateJwtToken(application *Application, user *User, nonce string, scope
 	var token *jwt.Token
 	var refreshToken *jwt.Token
 
+	if application.TokenFormat == "" {
+		application.TokenFormat = "JWT"
+	}
+
 	// the JWT token length in "JWT-Empty" mode will be very short, as User object only has two properties: owner and name
 	if application.TokenFormat == "JWT" {
 		claimsWithoutThirdIdp := getClaimsWithoutThirdIdp(claims)

object/token_oauth.go

@@ -715,7 +715,7 @@ func GetWechatMiniProgramToken(application *Application, code string, host strin
 		Code:         session.SessionKey, // a trick, because miniprogram does not use the code, so use the code field to save the session_key
 		AccessToken:  accessToken,
 		RefreshToken: refreshToken,
-		ExpiresIn:    application.ExpireInHours * 60,
+		ExpiresIn:    application.ExpireInHours * hourSeconds,
 		Scope:        "",
 		TokenType:    "Bearer",
 		CodeIsUsed:   true,
@@ -726,3 +726,20 @@ func GetWechatMiniProgramToken(application *Application, code string, host strin
 	}
 	return token, nil, nil
 }
+
+func GetAccessTokenByUser(user *User, host string) (string, error) {
+	application, err := GetApplicationByUser(user)
+	if err != nil {
+		return "", err
+	}
+	if application == nil {
+		return "", fmt.Errorf("the application for user %s is not found", user.Id)
+	}
+
+	token, err := GetTokenByUser(application, user, "profile", "", host)
+	if err != nil {
+		return "", err
+	}
+
+	return token.AccessToken, nil
+}

object/user.go

@@ -98,6 +98,7 @@ type User struct {
 	PreHash           string   `xorm:"varchar(100)" json:"preHash"`
 	AccessKey         string   `xorm:"varchar(100)" json:"accessKey"`
 	AccessSecret      string   `xorm:"varchar(100)" json:"accessSecret"`
+	AccessToken       string   `xorm:"mediumtext" json:"accessToken"`
 
 	CreatedIp      string `xorm:"varchar(100)" json:"createdIp"`
 	LastSigninTime string `xorm:"varchar(100)" json:"lastSigninTime"`

routers/router.go

@@ -300,4 +300,6 @@ func initAPI() {
 	beego.Router("/cas/:organization/:application/samlValidate", &controllers.RootController{}, "POST:SamlValidate")
 
 	beego.Router("/scim/*", &controllers.RootController{}, "*:HandleScim")
+
+	beego.Router("/api/faceid-signin-begin", &controllers.ApiController{}, "GET:FaceIDSigninBegin")
 }

web/src/App.js

@@ -51,6 +51,7 @@ class App extends Component {
       classes: props,
       selectedMenuKey: 0,
       account: undefined,
+      accessToken: undefined,
       uri: null,
       themeAlgorithm: storageThemeAlgorithm,
       themeData: Conf.ThemeDefault,
@@ -228,9 +229,11 @@ class App extends Component {
     AuthBackend.getAccount(query)
       .then((res) => {
         let account = null;
+        let accessToken = null;
         if (res.status === "ok") {
           account = res.data;
           account.organization = res.data2;
+          accessToken = res.data.accessToken;
 
           this.setLanguage(account);
           this.setTheme(Setting.getThemeData(account.organization), Conf.InitThemeAlgorithm);
@@ -242,6 +245,7 @@ class App extends Component {
 
         this.setState({
           account: account,
+          accessToken: accessToken,
         });
       });
   }
@@ -256,6 +260,7 @@ class App extends Component {
     return (
       <React.Fragment>
         {!this.state.account ? null : <div style={{display: "none"}} id="CasdoorApplicationName" value={this.state.account.signupApplication} />}
+        {!this.state.account ? null : <div style={{display: "none"}} id="CasdoorAccessToken" value={this.state.accessToken} />}
         <Footer id="footer" style={
           {
             textAlign: "center",

web/src/ApplicationListPage.js

@@ -50,6 +50,7 @@ class ApplicationListPage extends BaseListPage {
         {name: "Password", displayName: "Password", rule: "All"},
         {name: "Verification code", displayName: "Verification code", rule: "All"},
         {name: "WebAuthn", displayName: "WebAuthn", rule: "None"},
+        {name: "Face ID", displayName: "Face ID", rule: "None"},
       ],
       signupItems: [
         {name: "ID", visible: false, required: true, rule: "Random"},

web/src/EntryPage.js

@@ -71,7 +71,9 @@ class EntryPage extends React.Component {
       this.props.updataThemeData(themeData);
       this.props.updateApplication(application);
 
-      localStorage.setItem("applicationName", application.name);
+      if (application) {
+        localStorage.setItem("applicationName", application.name);
+      }
     };
 
     const onUpdatePricing = (pricing) => {

web/src/UserEditPage.js

@@ -980,11 +980,11 @@ class UserEditPage extends React.Component {
       return (
         <Row style={{marginTop: "20px"}} >
           <Col style={{marginTop: "5px"}} span={(Setting.isMobile()) ? 22 : 2}>
-            {Setting.getLabel(i18next.t("user:Face ids"), i18next.t("user:Face ids"))} :
+            {Setting.getLabel(i18next.t("user:Face IDs"), i18next.t("user:Face IDs"))} :
           </Col>
           <Col span={22} >
             <FaceIdTable
-              title={i18next.t("user:Face ids")}
+              title={i18next.t("user:Face IDs")}
               table={this.state.user.faceIds}
               onUpdateTable={(table) => {this.updateUserField("faceIds", table);}}
             />

web/src/auth/LoginPage.js

@@ -346,10 +346,28 @@ class LoginPage extends React.Component {
       return;
     }
     if (this.state.loginMethod === "faceId") {
-      this.setState({
-        openFaceRecognitionModal: true,
-        values: values,
-      });
+      let username = this.state.username;
+      if (username === null || username === "") {
+        username = values["username"];
+      }
+      const application = this.getApplicationObj();
+      fetch(`${Setting.ServerUrl}/api/faceid-signin-begin?owner=${application.organization}&name=${username}`, {
+        method: "GET",
+        credentials: "include",
+        headers: {
+          "Accept-Language": Setting.getAcceptLanguage(),
+        },
+      }).then(res => res.json())
+        .then((res) => {
+          if (res.status === "error") {
+            Setting.showMessage("error", res.msg);
+            return;
+          }
+          this.setState({
+            openFaceRecognitionModal: true,
+            values: values,
+          });
+        });
       return;
     }
     if (this.state.loginMethod === "password" || this.state.loginMethod === "ldap") {
@@ -666,7 +684,8 @@ class LoginPage extends React.Component {
           >
             {
               this.state.loginMethod === "webAuthn" ? i18next.t("login:Sign in with WebAuthn") :
-                i18next.t("login:Sign In")
+                this.state.loginMethod === "faceId" ? i18next.t("login:Sign in with Face ID") :
+                  i18next.t("login:Sign In")
             }
           </Button>
           {
@@ -1066,7 +1085,12 @@ class LoginPage extends React.Component {
     application?.signinMethods?.forEach((signinMethod) => {
       const item = itemsMap.get(generateItemKey(signinMethod.name, signinMethod.rule));
       if (item) {
-        const label = signinMethod.name === signinMethod.displayName ? item.label : signinMethod.displayName;
+        let label = signinMethod.name === signinMethod.displayName ? item.label : signinMethod.displayName;
+
+        if (application?.signinMethods?.length >= 4 && label === "Verification code") {
+          label = "Code";
+        }
+
         items.push({label: label, key: item.key});
       }
     });

web/src/locales/ar/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/de/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Umleitung, bitte warten.",
     "Sign In": "Anmelden",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Melden Sie sich mit WebAuthn an",
     "Sign in with {type}": "Melden Sie sich mit {type} an",
     "Signing in...": "Anmelden...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "E-Mail-/Telefon-Zurücksetzung erfolgreich durchgeführt",
     "Empty input!": "Leere Eingabe!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Startseite des Benutzers",

web/src/locales/en/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/es/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirigiendo, por favor espera.",
     "Sign In": "Iniciar sesión",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Iniciar sesión con WebAuthn",
     "Sign in with {type}": "Inicia sesión con {tipo}",
     "Signing in...": "Iniciando sesión...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Restablecimiento de correo electrónico/teléfono exitoso",
     "Empty input!": "¡Entrada vacía!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Página de inicio del usuario",

web/src/locales/fa/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/fi/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/fr/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Veuillez entrer une organisation pour vous connecter",
     "Redirecting, please wait.": "Redirection en cours, veuillez patienter.",
     "Sign In": "Se connecter",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Connectez-vous avec WebAuthn",
     "Sign in with {type}": "Connectez-vous avec {type}",
     "Signing in...": "Connexion en cours...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "E-mail ou téléphone réinitialisé avec succès",
     "Empty input!": "Champ vide !",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Genre",
     "Gender - Tooltip": "Genre - Infobulle",
     "Homepage": "Site web",

web/src/locales/he/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/id/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Mengalihkan, harap tunggu.",
     "Sign In": "Masuk",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Masuk dengan WebAuthn",
     "Sign in with {type}": "Masuk dengan {type}",
     "Signing in...": "Masuk...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/telepon berhasil diatur ulang",
     "Empty input!": "Masukan kosong!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/it/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/ja/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "リダイレクト中、お待ちください。",
     "Sign In": "サインイン",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "WebAuthnでサインインしてください",
     "Sign in with {type}": "{type}でサインインしてください",
     "Signing in...": "サインイン中...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "メール/電話のリセットが成功しました",
     "Empty input!": "空の入力！",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "ユーザーのホームページ",

web/src/locales/kk/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/ko/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "리디렉팅 중입니다. 잠시 기다려주세요.",
     "Sign In": "로그인",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "WebAuthn으로 로그인하세요",
     "Sign in with {type}": "{type}로 로그인하세요",
     "Signing in...": "로그인 중...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "이메일/전화 초기화가 성공적으로 완료되었습니다",
     "Empty input!": "빈 입력!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "사용자의 홈페이지",

web/src/locales/ms/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/nl/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/pl/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/pt/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecionando, por favor aguarde.",
     "Sign In": "Entrar",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Entrar com WebAuthn",
     "Sign in with {type}": "Entrar com {type}",
     "Signing in...": "Entrando...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Redefinição de e-mail/telefone com sucesso",
     "Empty input!": "Entrada vazia!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gênero",
     "Gender - Tooltip": "Gênero - Tooltip",
     "Homepage": "Página inicial",

web/src/locales/ru/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Перенаправление, пожалуйста, подождите.",
     "Sign In": "Войти",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Войти с помощью WebAuthn",
     "Sign in with {type}": "Войти с помощью {type}",
     "Signing in...": "Вход в систему...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Электронная почта / номер телефона успешно сброшены",
     "Empty input!": "Пустой ввод!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Главная страница пользователя",

web/src/locales/sv/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/tr/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Yönlendiriliyor, lütfen bekleyiniz.",
     "Sign In": "Oturum aç",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "{type} ile giriş yap",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/uk/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Redirecting, please wait.",
     "Sign In": "Sign In",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Sign in with WebAuthn",
     "Sign in with {type}": "Sign in with {type}",
     "Signing in...": "Signing in...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Email/phone reset successfully",
     "Empty input!": "Empty input!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Homepage",

web/src/locales/vi/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "Please type an organization to sign in",
     "Redirecting, please wait.": "Đang chuyển hướng, vui lòng đợi.",
     "Sign In": "Đăng nhập",
+    "Sign in with Face ID": "Sign in with Face ID",
     "Sign in with WebAuthn": "Đăng nhập với WebAuthn",
     "Sign in with {type}": "Đăng nhập bằng {type}",
     "Signing in...": "Đăng nhập...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "Đặt lại email/điện thoại thành công",
     "Empty input!": "Đầu vào trống!",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "Gender",
     "Gender - Tooltip": "Gender - Tooltip",
     "Homepage": "Trang chủ của người dùng",

web/src/locales/zh/data.json

@@ -494,6 +494,7 @@
     "Please type an organization to sign in": "请输入要登录的组织",
     "Redirecting, please wait.": "正在跳转, 请稍等.",
     "Sign In": "登录",
+    "Sign in with Face ID": "人脸登录",
     "Sign in with WebAuthn": "WebAuthn登录",
     "Sign in with {type}": "{type}登录",
     "Signing in...": "正在登录...",
@@ -1081,7 +1082,7 @@
     "Email/phone reset successfully": "邮箱或手机号重置成功",
     "Empty input!": "输入为空！",
     "Face ID": "Face ID",
-    "Face ids": "Face ids",
+    "Face IDs": "Face IDs",
     "Gender": "性别",
     "Gender - Tooltip": "性别 - Tooltip",
     "Homepage": "个人主页",

web/src/table/FaceIdTable.js

@@ -96,7 +96,7 @@ class FaceIdTable extends React.Component {
       <Table scroll={{x: "max-content"}} columns={columns} dataSource={this.props.table} size="middle" bordered pagination={false}
         title={() => (
           <div>
-            {i18next.t("user:Face ids")}&nbsp;&nbsp;&nbsp;&nbsp;
+            {i18next.t("user:Face IDs")}&nbsp;&nbsp;&nbsp;&nbsp;
             <Button disabled={this.props.table?.length >= 5} style={{marginRight: "5px"}} type="primary" size="small" onClick={() => this.setState({openFaceRecognitionModal: true})}>
               {i18next.t("general:Add Face Id")}
             </Button>