userpage: unlink accounts

api-userpage.go

@@ -10,7 +10,7 @@ import (
 	"github.com/golang-jwt/jwt"
 )
 
-// @Summary Returns the logged-in user's Jellyfin ID & Username.
+// @Summary Returns the logged-in user's Jellyfin ID & Username, and other details.
 // @Produce json
 // @Success 200 {object} MyDetailsDTO
 // @Router /my/details [get]
@@ -379,3 +379,103 @@ 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)
+}

lang/admin/da-dk.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "Send til",
         "create": "Opret",
         "apply": "Anvend",
-        "delete": "Slet",
         "select": "Vælg",
         "name": "Navn",
         "date": "Dato",

lang/admin/de-de.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Senden an",
         "create": "Erstellen",
         "apply": "Anwenden",
-        "delete": "Löschen",
         "name": "Name",
         "date": "Datum",
         "lastActiveTime": "Zuletzt aktiv",

lang/admin/el-gr.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Αποστολή σε",
         "create": "Δημιουργία",
         "apply": "Εφαρμογή",
-        "delete": "Διαγραφή",
         "name": "Όνομα",
         "date": "Ημερομηνία",
         "lastActiveTime": "Τελευταία Ενεργός",

lang/admin/en-gb.json

@@ -69,7 +69,6 @@
         "inviteInfiniteUsesWarning": "invites with infinite uses can be used abusively",
         "inviteSendToEmail": "Send to",
         "apply": "Apply",
-        "delete": "Delete",
         "updates": "Updates",
         "variables": "Variables",
         "preview": "Preview",

lang/admin/en-us.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "Send to",
         "create": "Create",
         "apply": "Apply",
-        "delete": "Delete",
         "select": "Select",
         "name": "Name",
         "date": "Date",

lang/admin/es-es.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "Enviar a",
         "create": "Crear",
         "apply": "Aplicar",
-        "delete": "Eliminar",
         "name": "Nombre",
         "date": "Fecha",
         "updates": "Actualizaciones",

lang/admin/fr-fr.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "Envoyer à",
         "create": "Créer",
         "apply": "Appliquer",
-        "delete": "Effacer",
         "name": "Nom",
         "date": "Date",
         "lastActiveTime": "Dernière activité",

lang/admin/hu-hu.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "Címzett",
         "create": "Létrehozás",
         "apply": "Alkalmaz",
-        "delete": "Törlés",
         "select": "Kiválasztás",
         "name": "Név",
         "date": "Dátum",

lang/admin/id-id.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Dikirim kepada",
         "create": "Buat",
         "apply": "Terapkan",
-        "delete": "Hapus",
         "name": "Nama",
         "date": "Tanggal",
         "lastActiveTime": "Terakhir Aktif",

lang/admin/nl-nl.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Stuur naar",
         "create": "Aanmaken",
         "apply": "Toepassen",
-        "delete": "Verwijderen",
         "name": "Naam",
         "date": "Datum",
         "lastActiveTime": "Laatst actief",

lang/admin/pl-pl.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "",
         "create": "",
         "apply": "",
-        "delete": "",
         "select": "",
         "name": "Imię",
         "date": "Data",

lang/admin/pt-br.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Enviar para",
         "create": "Criar",
         "apply": "Aplicar",
-        "delete": "Deletar",
         "name": "Nome",
         "date": "Data",
         "lastActiveTime": "Ativo pela última vez",

lang/admin/sv-se.json

@@ -15,7 +15,6 @@
         "inviteSendToEmail": "Skicka till",
         "create": "Skapa",
         "apply": "Tillämpa",
-        "delete": "Radera",
         "name": "Namn",
         "date": "Datum",
         "lastActiveTime": "Senast aktiv",

lang/admin/vi-vn.json

@@ -17,7 +17,6 @@
         "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",

lang/admin/zh-hans.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "发送到",
         "create": "创建",
         "apply": "申请",
-        "delete": "删除",
         "select": "选择",
         "name": "名称",
         "date": "日期",

lang/admin/zh-hant.json

@@ -17,7 +17,6 @@
         "inviteSendToEmail": "發送到",
         "create": "創建",
         "apply": "應用",
-        "delete": "刪除",
         "select": "選擇",
         "name": "帳戶名稱",
         "date": "日期",

lang/common/da-dk.json

@@ -34,7 +34,8 @@
         "disable": "Deaktiver",
         "expiry": "Udløb",
         "add": "Tilføj",
-        "edit": "Rediger"
+        "edit": "Rediger",
+        "delete": "Slet"
     },
     "notifications": {
         "errorLoginBlank": "Brugernavnet og/eller adgangskoden blev efterladt tomme.",

lang/common/de-de.json

@@ -34,7 +34,8 @@
         "disable": "Deaktivieren",
         "expiry": "Ablaufdatum",
         "add": "Hinzufügen",
-        "edit": "Bearbeiten"
+        "edit": "Bearbeiten",
+        "delete": "Löschen"
     },
     "notifications": {
         "errorLoginBlank": "Der Benutzername und/oder das Passwort wurden nicht ausgefüllt.",

lang/common/el-gr.json

@@ -24,7 +24,8 @@
         "reEnable": "Επανα-ενεργοποίηση",
         "disable": "Απενεργοποίηση",
         "expiry": "Λήξη",
-        "edit": "Επεξεργασία"
+        "edit": "Επεξεργασία",
+        "delete": "Διαγραφή"
     },
     "notifications": {
         "errorLoginBlank": "Το όνομα χρήστη και/ή ο κωδικός ήταν κενά.",

lang/common/en-gb.json

@@ -34,7 +34,8 @@
         "disable": "Disable",
         "expiry": "Expiry",
         "add": "Add",
-        "edit": "Edit"
+        "edit": "Edit",
+        "delete": "Delete"
     },
     "notifications": {
         "errorLoginBlank": "The username and/or password was left blank.",

lang/common/en-us.json

@@ -33,13 +33,12 @@
         "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"
+        "edit": "Edit",
+        "delete": "Delete"
     },
     "notifications": {
         "errorLoginBlank": "The username and/or password were left blank.",
@@ -62,4 +61,4 @@
             "plural": "{n} Days"
         }
     }
-}
+}

lang/common/es-es.json

@@ -34,7 +34,8 @@
         "disable": "Desactivar",
         "expiry": "Expiración",
         "add": "Agregar",
-        "edit": "Editar"
+        "edit": "Editar",
+        "delete": "Eliminar"
     },
     "notifications": {
         "errorLoginBlank": "El nombre de usuario y/o la contraseña se dejaron en blanco.",

lang/common/fr-fr.json

@@ -34,7 +34,8 @@
         "disable": "Désactivé",
         "expiry": "Expiration",
         "add": "Ajouter",
-        "edit": "Éditer"
+        "edit": "Éditer",
+        "delete": "Effacer"
     },
     "notifications": {
         "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.",

lang/common/hu-hu.json

@@ -12,7 +12,8 @@
         "disable": "Letiltás",
         "expiry": "Lejárat",
         "add": "Hozzáadás",
-        "edit": "Szerkesztés"
+        "edit": "Szerkesztés",
+        "delete": "Törlés"
     },
     "notifications": {},
     "quantityStrings": {}

lang/common/id-id.json

@@ -18,7 +18,8 @@
         "theme": "Tema",
         "login": "Masuk",
         "logout": "Keluar",
-        "edit": "Edit"
+        "edit": "Edit",
+        "delete": "Hapus"
     },
     "notifications": {
         "errorLoginBlank": "Nama pengguna dan / atau sandi kosong.",

lang/common/nl-nl.json

@@ -34,7 +34,8 @@
         "disable": "Uitschakelen",
         "expiry": "Verloop",
         "add": "Voeg toe",
-        "edit": "Bewerken"
+        "edit": "Bewerken",
+        "delete": "Verwijderen"
     },
     "notifications": {
         "errorLoginBlank": "De gebruikersnaam en/of wachtwoord is leeg.",

lang/common/pt-br.json

@@ -34,7 +34,8 @@
         "disable": "Desativar",
         "expiry": "Expira",
         "add": "Adicionar",
-        "edit": "Editar"
+        "edit": "Editar",
+        "delete": "Deletar"
     },
     "notifications": {
         "errorLoginBlank": "O nome de usuário e/ou senha foram deixados em branco.",

lang/common/sv-se.json

@@ -21,7 +21,8 @@
         "enabled": "Aktiverad",
         "disabled": "Inaktiverad",
         "expiry": "Löper ut",
-        "edit": "Redigera"
+        "edit": "Redigera",
+        "delete": "Radera"
     },
     "notifications": {
         "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.",

lang/common/vi-vn.json

@@ -12,7 +12,8 @@
         "disable": "Tắt",
         "expiry": "Hết hạn",
         "add": "Thêm",
-        "edit": "Chỉnh sửa"
+        "edit": "Chỉnh sửa",
+        "delete": "Xóa"
     },
     "notifications": {
         "errorConnection": "Không thể kết nối với jfa-go.",

lang/common/zh-hans.json

@@ -34,7 +34,8 @@
         "disable": "禁用",
         "expiry": "到期",
         "add": "添加",
-        "edit": "编辑"
+        "edit": "编辑",
+        "delete": "删除"
     },
     "notifications": {
         "errorLoginBlank": "用户名/密码留空。",

lang/common/zh-hant.json

@@ -34,7 +34,8 @@
         "disable": "禁用",
         "expiry": "到期",
         "add": "添加",
-        "edit": "編輯"
+        "edit": "編輯",
+        "delete": "刪除"
     },
     "notifications": {
         "errorLoginBlank": "帳戶名稱和/或密碼留空。",

lang/form/en-us.json

@@ -61,4 +61,4 @@
             "plural": "Must have at least {n} special characters"
         }
     }
-}
+}

router.go

@@ -235,6 +235,11 @@ 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)
 		}
 	}
 }

scripts/langmover/common.json

@@ -36,8 +36,9 @@
         "accountStatus": "common",
         "notSet": "common",
         "expiry": "common",
-        "add": "admin",
-        "edit": "admin"
+        "add": "common",
+        "edit": "common",
+        "delete": "admin"
     },
     "notifications": {
         "errorLoginBlank": "common",

storage.go

@@ -63,6 +63,7 @@ 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()
 }
 
@@ -89,6 +90,7 @@ 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()
 }
 
@@ -115,6 +117,7 @@ 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()
 }
 
@@ -141,6 +144,7 @@ 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()
 }
 

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, ServiceConfiguration } from "./modules/account-linking.js";
+import { Discord, Telegram, Matrix, ServiceConfiguration, MatrixConfiguration } 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["errorInvalidCode"],
+        invalidCodeError: window.messages["errorInvalidPIN"],
         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["errorInvalidCode"],
+        invalidCodeError: window.messages["errorInvalidPIN"],
         accountLinkedError: window.messages["errorAccountLinked"],
         successError: window.messages["verified"],
         successFunc: (modalClosed: boolean) => {
@@ -114,69 +114,31 @@ var matrixPIN = "";
 if (window.matrixEnabled) {
     window.matrixModal = new Modal(document.getElementById("modal-matrix"), window.matrixRequired);
     const matrixButton = document.getElementById("link-matrix") as HTMLSpanElement;
-    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 = input.value;
-                        matrixButton.classList.add("unfocused");
-                        document.getElementById("contact-via").classList.remove("unfocused");
-                        document.getElementById("contact-via-email").parentElement.classList.remove("unfocused");
-                        const radio = document.getElementById("contact-via-matrix") as HTMLInputElement;
-                        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 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: () => {
+            matrixVerified = true;
+            matrixPIN = matrix.pin;
+            matrixButton.classList.add("unfocused");
+            document.getElementById("contact-via").classList.remove("unfocused");
+            document.getElementById("contact-via-email").parentElement.classList.remove("unfocused");
+            const radio = document.getElementById("contact-via-matrix") as HTMLInputElement;
+            radio.parentElement.classList.remove("unfocused");
+            radio.checked = true;
+            validatorFunc();
         }
     };
+
+    const matrix = new Matrix(matrixConf);
+
+    matrixButton.onclick = () => { matrix.show(); };
 }
 
 if (window.confirmation) {

ts/modules/account-linking.ts

@@ -1,5 +1,5 @@
 import { Modal } from "../modules/modal.js";
-import { _get, _post, toggleLoader } from "../modules/common.js";
+import { _get, _post, toggleLoader, addLoader, removeLoader } from "../modules/common.js";
 
 interface formWindow extends Window {
     invalidPassword: string;
@@ -172,3 +172,95 @@ 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);
+}
+

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, notificationBox, whichAnimationEvent, toDateString, toggleLoader } from "./modules/common.js";
+import { _get, _post, _delete, notificationBox, whichAnimationEvent, toDateString, toggleLoader } from "./modules/common.js";
 import { Login } from "./modules/login.js";
-import { Discord, Telegram, ServiceConfiguration } from "./modules/account-linking.js";
+import { Discord, Telegram, Matrix, ServiceConfiguration, MatrixConfiguration } 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) => {
+    append = (name: string, details: MyDetailsContactMethod, icon: string, addEditFunc?: (add: boolean) => void, required?: boolean) => {
         const row = document.createElement("div");
         row.classList.add("row", "flex-expand", "my-2");
         let innerHTML = `
@@ -118,6 +118,15 @@ 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")}">
+                    &times;
+                </button>
+            `;
+        }
+
         innerHTML += `
             </div>
         `;
@@ -159,6 +168,14 @@ class ContactMethods {
             const addEditButton = row.querySelector(".user-contact-edit") as HTMLButtonElement;
             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);
     };
@@ -248,8 +265,6 @@ class ExpiryCard {
         this._interval = window.setInterval(this._drawCountdown, 60*1000);
         this._drawCountdown();
     }
-
-
 }
 
 var expiryCard = new ExpiryCard(statusCard);
@@ -291,7 +306,7 @@ const discordConf: ServiceConfiguration = {
     inviteURL: window.discordInviteLink ? "/my/discord/invite" : "",
     pinURL: "/my/pin/discord",
     verifiedURL: "/my/discord/verified/",
-    invalidCodeError: window.lang.notif("errorInvalidCode"),
+    invalidCodeError: window.lang.notif("errorInvalidPIN"),
     accountLinkedError: window.lang.notif("errorAccountLinked"),
     successError: window.lang.notif("verified"),
     successFunc: (modalClosed: boolean) => {
@@ -306,7 +321,7 @@ const telegramConf: ServiceConfiguration = {
     pin: "",
     pinURL: "/my/pin/telegram",
     verifiedURL: "/my/telegram/verified/",
-    invalidCodeError: window.lang.notif("errorInvalidCode"),
+    invalidCodeError: window.lang.notif("errorInvalidPIN"),
     accountLinkedError: window.lang.notif("errorAccountLinked"),
     successError: window.lang.notif("verified"),
     successFunc: (modalClosed: boolean) => {
@@ -316,6 +331,22 @@ 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) {
@@ -343,16 +374,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 }[] = [
-                {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}
+            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}
             ];
             
             for (let method of contactMethods) {
                 if (method.name in details) {
-                    contactMethodList.append(method.name, details[method.name], method.icon, method.f);
+                    contactMethodList.append(method.name, details[method.name], method.icon, method.f, method.required);
                 }
             }