sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some bug fixes

Browse Source
This commit is contained in:
syuilo
2018-04-08 03:58:11 +09:00
parent a1b490afa7
commit a02ee3a08b
81 changed files with 337 additions and 1318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/authenticate.ts
View File

@ -34,7 +34,7 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
if (isNativeToken(token)) {
const user: IUser = await User
.findOne({ 'account.token': token });
.findOne({ 'token': token });
if (user === null) {
return reject('user not found');

2
src/server/api/bot/core.ts
View File

@ -226,7 +226,7 @@ class SigninContext extends Context {
}
} else {
// Compare password
const same = await bcrypt.compare(query, this.temporaryUser.account.password);
const same = await bcrypt.compare(query, this.temporaryUser.password);
if (same) {
this.bot.signin(this.temporaryUser);

10
src/server/api/bot/interfaces/line.ts
View File

@ -112,11 +112,11 @@ class LineBot extends BotCore {
data: `showtl|${user.id}`
});
if (user.account.twitter) {
if (user.twitter) {
actions.push({
type: 'uri',
label: 'Twitterアカウントを見る',
uri: `https://twitter.com/${user.account.twitter.screenName}`
uri: `https://twitter.com/${user.twitter.screenName}`
});
}
@ -174,7 +174,7 @@ module.exports = async (app: express.Application) => {
if (session == null) {
const user = await User.findOne({
host: null,
'account.line': {
'line': {
userId: sourceId
}
});
@ -184,7 +184,7 @@ module.exports = async (app: express.Application) => {
bot.on('signin', user => {
User.update(user._id, {
$set: {
'account.line': {
'line': {
userId: sourceId
}
}
@ -194,7 +194,7 @@ module.exports = async (app: express.Application) => {
bot.on('signout', user => {
User.update(user._id, {
$set: {
'account.line': {
'line': {
userId: null
}
}

2
src/server/api/common/signin.ts
View File

@ -2,7 +2,7 @@ import config from '../../../config';
export default function(res, user, redirect: boolean) {
const expires = 1000 * 60 * 60 * 24 * 365; // One Year
res.cookie('i', user.account.token, {
res.cookie('i', user.token, {
path: '/',
domain: `.${config.hostname}`,
secure: config.url.substr(0, 5) === 'https',

2
src/server/api/endpoints/following/create.ts
View File

@ -31,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
'account.profile': false
'profile': false
}
});

2
src/server/api/endpoints/following/delete.ts
View File

@ -31,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
'account.profile': false
'profile': false
}
});

8
src/server/api/endpoints/i.ts
View File

@ -5,12 +5,6 @@ import User, { pack } from '../../../models/user';
/**
* Show myself
*
* @param {any} params
* @param {any} user
* @param {any} app
* @param {Boolean} isSecure
* @return {Promise<any>}
*/
module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) => {
// Serialize
@ -22,7 +16,7 @@ module.exports = (params, user, _, isSecure) => new Promise(async (res, rej) =>
// Update lastUsedAt
User.update({ _id: user._id }, {
$set: {
'account.lastUsedAt': new Date()
lastUsedAt: new Date()
}
});
});

4
src/server/api/endpoints/i/2fa/done.ts
View File

@ -28,8 +28,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.twoFactorSecret': user.twoFactorTempSecret,
'account.twoFactorEnabled': true
'twoFactorSecret': user.twoFactorTempSecret,
'twoFactorEnabled': true
}
});

2
src/server/api/endpoints/i/2fa/register.ts
View File

@ -14,7 +14,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
const same = await bcrypt.compare(password, user.account.password);
const same = await bcrypt.compare(password, user.password);
if (!same) {
return rej('incorrect password');

6
src/server/api/endpoints/i/2fa/unregister.ts
View File

@ -11,7 +11,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
const same = await bcrypt.compare(password, user.account.password);
const same = await bcrypt.compare(password, user.password);
if (!same) {
return rej('incorrect password');
@ -19,8 +19,8 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.twoFactorSecret': null,
'account.twoFactorEnabled': false
'twoFactorSecret': null,
'twoFactorEnabled': false
}
});

4
src/server/api/endpoints/i/change_password.ts
View File

@ -22,7 +22,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (newPasswordErr) return rej('invalid newPassword param');
// Compare password
const same = await bcrypt.compare(currentPassword, user.account.password);
const same = await bcrypt.compare(currentPassword, user.password);
if (!same) {
return rej('incorrect password');
@ -34,7 +34,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.password': hash
'password': hash
}
});

4
src/server/api/endpoints/i/regenerate_token.ts
View File

@ -20,7 +20,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (passwordErr) return rej('invalid password param');
// Compare password
const same = await bcrypt.compare(password, user.account.password);
const same = await bcrypt.compare(password, user.password);
if (!same) {
return rej('incorrect password');
@ -31,7 +31,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.token': secret
'token': secret
}
});

14
src/server/api/endpoints/i/update.ts
View File

@ -29,12 +29,12 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
// Get 'location' parameter
const [location, locationErr] = $(params.location).optional.nullable.string().pipe(isValidLocation).$;
if (locationErr) return rej('invalid location param');
if (location !== undefined) user.account.profile.location = location;
if (location !== undefined) user.profile.location = location;
// Get 'birthday' parameter
const [birthday, birthdayErr] = $(params.birthday).optional.nullable.string().pipe(isValidBirthday).$;
if (birthdayErr) return rej('invalid birthday param');
if (birthday !== undefined) user.account.profile.birthday = birthday;
if (birthday !== undefined) user.profile.birthday = birthday;
// Get 'avatarId' parameter
const [avatarId, avatarIdErr] = $(params.avatarId).optional.id().$;
@ -49,12 +49,12 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
// Get 'isBot' parameter
const [isBot, isBotErr] = $(params.isBot).optional.boolean().$;
if (isBotErr) return rej('invalid isBot param');
if (isBot != null) user.account.isBot = isBot;
if (isBot != null) user.isBot = isBot;
// Get 'autoWatch' parameter
const [autoWatch, autoWatchErr] = $(params.autoWatch).optional.boolean().$;
if (autoWatchErr) return rej('invalid autoWatch param');
if (autoWatch != null) user.account.settings.autoWatch = autoWatch;
if (autoWatch != null) user.settings.autoWatch = autoWatch;
await User.update(user._id, {
$set: {
@ -62,9 +62,9 @@ module.exports = async (params, user, _, isSecure) => new Promise(async (res, re
description: user.description,
avatarId: user.avatarId,
bannerId: user.bannerId,
'account.profile': user.account.profile,
'account.isBot': user.account.isBot,
'account.settings': user.account.settings
'profile': user.profile,
'isBot': user.isBot,
'settings': user.settings
}
});

4
src/server/api/endpoints/i/update_client_setting.ts
View File

@ -22,14 +22,14 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (valueErr) return rej('invalid value param');
const x = {};
x[`account.clientSettings.${name}`] = value;
x[`clientSettings.${name}`] = value;
await User.update(user._id, {
$set: x
});
// Serialize
user.account.clientSettings[name] = value;
user.clientSettings[name] = value;
const iObj = await pack(user, user, {
detail: true,
includeSecrets: true

6
src/server/api/endpoints/i/update_home.ts
View File

@ -26,7 +26,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (home) {
await User.update(user._id, {
$set: {
'account.clientSettings.home': home
'clientSettings.home': home
}
});
@ -38,7 +38,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
} else {
if (id == null && data == null) return rej('you need to set id and data params if home param unset');
const _home = user.account.clientSettings.home;
const _home = user.clientSettings.home;
const widget = _home.find(w => w.id == id);
if (widget == null) return rej('widget not found');
@ -47,7 +47,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.clientSettings.home': _home
'clientSettings.home': _home
}
});

6
src/server/api/endpoints/i/update_mobile_home.ts
View File

@ -25,7 +25,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (home) {
await User.update(user._id, {
$set: {
'account.clientSettings.mobileHome': home
'clientSettings.mobileHome': home
}
});
@ -37,7 +37,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
} else {
if (id == null && data == null) return rej('you need to set id and data params if home param unset');
const _home = user.account.clientSettings.mobileHome || [];
const _home = user.clientSettings.mobileHome || [];
const widget = _home.find(w => w.id == id);
if (widget == null) return rej('widget not found');
@ -46,7 +46,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
await User.update(user._id, {
$set: {
'account.clientSettings.mobileHome': _home
'clientSettings.mobileHome': _home
}
});

2
src/server/api/endpoints/mute/create.ts
View File

@ -30,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
'account.profile': false
'profile': false
}
});

2
src/server/api/endpoints/mute/delete.ts
View File

@ -30,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
}, {
fields: {
data: false,
'account.profile': false
'profile': false
}
});

2
src/server/api/endpoints/notes/polls/vote.ts
View File

@ -100,7 +100,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
});
// この投稿をWatchする
if (user.account.settings.autoWatch !== false) {
if (user.settings.autoWatch !== false) {
watch(user._id, note);
}
});

2
src/server/api/endpoints/users/recommendation.ts
View File

@ -32,7 +32,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
},
$or: [
{
'account.lastUsedAt': {
'lastUsedAt': {
$gte: new Date(Date.now() - ms('7days'))
}
}, {

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

@ -37,7 +37,7 @@ export default async (req: express.Request, res: express.Response) => {
}, {
fields: {
data: false,
'account.profile': false
'profile': false
}
}) as ILocalUser;
@ -48,15 +48,13 @@ export default async (req: express.Request, res: express.Response) => {
return;
}
const account = user.account;
// Compare password
const same = await bcrypt.compare(password, account.password);
const same = await bcrypt.compare(password, password);
if (same) {
if (account.twoFactorEnabled) {
if (user.twoFactorEnabled) {
const verified = (speakeasy as any).totp.verify({
secret: account.twoFactorSecret,
secret: user.twoFactorSecret,
encoding: 'base32',
token: token
});

55
src/server/api/private/signup.ts
View File

@ -119,44 +119,29 @@ export default async (req: express.Request, res: express.Response) => {
usernameLower: username.toLowerCase(),
host: null,
hostLower: null,
account: {
keypair: generateKeypair(),
token: secret,
email: null,
links: null,
password: hash,
profile: {
bio: null,
birthday: null,
blood: null,
gender: null,
handedness: null,
height: null,
location: null,
weight: null
},
settings: {
autoWatch: true
},
clientSettings: {
home: homeData
}
keypair: generateKeypair(),
token: secret,
email: null,
links: null,
password: hash,
profile: {
bio: null,
birthday: null,
blood: null,
gender: null,
handedness: null,
height: null,
location: null,
weight: null
},
settings: {
autoWatch: true
},
clientSettings: {
home: homeData
}
});
// Response
res.send(await pack(account));
// Create search index
if (config.elasticsearch.enable) {
const es = require('../../db/elasticsearch');
es.index({
index: 'misskey',
type: 'user',
id: account._id.toString(),
body: {
username: username
}
});
}
};

10
src/server/api/service/twitter.ts
View File

@ -40,10 +40,10 @@ module.exports = (app: express.Application) => {
const user = await User.findOneAndUpdate({
host: null,
'account.token': userToken
'token': userToken
}, {
$set: {
'account.twitter': null
'twitter': null
}
});
@ -128,7 +128,7 @@ module.exports = (app: express.Application) => {
const user = await User.findOne({
host: null,
'account.twitter.userId': result.userId
'twitter.userId': result.userId
});
if (user == null) {
@ -151,10 +151,10 @@ module.exports = (app: express.Application) => {
const user = await User.findOneAndUpdate({
host: null,
'account.token': userToken
'token': userToken
}, {
$set: {
'account.twitter': {
'twitter': {
accessToken: result.accessToken,
accessTokenSecret: result.accessTokenSecret,
userId: result.userId,

2
src/server/api/stream/home.ts
View File

@ -74,7 +74,7 @@ export default async function(request: websocket.request, connection: websocket.
// Update lastUsedAt
User.update({ _id: user._id }, {
$set: {
'account.lastUsedAt': new Date()
'lastUsedAt': new Date()
}
});
break;

2
src/server/api/streaming.ts
View File

@ -97,7 +97,7 @@ function authenticate(token: string): Promise<IUser> {
const user: IUser = await User
.findOne({
host: null,
'account.token': token
'token': token
});
resolve(user);