fix: [app,server] fixed #194

seknox · Nov 27, 2020 · 99be3d7 · 99be3d7
1 parent 5ccc846
commit 99be3d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/utils/icons.js b/app/utils/icons.js
@@ -30,6 +30,6 @@ export const iconName = (name) =>
     'weibo',
     'wordpress',
     'youtube',
-  ].includes(name.toLowerCase())
-    ? name.toLowerCase()
+  ].includes(name?.toLowerCase())
+    ? name?.toLowerCase()
     : 'lock';
diff --git a/server/api/auth/hTfa.go b/server/api/auth/hTfa.go
@@ -298,9 +298,14 @@ func handleIntentResponse(req TfaRequest, user *models.User, deviceID, browserID
 		userWithPass, err := Store.GetLoginDetails(user.Email, "")
 		if err != nil {
 			logrus.Error(err)
+			return "failed", consts.REASON_USER_NOT_FOUND, "DashboardLogin", "", ""
 		}
 		resp := devices.EnrolDeviceFunc(*user)
 		resp.OrgName = userWithPass.OrgName
+		resp.Account = userWithPass.Email
+		if resp.Account == "" {
+			resp.Account = userWithPass.UserName
+		}
 		return "success", "", consts.AUTH_RESP_ENROL_DEVICE, "", resp
 	case consts.AUTH_REQ_CHANGE_PASS:
 		verifyToken := utils.GetRandomString(7)