sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
syuilo
2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/api/private/signin.ts
View File

@@ -32,7 +32,7 @@ export default async (req: express.Request, res: express.Response) => {
// Fetch user
const user: IUser = await User.findOne({
username_lower: username.toLowerCase(),
usernameLower: username.toLowerCase(),
host: null
}, {
fields: {
@@ -54,9 +54,9 @@ export default async (req: express.Request, res: express.Response) => {
const same = await bcrypt.compare(password, account.password);
if (same) {
if (account.two_factor_enabled) {
if (account.twoFactorEnabled) {
const verified = (speakeasy as any).totp.verify({
secret: account.two_factor_secret,
secret: account.twoFactorSecret,
encoding: 'base32',
token: token
});
@@ -79,8 +79,8 @@ export default async (req: express.Request, res: express.Response) => {
// Append signin history
const record = await Signin.insert({
created_at: new Date(),
user_id: user._id,
createdAt: new Date(),
userId: user._id,
ip: req.ip,
headers: req.headers,
success: same