strictNullChecks (#4666)

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

2 files changed, 5 insertions, 4 deletions

diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts
index fe2e5577c2..676546f2aa 100644
--- a/src/server/api/private/signin.ts
+++ b/src/server/api/private/signin.ts
@@ -7,6 +7,7 @@ import config from '../../../config';
 import { Users, Signins, UserProfiles } from '../../../models';
 import { ILocalUser } from '../../../models/entities/user';
 import { genId } from '../../../misc/gen-id';
+import { ensure } from '../../../prelude/ensure';
 
 export default async (ctx: Koa.BaseContext) => {
 	ctx.set('Access-Control-Allow-Origin', config.url);
@@ -45,10 +46,10 @@ export default async (ctx: Koa.BaseContext) => {
 		return;
 	}
 
-	const profile = await UserProfiles.findOne({ userId: user.id });
+	const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
 
 	// Compare password
-	const same = await bcrypt.compare(password, profile.password);
+	const same = await bcrypt.compare(password, profile.password!);
 
 	if (same) {
 		if (profile.twoFactorEnabled) {
diff --git a/src/server/api/private/signup.ts b/src/server/api/private/signup.ts
index 03d83efd94..ea4df060f8 100644
--- a/src/server/api/private/signup.ts
+++ b/src/server/api/private/signup.ts
@@ -21,7 +21,7 @@ export default async (ctx: Koa.BaseContext) => {
 
 	// Verify recaptcha
 	// ただしテスト時はこの機構は障害となるため無効にする
-	if (process.env.NODE_ENV !== 'test' && instance.enableRecaptcha) {
+	if (process.env.NODE_ENV !== 'test' && instance.enableRecaptcha && instance.recaptchaSecretKey) {
 		recaptcha.init({
 			secret_key: instance.recaptchaSecretKey
 		});
@@ -100,7 +100,7 @@ export default async (ctx: Koa.BaseContext) => {
 			e ? j(e) : s([publicKey, privateKey])
 		));
 
-	let account: User;
+	let account!: User;
 
 	// Start transaction
 	await getConnection().transaction(async transactionalEntityManager => {