Merge branch 'develop'

3 files changed, 34 insertions, 0 deletions

diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue
index 3ac4d6d721..72ae3384b5 100644
--- a/src/client/app/admin/views/instance.vue
+++ b/src/client/app/admin/views/instance.vue
@@ -165,6 +165,10 @@
 				</ui-horizon-group>
 			</template>
 		</section>
+		<section v-if="enableRecaptcha && recaptchaSiteKey">
+			<header>{{ $t('recaptcha-preview') }}</header>
+			<div ref="recaptcha" style="margin: 16px 0 0 0;" :key="recaptchaSiteKey"></div>
+		</section>
 		<section>
 			<ui-button @click="updateMeta"><fa :icon="faSave"/> {{ $t('save') }}</ui-button>
 		</section>
@@ -376,6 +380,34 @@ export default Vue.extend({
 		});
 	},
 
+	mounted() {
+		const renderRecaptchaPreview = () => {
+			if (!(window as any).grecaptcha) return;
+			if (!this.$refs.recaptcha) return;
+			if (!this.recaptchaSiteKey) return;
+			(window as any).grecaptcha.render(this.$refs.recaptcha, {
+				sitekey: this.recaptchaSiteKey
+			});
+		};
+
+		window.onRecaotchaLoad = () => {
+			renderRecaptchaPreview();
+		};
+
+		const head = document.getElementsByTagName('head')[0];
+		const script = document.createElement('script');
+		script.setAttribute('src', 'https://www.google.com/recaptcha/api.js?onload=onRecaotchaLoad');
+		head.appendChild(script);
+
+		this.$watch('enableRecaptcha', () => {
+			renderRecaptchaPreview();
+		});
+
+		this.$watch('recaptchaSiteKey', () => {
+			renderRecaptchaPreview();
+		});
+	},
+
 	methods: {
 		invite() {
 			this.$root.api('admin/invite').then(x => {
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index 701878b282..eb0b0abaa0 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -199,6 +199,7 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, type: string,
 
 	const minio = new Minio.Client({
 		endPoint: meta.objectStorageEndpoint!,
+		region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined,
 		port: meta.objectStoragePort ? meta.objectStoragePort : undefined,
 		useSSL: meta.objectStorageUseSSL,
 		accessKey: meta.objectStorageAccessKey!,
diff --git a/src/services/drive/delete-file.ts b/src/services/drive/delete-file.ts
index ba0482dbe2..b429ca0db8 100644
--- a/src/services/drive/delete-file.ts
+++ b/src/services/drive/delete-file.ts
@@ -21,6 +21,7 @@ export default async function(file: DriveFile, isExpired = false) {
 
 		const minio = new Minio.Client({
 			endPoint: meta.objectStorageEndpoint!,
+			region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined,
 			port: meta.objectStoragePort ? meta.objectStoragePort : undefined,
 			useSSL: meta.objectStorageUseSSL,
 			accessKey: meta.objectStorageAccessKey!,