mirror of
https://github.com/hrfee/jfa-go.git
synced 2024-11-13 22:00:10 +00:00
Compare commits
No commits in common. "8e153cd92f8689dd398966997283515e00c0ea3b" and "68004e1d34945300ca906e2bd490785afa496733" have entirely different histories.
8e153cd92f
...
68004e1d34
102
api-userpage.go
102
api-userpage.go
@ -10,7 +10,7 @@ import (
|
||||
"github.com/golang-jwt/jwt"
|
||||
)
|
||||
|
||||
// @Summary Returns the logged-in user's Jellyfin ID & Username, and other details.
|
||||
// @Summary Returns the logged-in user's Jellyfin ID & Username.
|
||||
// @Produce json
|
||||
// @Success 200 {object} MyDetailsDTO
|
||||
// @Router /my/details [get]
|
||||
@ -379,103 +379,3 @@ func (app *appContext) MyTelegramVerifiedInvite(gc *gin.Context) {
|
||||
app.storage.SetTelegramKey(gc.GetString("jfId"), tgUser)
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
// @Summary Generate and send a new PIN to your given matrix user.
|
||||
// @Produce json
|
||||
// @Success 200 {object} boolResponse
|
||||
// @Failure 400 {object} stringResponse
|
||||
// @Failure 401 {object} boolResponse
|
||||
// @Failure 500 {object} boolResponse
|
||||
// @Param MatrixSendPINDTO body MatrixSendPINDTO true "User's Matrix ID."
|
||||
// @Router /my/matrix/user [post]
|
||||
// @tags User Page
|
||||
func (app *appContext) MatrixSendMyPIN(gc *gin.Context) {
|
||||
var req MatrixSendPINDTO
|
||||
gc.BindJSON(&req)
|
||||
if req.UserID == "" {
|
||||
respond(400, "errorNoUserID", gc)
|
||||
return
|
||||
}
|
||||
if app.config.Section("matrix").Key("require_unique").MustBool(false) {
|
||||
for _, u := range app.storage.GetMatrix() {
|
||||
if req.UserID == u.UserID {
|
||||
respondBool(400, false, gc)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ok := app.matrix.SendStart(req.UserID)
|
||||
if !ok {
|
||||
respondBool(500, false, gc)
|
||||
return
|
||||
}
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
// @Summary Check whether your matrix PIN is valid, and link the account to yours if so.
|
||||
// @Produce json
|
||||
// @Success 200 {object} boolResponse
|
||||
// @Failure 401 {object} boolResponse
|
||||
// @Param pin path string true "PIN code to check"
|
||||
// @Param invCode path string true "invite Code"
|
||||
// @Param userID path string true "Matrix User ID"
|
||||
// @Router /my/matrix/verified/{userID}/{pin} [get]
|
||||
// @tags User Page
|
||||
func (app *appContext) MatrixCheckMyPIN(gc *gin.Context) {
|
||||
userID := gc.Param("userID")
|
||||
pin := gc.Param("pin")
|
||||
user, ok := app.matrix.tokens[pin]
|
||||
if !ok {
|
||||
app.debug.Println("Matrix: PIN not found")
|
||||
respondBool(200, false, gc)
|
||||
return
|
||||
}
|
||||
if user.User.UserID != userID {
|
||||
app.debug.Println("Matrix: User ID of PIN didn't match")
|
||||
respondBool(200, false, gc)
|
||||
return
|
||||
}
|
||||
|
||||
mxUser := *user.User
|
||||
mxUser.Contact = true
|
||||
existingUser, ok := app.storage.GetMatrixKey(gc.GetString("jfId"))
|
||||
if ok {
|
||||
mxUser.Lang = existingUser.Lang
|
||||
mxUser.Contact = existingUser.Contact
|
||||
}
|
||||
|
||||
app.storage.SetMatrixKey(gc.GetString("jfId"), mxUser)
|
||||
delete(app.matrix.tokens, pin)
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
// @Summary unlink the Discord account from your Jellyfin user. Always succeeds.
|
||||
// @Produce json
|
||||
// @Success 200 {object} boolResponse
|
||||
// @Router /my/discord [delete]
|
||||
// @Tags Users
|
||||
func (app *appContext) UnlinkMyDiscord(gc *gin.Context) {
|
||||
app.storage.DeleteDiscordKey(gc.GetString("jfId"))
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
// @Summary unlink the Telegram account from your Jellyfin user. Always succeeds.
|
||||
// @Produce json
|
||||
// @Success 200 {object} boolResponse
|
||||
// @Router /my/telegram [delete]
|
||||
// @Tags Users
|
||||
func (app *appContext) UnlinkMyTelegram(gc *gin.Context) {
|
||||
app.storage.DeleteTelegramKey(gc.GetString("jfId"))
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
// @Summary unlink the Matrix account from your Jellyfin user. Always succeeds.
|
||||
// @Produce json
|
||||
// @Success 200 {object} boolResponse
|
||||
// @Router /my/matrix [delete]
|
||||
// @Tags Users
|
||||
func (app *appContext) UnlinkMyMatrix(gc *gin.Context) {
|
||||
app.storage.DeleteMatrixKey(gc.GetString("jfId"))
|
||||
respondBool(200, true, gc)
|
||||
}
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Send til",
|
||||
"create": "Opret",
|
||||
"apply": "Anvend",
|
||||
"delete": "Slet",
|
||||
"select": "Vælg",
|
||||
"name": "Navn",
|
||||
"date": "Dato",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Senden an",
|
||||
"create": "Erstellen",
|
||||
"apply": "Anwenden",
|
||||
"delete": "Löschen",
|
||||
"name": "Name",
|
||||
"date": "Datum",
|
||||
"lastActiveTime": "Zuletzt aktiv",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Αποστολή σε",
|
||||
"create": "Δημιουργία",
|
||||
"apply": "Εφαρμογή",
|
||||
"delete": "Διαγραφή",
|
||||
"name": "Όνομα",
|
||||
"date": "Ημερομηνία",
|
||||
"lastActiveTime": "Τελευταία Ενεργός",
|
||||
|
||||
@ -69,6 +69,7 @@
|
||||
"inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
|
||||
"inviteSendToEmail": "Send to",
|
||||
"apply": "Apply",
|
||||
"delete": "Delete",
|
||||
"updates": "Updates",
|
||||
"variables": "Variables",
|
||||
"preview": "Preview",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Send to",
|
||||
"create": "Create",
|
||||
"apply": "Apply",
|
||||
"delete": "Delete",
|
||||
"select": "Select",
|
||||
"name": "Name",
|
||||
"date": "Date",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Enviar a",
|
||||
"create": "Crear",
|
||||
"apply": "Aplicar",
|
||||
"delete": "Eliminar",
|
||||
"name": "Nombre",
|
||||
"date": "Fecha",
|
||||
"updates": "Actualizaciones",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Envoyer à",
|
||||
"create": "Créer",
|
||||
"apply": "Appliquer",
|
||||
"delete": "Effacer",
|
||||
"name": "Nom",
|
||||
"date": "Date",
|
||||
"lastActiveTime": "Dernière activité",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Címzett",
|
||||
"create": "Létrehozás",
|
||||
"apply": "Alkalmaz",
|
||||
"delete": "Törlés",
|
||||
"select": "Kiválasztás",
|
||||
"name": "Név",
|
||||
"date": "Dátum",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Dikirim kepada",
|
||||
"create": "Buat",
|
||||
"apply": "Terapkan",
|
||||
"delete": "Hapus",
|
||||
"name": "Nama",
|
||||
"date": "Tanggal",
|
||||
"lastActiveTime": "Terakhir Aktif",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Stuur naar",
|
||||
"create": "Aanmaken",
|
||||
"apply": "Toepassen",
|
||||
"delete": "Verwijderen",
|
||||
"name": "Naam",
|
||||
"date": "Datum",
|
||||
"lastActiveTime": "Laatst actief",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "",
|
||||
"create": "",
|
||||
"apply": "",
|
||||
"delete": "",
|
||||
"select": "",
|
||||
"name": "Imię",
|
||||
"date": "Data",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Enviar para",
|
||||
"create": "Criar",
|
||||
"apply": "Aplicar",
|
||||
"delete": "Deletar",
|
||||
"name": "Nome",
|
||||
"date": "Data",
|
||||
"lastActiveTime": "Ativo pela última vez",
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
"inviteSendToEmail": "Skicka till",
|
||||
"create": "Skapa",
|
||||
"apply": "Tillämpa",
|
||||
"delete": "Radera",
|
||||
"name": "Namn",
|
||||
"date": "Datum",
|
||||
"lastActiveTime": "Senast aktiv",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "Gửi tới",
|
||||
"create": "Tạo mới",
|
||||
"apply": "Áp dụng",
|
||||
"delete": "Xóa",
|
||||
"select": "Chọn",
|
||||
"name": "Tên",
|
||||
"date": "Ngày",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "发送到",
|
||||
"create": "创建",
|
||||
"apply": "申请",
|
||||
"delete": "删除",
|
||||
"select": "选择",
|
||||
"name": "名称",
|
||||
"date": "日期",
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
"inviteSendToEmail": "發送到",
|
||||
"create": "創建",
|
||||
"apply": "應用",
|
||||
"delete": "刪除",
|
||||
"select": "選擇",
|
||||
"name": "帳戶名稱",
|
||||
"date": "日期",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Deaktiver",
|
||||
"expiry": "Udløb",
|
||||
"add": "Tilføj",
|
||||
"edit": "Rediger",
|
||||
"delete": "Slet"
|
||||
"edit": "Rediger"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Deaktivieren",
|
||||
"expiry": "Ablaufdatum",
|
||||
"add": "Hinzufügen",
|
||||
"edit": "Bearbeiten",
|
||||
"delete": "Löschen"
|
||||
"edit": "Bearbeiten"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.",
|
||||
|
||||
@ -24,8 +24,7 @@
|
||||
"reEnable": "Επανα-ενεργοποίηση",
|
||||
"disable": "Απενεργοποίηση",
|
||||
"expiry": "Λήξη",
|
||||
"edit": "Επεξεργασία",
|
||||
"delete": "Διαγραφή"
|
||||
"edit": "Επεξεργασία"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Disable",
|
||||
"expiry": "Expiry",
|
||||
"add": "Add",
|
||||
"edit": "Edit",
|
||||
"delete": "Delete"
|
||||
"edit": "Edit"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "The username and/or password was left blank.",
|
||||
|
||||
@ -33,12 +33,13 @@
|
||||
"reEnable": "Re-enable",
|
||||
"disable": "Disable",
|
||||
"contactMethods": "Contact Methods",
|
||||
"addContactMethod": "Add Contact Method",
|
||||
"editContactMethod": "Edit Contact Method",
|
||||
"accountStatus": "Account Status",
|
||||
"notSet": "Not set",
|
||||
"expiry": "Expiry",
|
||||
"add": "Add",
|
||||
"edit": "Edit",
|
||||
"delete": "Delete"
|
||||
"edit": "Edit"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "The username and/or password were left blank.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Desactivar",
|
||||
"expiry": "Expiración",
|
||||
"add": "Agregar",
|
||||
"edit": "Editar",
|
||||
"delete": "Eliminar"
|
||||
"edit": "Editar"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Désactivé",
|
||||
"expiry": "Expiration",
|
||||
"add": "Ajouter",
|
||||
"edit": "Éditer",
|
||||
"delete": "Effacer"
|
||||
"edit": "Éditer"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.",
|
||||
|
||||
@ -12,8 +12,7 @@
|
||||
"disable": "Letiltás",
|
||||
"expiry": "Lejárat",
|
||||
"add": "Hozzáadás",
|
||||
"edit": "Szerkesztés",
|
||||
"delete": "Törlés"
|
||||
"edit": "Szerkesztés"
|
||||
},
|
||||
"notifications": {},
|
||||
"quantityStrings": {}
|
||||
|
||||
@ -18,8 +18,7 @@
|
||||
"theme": "Tema",
|
||||
"login": "Masuk",
|
||||
"logout": "Keluar",
|
||||
"edit": "Edit",
|
||||
"delete": "Hapus"
|
||||
"edit": "Edit"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Nama pengguna dan / atau sandi kosong.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Uitschakelen",
|
||||
"expiry": "Verloop",
|
||||
"add": "Voeg toe",
|
||||
"edit": "Bewerken",
|
||||
"delete": "Verwijderen"
|
||||
"edit": "Bewerken"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "Desativar",
|
||||
"expiry": "Expira",
|
||||
"add": "Adicionar",
|
||||
"edit": "Editar",
|
||||
"delete": "Deletar"
|
||||
"edit": "Editar"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.",
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
"enabled": "Aktiverad",
|
||||
"disabled": "Inaktiverad",
|
||||
"expiry": "Löper ut",
|
||||
"edit": "Redigera",
|
||||
"delete": "Radera"
|
||||
"edit": "Redigera"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.",
|
||||
|
||||
@ -12,8 +12,7 @@
|
||||
"disable": "Tắt",
|
||||
"expiry": "Hết hạn",
|
||||
"add": "Thêm",
|
||||
"edit": "Chỉnh sửa",
|
||||
"delete": "Xóa"
|
||||
"edit": "Chỉnh sửa"
|
||||
},
|
||||
"notifications": {
|
||||
"errorConnection": "Không thể kết nối với jfa-go.",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "禁用",
|
||||
"expiry": "到期",
|
||||
"add": "添加",
|
||||
"edit": "编辑",
|
||||
"delete": "删除"
|
||||
"edit": "编辑"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "用户名/密码留空。",
|
||||
|
||||
@ -34,8 +34,7 @@
|
||||
"disable": "禁用",
|
||||
"expiry": "到期",
|
||||
"add": "添加",
|
||||
"edit": "編輯",
|
||||
"delete": "刪除"
|
||||
"edit": "編輯"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "帳戶名稱和/或密碼留空。",
|
||||
|
||||
@ -235,11 +235,6 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
|
||||
user.GET(p+"/pin/:service", app.GetMyPIN)
|
||||
user.GET(p+"/discord/verified/:pin", app.MyDiscordVerifiedInvite)
|
||||
user.GET(p+"/telegram/verified/:pin", app.MyTelegramVerifiedInvite)
|
||||
user.POST(p+"/matrix/user", app.MatrixSendMyPIN)
|
||||
user.POST(p+"/matrix/verified/:userID/:pin", app.MatrixCheckMyPIN)
|
||||
user.DELETE(p+"/discord", app.UnlinkMyDiscord)
|
||||
user.DELETE(p+"/telegram", app.UnlinkMyTelegram)
|
||||
user.DELETE(p+"/matrix", app.UnlinkMyMatrix)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -36,9 +36,8 @@
|
||||
"accountStatus": "common",
|
||||
"notSet": "common",
|
||||
"expiry": "common",
|
||||
"add": "common",
|
||||
"edit": "common",
|
||||
"delete": "admin"
|
||||
"add": "admin",
|
||||
"edit": "admin"
|
||||
},
|
||||
"notifications": {
|
||||
"errorLoginBlank": "common",
|
||||
|
||||
@ -63,7 +63,6 @@ func (st *Storage) SetEmailsKey(k string, v EmailAddress) {
|
||||
func (st *Storage) DeleteEmailsKey(k string) {
|
||||
st.emailsLock.Lock()
|
||||
delete(st.emails, k)
|
||||
st.storeEmails()
|
||||
st.emailsLock.Unlock()
|
||||
}
|
||||
|
||||
@ -90,7 +89,6 @@ func (st *Storage) SetDiscordKey(k string, v DiscordUser) {
|
||||
func (st *Storage) DeleteDiscordKey(k string) {
|
||||
st.discordLock.Lock()
|
||||
delete(st.discord, k)
|
||||
st.storeDiscordUsers()
|
||||
st.discordLock.Unlock()
|
||||
}
|
||||
|
||||
@ -117,7 +115,6 @@ func (st *Storage) SetTelegramKey(k string, v TelegramUser) {
|
||||
func (st *Storage) DeleteTelegramKey(k string) {
|
||||
st.telegramLock.Lock()
|
||||
delete(st.telegram, k)
|
||||
st.storeTelegramUsers()
|
||||
st.telegramLock.Unlock()
|
||||
}
|
||||
|
||||
@ -144,7 +141,6 @@ func (st *Storage) SetMatrixKey(k string, v MatrixUser) {
|
||||
func (st *Storage) DeleteMatrixKey(k string) {
|
||||
st.matrixLock.Lock()
|
||||
delete(st.matrix, k)
|
||||
st.storeMatrixUsers()
|
||||
st.matrixLock.Unlock()
|
||||
}
|
||||
|
||||
|
||||
74
ts/form.ts
74
ts/form.ts
@ -3,7 +3,7 @@ import { notificationBox, whichAnimationEvent } from "./modules/common.js";
|
||||
import { _get, _post, toggleLoader, addLoader, removeLoader, toDateString } from "./modules/common.js";
|
||||
import { loadLangSelector } from "./modules/lang.js";
|
||||
import { initValidator } from "./modules/validator.js";
|
||||
import { Discord, Telegram, Matrix, ServiceConfiguration, MatrixConfiguration } from "./modules/account-linking.js";
|
||||
import { Discord, Telegram, ServiceConfiguration } from "./modules/account-linking.js";
|
||||
|
||||
interface formWindow extends Window {
|
||||
invalidPassword: string;
|
||||
@ -56,7 +56,7 @@ if (window.telegramEnabled) {
|
||||
pin: window.telegramPIN,
|
||||
pinURL: "",
|
||||
verifiedURL: "/invite/" + window.code + "/telegram/verified/",
|
||||
invalidCodeError: window.messages["errorInvalidPIN"],
|
||||
invalidCodeError: window.messages["errorInvalidCode"],
|
||||
accountLinkedError: window.messages["errorAccountLinked"],
|
||||
successError: window.messages["verified"],
|
||||
successFunc: (modalClosed: boolean) => {
|
||||
@ -88,7 +88,7 @@ if (window.discordEnabled) {
|
||||
inviteURL: window.discordInviteLink ? ("/invite/" + window.code + "/discord/invite") : "",
|
||||
pinURL: "",
|
||||
verifiedURL: "/invite/" + window.code + "/discord/verified/",
|
||||
invalidCodeError: window.messages["errorInvalidPIN"],
|
||||
invalidCodeError: window.messages["errorInvalidCode"],
|
||||
accountLinkedError: window.messages["errorAccountLinked"],
|
||||
successError: window.messages["verified"],
|
||||
successFunc: (modalClosed: boolean) => {
|
||||
@ -114,18 +114,49 @@ var matrixPIN = "";
|
||||
if (window.matrixEnabled) {
|
||||
window.matrixModal = new Modal(document.getElementById("modal-matrix"), window.matrixRequired);
|
||||
const matrixButton = document.getElementById("link-matrix") as HTMLSpanElement;
|
||||
|
||||
const matrixConf: MatrixConfiguration = {
|
||||
modal: window.matrixModal as Modal,
|
||||
sendMessageURL: "/invite/" + window.code + "/matrix/user",
|
||||
verifiedURL: "/invite/" + window.code + "/matrix/verified/",
|
||||
invalidCodeError: window.messages["errorInvalidPIN"],
|
||||
accountLinkedError: window.messages["errorAccountLinked"],
|
||||
unknownError: window.messages["errorUnknown"],
|
||||
successError: window.messages["verified"],
|
||||
successFunc: () => {
|
||||
matrixButton.onclick = window.matrixModal.show;
|
||||
const submitButton = document.getElementById("matrix-send") as HTMLSpanElement;
|
||||
const input = document.getElementById("matrix-userid") as HTMLInputElement;
|
||||
let userID = "";
|
||||
submitButton.onclick = () => {
|
||||
addLoader(submitButton);
|
||||
if (userID == "") {
|
||||
const send = {
|
||||
user_id: input.value
|
||||
};
|
||||
_post("/invite/" + window.code + "/matrix/user", send, (req: XMLHttpRequest) => {
|
||||
if (req.readyState == 4) {
|
||||
if (req.status == 400 && req.response["error"] == "errorAccountLinked") {
|
||||
window.matrixModal.close();
|
||||
window.notifications.customError("accountLinkedError", window.messages["errorAccountLinked"]);
|
||||
}
|
||||
removeLoader(submitButton);
|
||||
userID = input.value;
|
||||
if (req.status != 200) {
|
||||
window.notifications.customError("errorUnknown", window.messages["errorUnknown"]);
|
||||
window.matrixModal.close();
|
||||
return;
|
||||
}
|
||||
submitButton.classList.add("~positive");
|
||||
submitButton.classList.remove("~info");
|
||||
setTimeout(() => {
|
||||
submitButton.classList.add("~info");
|
||||
submitButton.classList.remove("~positive");
|
||||
}, 2000);
|
||||
input.placeholder = "PIN";
|
||||
input.value = "";
|
||||
}
|
||||
});
|
||||
} else {
|
||||
_get("/invite/" + window.code + "/matrix/verified/" + userID + "/" + input.value, null, (req: XMLHttpRequest) => {
|
||||
if (req.readyState == 4) {
|
||||
removeLoader(submitButton)
|
||||
const valid = req.response["success"] as boolean;
|
||||
if (valid) {
|
||||
window.matrixModal.close();
|
||||
window.notifications.customPositive("successVerified", "", window.messages["verified"]);
|
||||
matrixVerified = true;
|
||||
matrixPIN = matrix.pin;
|
||||
matrixPIN = input.value;
|
||||
matrixButton.classList.add("unfocused");
|
||||
document.getElementById("contact-via").classList.remove("unfocused");
|
||||
document.getElementById("contact-via-email").parentElement.classList.remove("unfocused");
|
||||
@ -133,12 +164,19 @@ if (window.matrixEnabled) {
|
||||
radio.parentElement.classList.remove("unfocused");
|
||||
radio.checked = true;
|
||||
validatorFunc();
|
||||
} else {
|
||||
window.notifications.customError("errorInvalidPIN", window.messages["errorInvalidPIN"]);
|
||||
submitButton.classList.add("~critical");
|
||||
submitButton.classList.remove("~info");
|
||||
setTimeout(() => {
|
||||
submitButton.classList.add("~info");
|
||||
submitButton.classList.remove("~critical");
|
||||
}, 800);
|
||||
}
|
||||
}
|
||||
},);
|
||||
}
|
||||
};
|
||||
|
||||
const matrix = new Matrix(matrixConf);
|
||||
|
||||
matrixButton.onclick = () => { matrix.show(); };
|
||||
}
|
||||
|
||||
if (window.confirmation) {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Modal } from "../modules/modal.js";
|
||||
import { _get, _post, toggleLoader, addLoader, removeLoader } from "../modules/common.js";
|
||||
import { _get, _post, toggleLoader } from "../modules/common.js";
|
||||
|
||||
interface formWindow extends Window {
|
||||
invalidPassword: string;
|
||||
@ -172,95 +172,3 @@ export class Telegram extends ServiceLinker {
|
||||
this._waiting = document.getElementById("telegram-waiting") as HTMLSpanElement;
|
||||
}
|
||||
};
|
||||
|
||||
export interface MatrixConfiguration {
|
||||
modal: Modal;
|
||||
sendMessageURL: string;
|
||||
verifiedURL: string;
|
||||
invalidCodeError: string;
|
||||
accountLinkedError: string;
|
||||
unknownError: string;
|
||||
successError: string;
|
||||
successFunc: () => void;
|
||||
}
|
||||
|
||||
export class Matrix {
|
||||
private _conf: MatrixConfiguration;
|
||||
private _verified = false;
|
||||
private _name: string = "matrix";
|
||||
private _userID: string = "";
|
||||
private _pin: string = "";
|
||||
private _input: HTMLInputElement;
|
||||
private _submit: HTMLSpanElement;
|
||||
|
||||
get verified(): boolean { return this._verified; }
|
||||
get pin(): string { return this._pin; }
|
||||
|
||||
constructor(conf: MatrixConfiguration) {
|
||||
this._conf = conf;
|
||||
this._input = document.getElementById("matrix-userid") as HTMLInputElement;
|
||||
this._submit = document.getElementById("matrix-send") as HTMLSpanElement;
|
||||
this._submit.onclick = () => { this._onclick(); };
|
||||
}
|
||||
|
||||
private _onclick = () => {
|
||||
addLoader(this._submit);
|
||||
if (this._userID == "") {
|
||||
this._sendMessage();
|
||||
} else {
|
||||
this._verifyCode();
|
||||
}
|
||||
};
|
||||
|
||||
show = () => {
|
||||
this._input.value = "";
|
||||
this._conf.modal.show();
|
||||
}
|
||||
|
||||
private _sendMessage = () => _post(this._conf.sendMessageURL, { "user_id": this._input.value }, (req: XMLHttpRequest) => {
|
||||
if (req.readyState != 4) return;
|
||||
removeLoader(this._submit);
|
||||
if (req.status == 400 && req.response["error"] == "errorAccountLinked") {
|
||||
this._conf.modal.close();
|
||||
window.notifications.customError("accountLinkedError", this._conf.accountLinkedError);
|
||||
return;
|
||||
} else if (req.status != 200) {
|
||||
this._conf.modal.close();
|
||||
window.notifications.customError("unknownError", this._conf.unknownError);
|
||||
return;
|
||||
}
|
||||
this._userID = this._input.value;
|
||||
this._submit.classList.add("~positive");
|
||||
this._submit.classList.remove("~info");
|
||||
setTimeout(() => {
|
||||
this._submit.classList.add("~info");
|
||||
this._submit.classList.remove("~positive");
|
||||
}, 2000);
|
||||
this._input.placeholder = "PIN";
|
||||
this._input.value = "";
|
||||
});
|
||||
|
||||
private _verifyCode = () => _post(this._conf.verifiedURL + this._userID + "/" + this._input.value, null, (req: XMLHttpRequest) => {
|
||||
if (req.readyState != 4) return;
|
||||
removeLoader(this._submit);
|
||||
const valid = req.response["success"] as boolean;
|
||||
if (valid) {
|
||||
this._conf.modal.close();
|
||||
window.notifications.customPositive(this._name + "Verified", "", this._conf.successError);
|
||||
this._verified = true;
|
||||
this._pin = this._input.value;
|
||||
if (this._conf.successFunc) {
|
||||
this._conf.successFunc();
|
||||
}
|
||||
} else {
|
||||
window.notifications.customError("invalidCodeError", this._conf.invalidCodeError);
|
||||
this._submit.classList.add("~critical");
|
||||
this._submit.classList.remove("~info");
|
||||
setTimeout(() => {
|
||||
this._submit.classList.add("~info");
|
||||
this._submit.classList.remove("~critical");
|
||||
}, 800);
|
||||
}
|
||||
}, true);
|
||||
}
|
||||
|
||||
|
||||
57
ts/user.ts
57
ts/user.ts
@ -1,9 +1,9 @@
|
||||
import { ThemeManager } from "./modules/theme.js";
|
||||
import { lang, LangFile, loadLangSelector } from "./modules/lang.js";
|
||||
import { Modal } from "./modules/modal.js";
|
||||
import { _get, _post, _delete, notificationBox, whichAnimationEvent, toDateString, toggleLoader } from "./modules/common.js";
|
||||
import { _get, _post, notificationBox, whichAnimationEvent, toDateString, toggleLoader } from "./modules/common.js";
|
||||
import { Login } from "./modules/login.js";
|
||||
import { Discord, Telegram, Matrix, ServiceConfiguration, MatrixConfiguration } from "./modules/account-linking.js";
|
||||
import { Discord, Telegram, ServiceConfiguration } from "./modules/account-linking.js";
|
||||
|
||||
interface userWindow extends Window {
|
||||
jellyfinID: string;
|
||||
@ -92,7 +92,7 @@ class ContactMethods {
|
||||
this._buttons = {};
|
||||
}
|
||||
|
||||
append = (name: string, details: MyDetailsContactMethod, icon: string, addEditFunc?: (add: boolean) => void, required?: boolean) => {
|
||||
append = (name: string, details: MyDetailsContactMethod, icon: string, addEditFunc?: (add: boolean) => void) => {
|
||||
const row = document.createElement("div");
|
||||
row.classList.add("row", "flex-expand", "my-2");
|
||||
let innerHTML = `
|
||||
@ -118,15 +118,6 @@ class ContactMethods {
|
||||
</button>
|
||||
`;
|
||||
}
|
||||
|
||||
if (!required && details.value != "") {
|
||||
innerHTML += `
|
||||
<button class="user-contact-delete button ~critical ml-2" alt="${window.lang.strings("delete")}" text="${window.lang.strings("delete")}">
|
||||
×
|
||||
</button>
|
||||
`;
|
||||
}
|
||||
|
||||
innerHTML += `
|
||||
</div>
|
||||
`;
|
||||
@ -169,14 +160,6 @@ class ContactMethods {
|
||||
addEditButton.onclick = () => addEditFunc(details.value == "");
|
||||
}
|
||||
|
||||
if (!required && details.value != "") {
|
||||
const deleteButton = row.querySelector(".user-contact-delete") as HTMLButtonElement;
|
||||
deleteButton.onclick = () => _delete("/my/" + name, null, (req: XMLHttpRequest) => {
|
||||
if (req.readyState != 4) return;
|
||||
window.location.reload();
|
||||
});
|
||||
}
|
||||
|
||||
this._content.appendChild(row);
|
||||
};
|
||||
|
||||
@ -265,6 +248,8 @@ class ExpiryCard {
|
||||
this._interval = window.setInterval(this._drawCountdown, 60*1000);
|
||||
this._drawCountdown();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
var expiryCard = new ExpiryCard(statusCard);
|
||||
@ -306,7 +291,7 @@ const discordConf: ServiceConfiguration = {
|
||||
inviteURL: window.discordInviteLink ? "/my/discord/invite" : "",
|
||||
pinURL: "/my/pin/discord",
|
||||
verifiedURL: "/my/discord/verified/",
|
||||
invalidCodeError: window.lang.notif("errorInvalidPIN"),
|
||||
invalidCodeError: window.lang.notif("errorInvalidCode"),
|
||||
accountLinkedError: window.lang.notif("errorAccountLinked"),
|
||||
successError: window.lang.notif("verified"),
|
||||
successFunc: (modalClosed: boolean) => {
|
||||
@ -321,7 +306,7 @@ const telegramConf: ServiceConfiguration = {
|
||||
pin: "",
|
||||
pinURL: "/my/pin/telegram",
|
||||
verifiedURL: "/my/telegram/verified/",
|
||||
invalidCodeError: window.lang.notif("errorInvalidPIN"),
|
||||
invalidCodeError: window.lang.notif("errorInvalidCode"),
|
||||
accountLinkedError: window.lang.notif("errorAccountLinked"),
|
||||
successError: window.lang.notif("verified"),
|
||||
successFunc: (modalClosed: boolean) => {
|
||||
@ -331,22 +316,6 @@ const telegramConf: ServiceConfiguration = {
|
||||
|
||||
let telegram = new Telegram(telegramConf);
|
||||
|
||||
const matrixConf: MatrixConfiguration = {
|
||||
modal: window.modals.matrix as Modal,
|
||||
sendMessageURL: "/my/matrix/user",
|
||||
verifiedURL: "/my/matrix/verified/",
|
||||
invalidCodeError: window.lang.notif("errorInvalidPIN"),
|
||||
accountLinkedError: window.lang.notif("errorAccountLinked"),
|
||||
unknownError: window.lang.notif("errorUnknown"),
|
||||
successError: window.lang.notif("verified"),
|
||||
successFunc: () => {
|
||||
setTimeout(() => window.location.reload(), 1200);
|
||||
}
|
||||
};
|
||||
|
||||
let matrix = new Matrix(matrixConf);
|
||||
|
||||
|
||||
document.addEventListener("details-reload", () => {
|
||||
_get("/my/details", null, (req: XMLHttpRequest) => {
|
||||
if (req.readyState == 4) {
|
||||
@ -374,16 +343,16 @@ document.addEventListener("details-reload", () => {
|
||||
// Note the weird format of the functions for discord/telegram:
|
||||
// "this" was being redefined within the onclick() method, so
|
||||
// they had to be wrapped in an anonymous function.
|
||||
const contactMethods: { name: string, icon: string, f: (add: boolean) => void, required: boolean }[] = [
|
||||
{name: "email", icon: `<i class="ri-mail-fill ri-lg"></i>`, f: addEditEmail, required: true},
|
||||
{name: "discord", icon: `<i class="ri-discord-fill ri-lg"></i>`, f: (add: boolean) => { discord.onclick(); }, required: window.discordRequired},
|
||||
{name: "telegram", icon: `<i class="ri-telegram-fill ri-lg"></i>`, f: (add: boolean) => { telegram.onclick() }, required: window.telegramRequired},
|
||||
{name: "matrix", icon: `<span class="font-bold">[m]</span>`, f: (add: boolean) => { matrix.show(); }, required: window.matrixRequired}
|
||||
const contactMethods: { name: string, icon: string, f: (add: boolean) => void }[] = [
|
||||
{name: "email", icon: `<i class="ri-mail-fill ri-lg"></i>`, f: addEditEmail},
|
||||
{name: "discord", icon: `<i class="ri-discord-fill ri-lg"></i>`, f: (add: boolean) => { discord.onclick(); }},
|
||||
{name: "telegram", icon: `<i class="ri-telegram-fill ri-lg"></i>`, f: (add: boolean) => { telegram.onclick() }},
|
||||
{name: "matrix", icon: `<span class="font-bold">[m]</span>`, f: null}
|
||||
];
|
||||
|
||||
for (let method of contactMethods) {
|
||||
if (method.name in details) {
|
||||
contactMethodList.append(method.name, details[method.name], method.icon, method.f, method.required);
|
||||
contactMethodList.append(method.name, details[method.name], method.icon, method.f);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user