open-source-mirrors
/
jfa-go
mirror of https://github.com/hrfee/jfa-go
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accounts: Unlink Telegram/Discord/Matrix through cog

Browse Source 
Added an unlinking section to the little cog dropdown next to users so
that one can remove and re-link a different account for a Jellyfin user.
Also adjusted padding in the dropdown.
pull/260/head
Harvey Tindall 2 years ago
parent 49c7d83840
commit 775ebd3b1e
No known key found for this signature in database
GPG Key ID: BBC65952848FB1A2
5 changed files with 105 additions and 5 deletions
Show Stats Download Patch File Download Diff File

57
api-messages.go
Unescape View File

@ -724,3 +724,60 @@ func (app *appContext) DiscordConnect(gc *gin.Context) {
linkExistingOmbiDiscordTelegram(app) linkExistingOmbiDiscordTelegram(app)
respondBool(200, true, gc) respondBool(200, true, gc)
} }
// @Summary unlink a Discord account from a Jellyfin user. Always succeeds.
// @Produce json
// @Success 200 {object} boolResponse
// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
// @Router /users/discord [delete]
// @Tags Users
func (app *appContext) UnlinkDiscord(gc *gin.Context) {
var req forUserDTO
gc.BindJSON(&req)
/* user, status, err := app.jf.UserByID(req.ID, false)
if req.ID == "" || status != 200 || err != nil {
respond(400, "User not found", gc)
return
} */
delete(app.storage.discord, req.ID)
app.storage.storeDiscordUsers()
respondBool(200, true, gc)
}
// @Summary unlink a Telegram account from a Jellyfin user. Always succeeds.
// @Produce json
// @Success 200 {object} boolResponse
// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
// @Router /users/telegram [delete]
// @Tags Users
func (app *appContext) UnlinkTelegram(gc *gin.Context) {
var req forUserDTO
gc.BindJSON(&req)
/* user, status, err := app.jf.UserByID(req.ID, false)
if req.ID == "" || status != 200 || err != nil {
respond(400, "User not found", gc)
return
} */
delete(app.storage.telegram, req.ID)
app.storage.storeTelegramUsers()
respondBool(200, true, gc)
}
// @Summary unlink a Matrix account from a Jellyfin user. Always succeeds.
// @Produce json
// @Success 200 {object} boolResponse
// @Param forUserDTO body forUserDTO true "User's Jellyfin ID."
// @Router /users/matrix [delete]
// @Tags Users
func (app *appContext) UnlinkMatrix(gc *gin.Context) {
var req forUserDTO
gc.BindJSON(&req)
/* user, status, err := app.jf.UserByID(req.ID, false)
if req.ID == "" || status != 200 || err != nil {
respond(400, "User not found", gc)
return
} */
delete(app.storage.matrix, req.ID)
app.storage.storeMatrixUsers()
respondBool(200, true, gc)
}

1
lang/admin/en-us.json
Unescape View File

@ -59,6 +59,7 @@
"reset": "Reset", "reset": "Reset",
"edit": "Edit", "edit": "Edit",
"donate": "Donate", "donate": "Donate",
"unlink": "Unlink Account",
"sendPWR": "Send Password Reset", "sendPWR": "Send Password Reset",
"contactThrough": "Contact through:", "contactThrough": "Contact through:",
"extendExpiry": "Extend expiry", "extendExpiry": "Extend expiry",

4
models.go
Unescape View File

@ -355,3 +355,7 @@ type setAccountsAdminDTO map[string]bool
type genCaptchaDTO struct { type genCaptchaDTO struct {
ID string `json:"id"` ID string `json:"id"`
} }
type forUserDTO struct {
ID string `json:"id"` // Jellyfin ID
}

3
router.go
Unescape View File

@ -192,6 +192,9 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
api.GET(p+"/telegram/pin", app.TelegramGetPin) api.GET(p+"/telegram/pin", app.TelegramGetPin)
api.GET(p+"/telegram/verified/:pin", app.TelegramVerified) api.GET(p+"/telegram/verified/:pin", app.TelegramVerified)
api.POST(p+"/users/telegram", app.TelegramAddUser) api.POST(p+"/users/telegram", app.TelegramAddUser)
api.DELETE(p+"/users/telegram", app.UnlinkTelegram)
api.DELETE(p+"/users/discord", app.UnlinkDiscord)
api.DELETE(p+"/users/matrix", app.UnlinkMatrix)
} }
if emailEnabled { if emailEnabled {
api.POST(p+"/users/contact", app.SetContactMethods) api.POST(p+"/users/contact", app.SetContactMethods)

45
ts/modules/accounts.ts
Unescape View File

@ -81,6 +81,15 @@ class user implements User {
if (email) return "email"; if (email) return "email";
} }
private _checkUnlinkArea = () => {
const unlinkHeader = this._notifyDropdown.querySelector(".accounts-unlink-header") as HTMLSpanElement;
if (this.lastNotifyMethod() == "email" || !this.lastNotifyMethod()) {
unlinkHeader.classList.add("unfocused");
} else {
unlinkHeader.classList.remove("unfocused");
}
}
get selected(): boolean { return this._selected; } get selected(): boolean { return this._selected; }
set selected(state: boolean) { set selected(state: boolean) {
this._selected = state; this._selected = state;
@ -164,31 +173,41 @@ class user implements User {
<div class="dropdown manual"> <div class="dropdown manual">
<div class="dropdown-display lg"> <div class="dropdown-display lg">
<div class="card ~neutral @low"> <div class="card ~neutral @low">
<span class="supra sm">${window.lang.strings("contactThrough")}</span> <div class="supra sm mb-2">${window.lang.strings("contactThrough")}</div>
<div class="accounts-area-email"> <div class="accounts-area-email">
<label class="row switch pb-4 mt-2"> <label class="row switch pb-2">
<input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-email mr-2"> <input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-email mr-2">
</span>Email</span> </span>Email</span>
</label> </label>
</div> </div>
<div class="accounts-area-telegram"> <div class="accounts-area-telegram">
<label class="row switch pb-4"> <label class="row switch pb-2">
<input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-telegram mr-2"> <input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-telegram mr-2">
<span>Telegram</span> <span>Telegram</span>
</label> </label>
</div> </div>
<div class="accounts-area-discord"> <div class="accounts-area-discord">
<label class="row switch pb-4"> <label class="row switch pb-2">
<input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-discord mr-2"> <input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-discord mr-2">
<span>Discord</span> <span>Discord</span>
</label> </label>
</div> </div>
<div class="accounts-area-matrix"> <div class="accounts-area-matrix">
<label class="row switch pb-4"> <label class="row switch pb-2">
<input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-matrix mr-2"> <input type="checkbox" name="accounts-contact-${this.id}" class="accounts-contact-matrix mr-2">
<span>Matrix</span> <span>Matrix</span>
</label> </label>
</div> </div>
<div class="supra sm mb-2 accounts-unlink-header">${window.lang.strings("unlink")}:</div>
<div class="accounts-unlink-telegram">
<button class="button ~critical mb-2 w-100">Telegram</button>
</div>
<div class="accounts-unlink-discord">
<button class="button ~critical mb-2 w-100">Discord</button>
</div>
<div class="accounts-unlink-matrix">
<button class="button ~critical mb-2 w-100">Matrix</button>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -200,6 +219,10 @@ class user implements User {
for (let i = 0; i < checks.length; i++) { for (let i = 0; i < checks.length; i++) {
checks[i].onclick = () => this._setNotifyMethod(); checks[i].onclick = () => this._setNotifyMethod();
} }
for (let service of ["telegram", "discord", "matrix"]) {
el.querySelector(".accounts-unlink-"+service).addEventListener("click", () => _delete(`/users/${service}`, {"id": this.id}, () => document.dispatchEvent(new CustomEvent("accounts-reload"))));
}
button.onclick = () => { button.onclick = () => {
dropdown.classList.add("selected"); dropdown.classList.add("selected");
@ -218,12 +241,14 @@ class user implements User {
set matrix(u: string) { set matrix(u: string) {
if (!window.matrixEnabled) { if (!window.matrixEnabled) {
this._notifyDropdown.querySelector(".accounts-area-matrix").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-matrix").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-matrix").classList.add("unfocused");
return; return;
} }
const lastNotifyMethod = this.lastNotifyMethod() == "matrix"; const lastNotifyMethod = this.lastNotifyMethod() == "matrix";
this._matrixID = u; this._matrixID = u;
if (!u) { if (!u) {
this._notifyDropdown.querySelector(".accounts-area-matrix").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-matrix").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-matrix").classList.add("unfocused");
this._matrix.innerHTML = ` this._matrix.innerHTML = `
<div class="table-inline justify-center"> <div class="table-inline justify-center">
<span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span> <span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span>
@ -233,6 +258,7 @@ class user implements User {
(this._matrix.querySelector("span") as HTMLSpanElement).onclick = this._addMatrix; (this._matrix.querySelector("span") as HTMLSpanElement).onclick = this._addMatrix;
} else { } else {
this._notifyDropdown.querySelector(".accounts-area-matrix").classList.remove("unfocused"); this._notifyDropdown.querySelector(".accounts-area-matrix").classList.remove("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-matrix").classList.remove("unfocused");
this._matrix.innerHTML = ` this._matrix.innerHTML = `
<div class="table-inline"> <div class="table-inline">
${u} ${u}
@ -242,6 +268,7 @@ class user implements User {
(this._matrix.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown); (this._matrix.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown);
} }
} }
this._checkUnlinkArea();
} }
private _addMatrix = () => { private _addMatrix = () => {
@ -290,16 +317,19 @@ class user implements User {
set telegram(u: string) { set telegram(u: string) {
if (!window.telegramEnabled) { if (!window.telegramEnabled) {
this._notifyDropdown.querySelector(".accounts-area-telegram").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-telegram").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-telegram").classList.add("unfocused");
return; return;
} }
const lastNotifyMethod = this.lastNotifyMethod() == "telegram"; const lastNotifyMethod = this.lastNotifyMethod() == "telegram";
this._telegramUsername = u; this._telegramUsername = u;
if (!u) { if (!u) {
this._notifyDropdown.querySelector(".accounts-area-telegram").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-telegram").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-telegram").classList.add("unfocused");
this._telegram.innerHTML = `<div class="table-inline justify-center"><span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span></div>`; this._telegram.innerHTML = `<div class="table-inline justify-center"><span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span></div>`;
(this._telegram.querySelector("span") as HTMLSpanElement).onclick = this._addTelegram; (this._telegram.querySelector("span") as HTMLSpanElement).onclick = this._addTelegram;
} else { } else {
this._notifyDropdown.querySelector(".accounts-area-telegram").classList.remove("unfocused"); this._notifyDropdown.querySelector(".accounts-area-telegram").classList.remove("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-telegram").classList.remove("unfocused");
this._telegram.innerHTML = ` this._telegram.innerHTML = `
<div class="table-inline"> <div class="table-inline">
<a href="https://t.me/${u}" target="_blank">@${u}</a> <a href="https://t.me/${u}" target="_blank">@${u}</a>
@ -309,6 +339,7 @@ class user implements User {
(this._telegram.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown); (this._telegram.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown);
} }
} }
this._checkUnlinkArea();
} }
get notify_telegram(): boolean { return this._notifyTelegram; } get notify_telegram(): boolean { return this._notifyTelegram; }
@ -356,6 +387,7 @@ class user implements User {
set discord(u: string) { set discord(u: string) {
if (!window.discordEnabled) { if (!window.discordEnabled) {
this._notifyDropdown.querySelector(".accounts-area-discord").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-discord").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-discord").classList.add("unfocused");
return; return;
} }
const lastNotifyMethod = this.lastNotifyMethod() == "discord"; const lastNotifyMethod = this.lastNotifyMethod() == "discord";
@ -364,8 +396,10 @@ class user implements User {
this._discord.innerHTML = `<div class="table-inline justify-center"><span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span></div>`; this._discord.innerHTML = `<div class="table-inline justify-center"><span class="chip btn @low"><i class="ri-link" alt="${window.lang.strings("add")}"></i></span></div>`;
(this._discord.querySelector("span") as HTMLSpanElement).onclick = () => addDiscord(this.id); (this._discord.querySelector("span") as HTMLSpanElement).onclick = () => addDiscord(this.id);
this._notifyDropdown.querySelector(".accounts-area-discord").classList.add("unfocused"); this._notifyDropdown.querySelector(".accounts-area-discord").classList.add("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-discord").classList.add("unfocused");
} else { } else {
this._notifyDropdown.querySelector(".accounts-area-discord").classList.remove("unfocused"); this._notifyDropdown.querySelector(".accounts-area-discord").classList.remove("unfocused");
this._notifyDropdown.querySelector(".accounts-unlink-discord").classList.remove("unfocused");
this._discord.innerHTML = ` this._discord.innerHTML = `
<div class="table-inline"> <div class="table-inline">
<a href="https://discord.com/users/${this._discordID}" class="discord-link" target="_blank">${u}</a> <a href="https://discord.com/users/${this._discordID}" class="discord-link" target="_blank">${u}</a>
@ -375,6 +409,7 @@ class user implements User {
(this._discord.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown); (this._discord.querySelector(".table-inline") as HTMLDivElement).appendChild(this._notifyDropdown);
} }
} }
this._checkUnlinkArea();
} }
get discord_id(): string { return this._discordID; } get discord_id(): string { return this._discordID; }

Write Preview
Loading…
Cancel
Save