From 8f39655fef4d66fb4a5d645b97e3a23cc7865272 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 7 Nov 2018 12:09:24 +0900 Subject: [PATCH] Fix bug --- src/client/app/common/views/components/signup.vue | 6 +++--- src/server/api/endpoints/meta.ts | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/client/app/common/views/components/signup.vue b/src/client/app/common/views/components/signup.vue index d743202c2..42d6d23fb 100644 --- a/src/client/app/common/views/components/signup.vue +++ b/src/client/app/common/views/components/signup.vue @@ -35,7 +35,7 @@

%i18n:@password-not-matched%

-
+
%i18n:@create% @@ -130,7 +130,7 @@ export default Vue.extend({ username: this.username, password: this.password, invitationCode: this.invitationCode, - 'g-recaptcha-response': this.meta.recaptchaSiteKey != null ? (window as any).grecaptcha.getResponse() : null + 'g-recaptcha-response': this.meta.enableRecaptcha ? (window as any).grecaptcha.getResponse() : null }, true).then(() => { (this as any).api('signin', { username: this.username, @@ -141,7 +141,7 @@ export default Vue.extend({ }).catch(() => { alert('%i18n:@some-error%'); - if (this.meta.recaptchaSiteKey != null) { + if (this.meta.enableRecaptcha) { (window as any).grecaptcha.reset(); } }); diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index ae07b944c..311e3d669 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -60,7 +60,8 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => { driveCapacityPerLocalUserMb: instance.localDriveCapacityMb, driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb, cacheRemoteFiles: instance.cacheRemoteFiles, - recaptchaSiteKey: instance.enableRecaptcha ? instance.recaptchaSiteKey : null, + enableRecaptcha: instance.enableRecaptcha, + recaptchaSiteKey: instance.recaptchaSiteKey, swPublickey: config.sw ? config.sw.public_key : null, bannerUrl: instance.bannerUrl, maxNoteTextLength: instance.maxNoteTextLength,