Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-17 17:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: domain bind register fix

Browse Source
This commit is contained in:
undefined committed 2021-07-23 13:11:51 +08:00
1 parent 2c2f0366a9
commit f4dca478be
4 files changed
+10 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "hydrooj",
"version": "2.29.34",
"version": "2.29.35",
"bin": "bin/hydrooj.js",
"main": "dist/loader.js",
"typings": "dist/loader.d.ts",
packages/hydrooj/src/handler/user.ts
+2 -2
View File
@@ -85,7 +85,7 @@ export class UserRegisterHandler extends Handler {
if (system.get('smtp.verify') && system.get('smtp.user')) {
const m = await this.renderHTML('user_register_mail.html', {
path: `register/${t[0]}`,
url_prefix: (this.domain.host || [])[0] || system.get('server.url'),
url_prefix: (this.domain.host instanceof Array ? this.domain.host[0] : this.domain.host) || system.get('server.url'),
});
await sendMail(mail, 'Sign Up', 'user_register_mail', m);
this.response.template = 'user_register_mail_sent.html';
@@ -154,7 +154,7 @@ class UserLostPassHandler extends Handler {
);
const m = await this.renderHTML('user_lostpass_mail.html', {
url: `lostpass/${tid}`,
url_prefix: this.domain.host || system.get('server.url'),
url_prefix: (this.domain.host instanceof Array ? this.domain.host[0] : this.domain.host) || system.get('server.url'),
uname: udoc.uname,
});
await sendMail(mail, 'Lost Password', 'user_lostpass_mail', m);
packages/hydrooj/src/service/server.ts
+6 -1
View File
@@ -357,7 +357,12 @@ export class HandlerCommon {
try {
const { anchor } = args;
if (args.domainId) name += '_with_domainId';
else if ((!this.request.host || this.domain?.host !== this.request.host) && this.domainId !== 'system') {
else if (this.domainId !== 'system' && (
!this.request.host
|| (this.domain?.host instanceof Array
? (!this.domain.host.includes(this.request.host))
: this.domain.host !== this.domain?.host)
)) {
name += '_with_domainId';
args.domainId = this.domainId;
}
packages/ui-default/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@hydrooj/ui-default",
"version": "4.13.1",
"version": "4.13.2",
"author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0",
"main": "hydro.js",