5471c065cd
Timezone is guessed by moment.js if unset upon a normal login, but was not when logging in via an email link. This adds logic to update a guessed timezone upon email login so timezones don't end up blank.
65 lines
1.8 KiB
JavaScript
65 lines
1.8 KiB
JavaScript
import discourseComputed from "discourse-common/utils/decorators";
|
|
import Controller from "@ember/controller";
|
|
import { SECOND_FACTOR_METHODS } from "discourse/models/user";
|
|
import { ajax } from "discourse/lib/ajax";
|
|
import DiscourseURL from "discourse/lib/url";
|
|
import { popupAjaxError } from "discourse/lib/ajax-error";
|
|
import { getWebauthnCredential } from "discourse/lib/webauthn";
|
|
|
|
export default Controller.extend({
|
|
lockImageUrl: Discourse.getURL("/images/lock.svg"),
|
|
|
|
@discourseComputed("model")
|
|
secondFactorRequired(model) {
|
|
return model.security_key_required || model.second_factor_required;
|
|
},
|
|
|
|
@discourseComputed("model")
|
|
secondFactorMethod(model) {
|
|
return model.security_key_required
|
|
? SECOND_FACTOR_METHODS.SECURITY_KEY
|
|
: SECOND_FACTOR_METHODS.TOTP;
|
|
},
|
|
|
|
actions: {
|
|
finishLogin() {
|
|
let data = {
|
|
second_factor_method: this.secondFactorMethod,
|
|
timezone: moment.tz.guess()
|
|
};
|
|
if (this.securityKeyCredential) {
|
|
data.second_factor_token = this.securityKeyCredential;
|
|
} else {
|
|
data.second_factor_token = this.secondFactorToken;
|
|
}
|
|
|
|
ajax({
|
|
url: `/session/email-login/${this.model.token}`,
|
|
type: "POST",
|
|
data: data
|
|
})
|
|
.then(result => {
|
|
if (result.success) {
|
|
DiscourseURL.redirectTo("/");
|
|
} else {
|
|
this.set("model.error", result.error);
|
|
}
|
|
})
|
|
.catch(popupAjaxError);
|
|
},
|
|
authenticateSecurityKey() {
|
|
getWebauthnCredential(
|
|
this.model.challenge,
|
|
this.model.allowed_credential_ids,
|
|
credentialData => {
|
|
this.set("securityKeyCredential", credentialData);
|
|
this.send("finishLogin");
|
|
},
|
|
errorMessage => {
|
|
this.set("model.error", errorMessage);
|
|
}
|
|
);
|
|
}
|
|
}
|
|
});
|