Merge branch 'master' into greenkeeper/@types/serve-favicon-2.2.29

2 files changed, 6 insertions, 6 deletions

diff --git a/src/api/private/signin.ts b/src/api/private/signin.ts
index afa83e50c3..c7dc243980 100644
--- a/src/api/private/signin.ts
+++ b/src/api/private/signin.ts
@@ -1,6 +1,6 @@
 import * as express from 'express';
 import * as bcrypt from 'bcryptjs';
-import User from '../models/user';
+import { default as User, IUser } from '../models/user';
 import Signin from '../models/signin';
 import serialize from '../serializers/signin';
 import event from '../event';
@@ -23,7 +23,7 @@ export default async (req: express.Request, res: express.Response) => {
 	}
 
 	// Fetch user
-	const user = await User.findOne({
+	const user: IUser = await User.findOne({
 		username_lower: username.toLowerCase()
 	}, {
 		fields: {
diff --git a/src/api/private/signup.ts b/src/api/private/signup.ts
index 2375c22845..bcc17a876d 100644
--- a/src/api/private/signup.ts
+++ b/src/api/private/signup.ts
@@ -1,10 +1,10 @@
 import * as express from 'express';
 import * as bcrypt from 'bcryptjs';
-import rndstr from 'rndstr';
 import recaptcha = require('recaptcha-promise');
-import User from '../models/user';
+import { default as User, IUser } from '../models/user';
 import { validateUsername, validatePassword } from '../models/user';
 import serialize from '../serializers/user';
+import generateUserToken from '../common/generate-native-user-token';
 import config from '../../conf';
 
 recaptcha.init({
@@ -58,10 +58,10 @@ export default async (req: express.Request, res: express.Response) => {
 	const hash = bcrypt.hashSync(password, salt);
 
 	// Generate secret
-	const secret = `!${rndstr('a-zA-Z0-9', 32)}`;
+	const secret = generateUserToken();
 
 	// Create account
-	const account = await User.insert({
+	const account: IUser = await User.insert({
 		token: secret,
 		avatar_id: null,
 		banner_id: null,