hrfee
/
jfa-go
mirror of https://github.com/hrfee/jfa-go.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,687 Commits 17 Branches 30 Tags 59 MiB
Commit Graph

167 Commits

Author SHA1 Message Date
Harvey Tindall 591e3c5ca1
Discord: embed images 
![alt](image link) is now converted to an image embed.
 2021-05-22 15:32:51 +01:00
Harvey Tindall a6447165b7
add email notify enable/disable; remove (de)hyphening 
hyphen/dehyphen conflicted with new migration for email contact
preference, and it's been a while since this has been an issue so i've
just commented it out for now.
 2021-05-21 22:46:46 +01:00
Harvey Tindall f8f5f35cc1
PIN verification, notifications, multiple notif providers 
Discord, Email & Telegram can be enabled, although email is always
enabled right now (will fix). Also apparently markdown hyperlinks don't
work in Discord, eventually will implement something to convert them to
embeds.
 2021-05-21 21:35:25 +01:00
Harvey Tindall 057f306ed9
hide/ignore ssl_cert when on windows 
x509.SystemCertPool is unavailable on windows, so any value is ignored
and the setting is hidden on the web UI.
 2021-05-17 01:16:59 +01:00
Harvey Tindall 71554e0c85
Telegram: Change user's contact method in accounts 
By clicking the cog next to the telegram username, one can select
whether to contact through telegram or email.
 2021-05-08 15:53:42 +01:00
Harvey Tindall ea0293bd4e
Split some settings into new "messages" section 
Most email dependant sections now depend on this. Also renamed more
email things.
 2021-05-07 21:53:29 +01:00
Harvey Tindall 2d93b3b7ee
Telegram: Allow admin to add telegram contact 
Works in the same way as on the form, but can now be done in the
accounts tab.
 2021-05-07 18:20:35 +01:00
Harvey Tindall 0f41d1e6cf
Telegram: Display username on accounts tab 2021-05-07 17:01:22 +01:00
Harvey Tindall 716d6a931a
Telegram: Send messages via telegram 
Most messages are now sent as plaintext via telegram when suitable.
 2021-05-07 16:06:47 +01:00
Harvey Tindall 72bf280e2d
telegram: Fix UI and store useful Telegram info 
Creation now works, and language preferences made before signup are
kept. telegram file storage now uses the Jellyfin ID as a key, which
makes much more sense. Also added radios to select preferred notification
method (email/telegram) as well, which the admin will soon be able to
change also.
 2021-05-07 14:32:51 +01:00
Harvey Tindall 99875b9176
almost complete telegram user verification 
When signing up, the user is given a pin code which they send to a
telegram bot. This provides user verification, but more importantly
allows the bot to message the user, as the Telegram API requires the
user to interact with the bot before it can do the opposite.

The bot should recognize the correct language, but a /lang command is
also provided to change it.

The verification process is pretty much functional but ui is still
broken, and it isn't properly integrated yet.
 2021-05-07 01:08:12 +01:00
Harvey Tindall 0e21942cd6
add hard restart for updates on *nix 
reincarnates app.Restart() removed in
bbb0568cc4 as app.HardRestart().
 2021-05-03 20:08:23 +01:00
Harvey Tindall c0f316d049
add preview to Announcements 2021-05-03 18:35:27 +01:00
Harvey Tindall 5d8f139356
fix race condition; rename route functions; fix swagger params 
fix race condition when notifying of invite expiry, rename custom email
related functions as to reduce confusion, and add proper path params for
some swagger routes. Also moved some stuff around in api.go.
 2021-05-02 20:42:37 +01:00
Harvey Tindall 43effd0c32
add reset link option to setup 2021-05-02 14:15:03 +01:00
Harvey Tindall 9944cc2db9
refactor; move logger to module 2021-05-01 00:13:57 +01:00
Harvey Tindall 570e3a1e54
fix en-es name and filename 2021-04-30 13:54:53 +01:00
Harvey Tindall 8fdab39b18
use templateEmail and show conditionals in editor 2021-04-15 15:34:17 +01:00
Harvey Tindall 55e21f8be3
accounts: add user enable/disable & emails 2021-04-12 21:28:36 +01:00
Harvey Tindall d701c5f27d
add months field to invites & expiry 2021-04-08 20:43:01 +01:00
Harvey Tindall 7a3e0d60f9
add expiry to welcome email, add dummy emailer for debugging 
the "yourAccountWillExpire" has also been added to the editor for #81.
To use the dummy emailer, set [email]/method to "dummy".
 2021-04-08 14:20:13 +01:00
Harvey Tindall 3f8414c70a
use unix timestamp for inv created & usedBy 
usedBy is still stored as a string in invites.json to cope with existing
invites with times stored formatted. knz/strtime requires cgo for
strptime, so it has been replaced with the native itchyny/timefmt-go.
 2021-04-06 21:25:44 +01:00
Harvey Tindall 6ec2186bdf
switch accounts tab to unix times 
should now respect the client's locale.
 2021-04-06 20:53:30 +01:00
Harvey Tindall 754b956206
remove extra logs 2021-04-06 18:32:32 +01:00
Harvey Tindall e6e5231f63
add extra logging 2021-04-06 18:02:15 +01:00
Harvey Tindall 8a6cfe0b4d
disallow negative values in ExtendExpiry, fix nil map err 2021-04-06 14:00:32 +01:00
Harvey Tindall 76b822213e
add more error logging; mutex for app.storage.users 2021-04-06 13:44:52 +01:00
Harvey Tindall ab3d5f3321
fix logging for expiry extension 
also delete expiries for users that no longer exist.
 2021-04-06 13:31:42 +01:00
Harvey Tindall e1d42c8a87
Update CONTRIBUTING.md, mb 0.3.3 
One last missing field added for #76.
 2021-04-05 16:34:47 +01:00
Harvey Tindall 2a0edeb3c5
bump mediabrowser version, more consistent logs 
uses descriptive errors added in mb v0.2.0. Also improved
the consistency of logs in api.go/main.go.
 2021-04-02 22:13:04 +01:00
Harvey Tindall 9370913ace
add password reset link option 
When enabled (in Settings > Password Resets), a magic link will be sent
instead of a PIN when the user tries reset their password. By doing
this the user doesn't have to keep the Jellyfin tab open to enter the
code.
 2021-03-30 22:41:28 +01:00
Harvey Tindall 762dac2581
move mediabrowser to separate repo 2021-03-29 21:49:46 +01:00
Harvey Tindall 618cc32a17
hide updates from settings when disabled at build-time 2021-03-20 23:32:32 +00:00
Harvey Tindall 92332206f0
add basic update functionality 
If enabled, jfa-go pings buildrone (hosted at builds.hrfee.pw) every 30
min for new updates. If there is one, it gets information (and if
applicable, a binary) from the appropriate source (buildrone, github, or
dockerhub) and displays it on the admin page. You can switch update
channels between stable and unstable. For binary releases, updates are
downloaded automatically and installed when the user presses update.

Since this obviously introduces some "phone-home" functionality into
jfa-go, I just want to say IPs are not and will not be logged by
buildrone, although I may later introduce functionality to give a rough
idea of the number of users (again, no IPs stored). The whole thing can
also be turned off in settings.
 2021-03-07 15:23:44 +00:00
Harvey Tindall bd05a4b35a
include LICENSE in build, display in about tab 
Also fixes last commit, user cache wasn't refreshed in ApplySettings, is
now.
 2021-03-01 00:32:09 +00:00
Harvey Tindall fa7da1b23f
Don't use cache to ApplySettings and CreateProfile 
also use a wrapper function to set default settings in config.go so it's
less ugly.
 2021-02-28 18:26:22 +00:00
Harvey Tindall 1ec5d2ca3f
add disabled badge, extend expiry button to accounts 2021-02-28 17:52:24 +00:00
Harvey Tindall 1e9d184508
implement user expiry functionality 
All works now, but i'll add a field on the accounts tab for users with
an expiry, as well as a 'disabled' badge.
 2021-02-28 15:41:06 +00:00
Harvey Tindall 2934832a98
implement frontend for user expiry/duration 
this will add an optional validity period to users, where their account
will be disabled (or deleted) a specified amount of time after they
created it.
 2021-02-28 00:44:28 +00:00
Harvey Tindall 40fc5e9604
Fix email editor when plaintext setting enabled 2021-02-22 16:40:37 +00:00
Harvey Tindall 52d9cda61a
Move email rendering to browser 
the email preview no longer has a delay after each change. This also
avoids a race condition in which the email currently being edited could
be actually sent.
 2021-02-22 00:43:36 +00:00
Harvey Tindall d1b1b90de3
Add email list accessible by edit button in settings 2021-02-21 15:51:42 +00:00
Harvey Tindall 058cac2e7b
implement email editor w/ live(?) preview 
not accessible in the ui currently, but the object is available as
window.ee for testing.
 2021-02-20 22:49:59 +00:00
Harvey Tindall cc4e12c405
finish backend of custom emails 
biggest bodge i've ever done but it works i guess.
 2021-02-20 00:22:40 +00:00
Harvey Tindall eb406ef951
Implement email template generation 
Variables are surrounded by {}, and initial (default) templates are
generated on demand from the plaintext version of emails. The custom
emails are intended to only be used if the user actually changes them,
as they lose the features of the default ones, such as tables.
 2021-02-19 21:38:20 +00:00
Harvey Tindall b25f786018
use bulk email sending on account deletion 2021-02-19 14:51:36 +00:00
Harvey Tindall 76fa171575
cleanup logs and use structs in jf/emby api 
Also means times are directly parsed when pulling data from jf/emby,
which was *painful* to get working (something broke the whole program and it
took me an hour to figure out it was this lol). Time parsing should be a
lot stabler too.
 2021-02-19 00:47:01 +00:00
Harvey Tindall fa433c88a8
add announcement emails 
After selecting users in the accounts tab, you can press 'Announce',
then write a subject and message (with markdown), and an email will be
sent to each selected user.
 2021-02-18 14:58:53 +00:00
Harvey Tindall ea99966057
refactor, move route loading to router.go 2021-02-12 14:59:16 +00:00
Harvey Tindall 90c6cee780
add restart button 2021-01-31 19:01:20 +00:00
Harvey Tindall 456ef556b1
add inter-section dependency for settings 
Currently used to hide all email sections when [email]/method is blank
(disabled).
 2021-01-31 18:50:04 +00:00
Harvey Tindall ee026714d4
Add optional email confirmation 
If enabled, a confirmation email will be sent before the user can create
their account.
 2021-01-30 19:19:12 +00:00
Harvey Tindall 3dd83bffbf
Merge branch 'new-setup' 
Merge new setup wizard

This is much more up-to-date than the previous setup page, with a new
design and previously missing/new settings. Currently only available in
english (hopefully that changes soon).

also fixes conflict in _post.
 2021-01-27 22:06:44 +00:00
Harvey Tindall 167fae9892
add jellyfin connection test, submission 
fully functional now, but still need to add some sections (ombi mainly).
 2021-01-27 12:55:39 +00:00
Harvey Tindall 8c871bc5fa
Add ts to link setting dependance 
Also make store each setting as classes in a settings object, to make it
easier to serialize on submitting. Also, added
"substitute_jellyfin_strings", "no_username" and welcome_email.
 2021-01-26 22:57:29 +00:00
Harvey Tindall 8af1c13d7e
Display error messages on form 
two new strings need translating in lang/form.
 2021-01-25 18:01:18 +00:00
Harvey Tindall dd96d71280
Add optional label for invites 
Requested in #38.
 2021-01-24 15:55:45 +00:00
Harvey Tindall ea262ca60b
add optional welcome email for new users 
When enabled, an email with the server URL and username will be sent to
created users. Requested in #38.
 2021-01-24 15:19:58 +00:00
Harvey Tindall e834445b0b
Restructure language loading to support incomplete translations 
On startup, files are scanned and any missing values are replaced with
the english version.
 2021-01-19 00:29:29 +00:00
Harvey Tindall 3d5bea003a
Fix email language selection, add finished french emails 2021-01-15 14:43:32 +00:00
Harvey Tindall bc99dc34ee
Add email translation, add part of french translations 
Admin translation from @Killianbe, Email translation from
@Cornichon420. French is currently not functional, a few things are
missing which i'm waiting on.
 2021-01-15 14:43:32 +00:00
Harvey Tindall 4679c6f355
add language selector to admin 2021-01-15 14:43:32 +00:00
Harvey Tindall a3351f4da8
separate options for form and admin language 2021-01-15 14:43:32 +00:00
Harvey Tindall 3c799b8783
remove debug printfs 2021-01-11 19:19:19 +00:00
Harvey Tindall 3fbbc7f620
add language selector to form 2021-01-11 19:17:43 +00:00
Harvey Tindall 8d0dc232d7 option to substitute "Jellyfin" in form.html 
setting is jellyfin/substitute_jellyfin_strings.
 2021-01-10 16:10:03 +00:00
Harvey Tindall d9e1e2f58b compiles, basic issues fixed 
Server type is found under the Jellyfin settings tab, where you can
change it to emby. Currently:

* logs in
* creates users
* parses accounts
 2021-01-10 16:10:03 +00:00
Harvey Tindall 5d56ed5378 fix most incompatibilites, start separating api clients 2021-01-10 16:10:03 +00:00
Harvey Tindall eb370d64df
Merge a17t-redesign, kinda ts-ify setup.js 
the web ui has been redesigned with the a17t toolkit, which imo looks a
lot better than bootstrap. This also brought a complete rework of the
web code, which now makes a lot more sense hopefully. the setup page is
still stuck with bootstrap, its not much of a priority but i'll rewrite
it eventually.
 2021-01-05 18:16:23 +00:00
Harvey Tindall a1e30ff5db
fix/improve parsing of last active dates 
parseDT only uses the magic json.Unmarshal method if theres an error
with the better version. Error came from some times being sent without a
"Z" at the end denoting UTC.
 2020-12-03 20:49:50 +00:00
Harvey Tindall 9dbf60e3df
add URL base option for subfolder proxies 
also cleaned up the naming of some things.
 2020-11-22 16:36:43 +00:00
Harvey Tindall d64e98da37
use Bearer auth instead of Basic 
this was a relic from the python version, i'd modeled the auth code off
some random blog post back then.
 2020-11-12 21:05:46 +00:00
Harvey Tindall 47abf20e1d
store emails even if password resets are disabled 
there are other reasons to store email addresses now, so this is no
longer a just requirement.
 2020-11-03 21:20:38 +00:00
Harvey Tindall 493f10fa36
add french, fix language selector in settings 
note: custom language files can now be added in data/lang/form and will be
listed in settings.
 2020-11-03 21:11:43 +00:00
Harvey Tindall 8e45ecb214
add cache_timeout option 
controls how old the Jellyfin user cache can be before refetching. defaults to 30 minutes.
 2020-11-02 23:26:46 +00:00
Harvey Tindall d4a92adc65
add rough error logging for read/write errors 2020-11-02 23:20:06 +00:00
Harvey Tindall c84ea17af4
refactor; separate jfapi and ombi into modules 2020-11-02 00:53:08 +00:00
Harvey Tindall 95c9f4f42d
Apply email addres changes to ombi 
for #11.
 2020-10-30 21:13:13 +00:00
Harvey Tindall a89dc40ff2
delete ombi user when deleting jf user 
also fix ombi defaults menu in ui. responds to #11.
 2020-10-29 16:03:00 +00:00
Harvey Tindall 301f502052
Rework typescript to use modules 
web UI now uses modules, and relies less on bodge to make things work.
Also fixes an issue where invites where "failed to send to xx" appeared
in invite form.
 2020-10-22 17:50:40 +01:00
Harvey Tindall 7628e5d71d
Move api models to separate file 2020-09-27 21:03:37 +01:00
Harvey Tindall 9f6e405d1c
Add auth and tags to swagger 2020-09-24 18:50:03 +01:00
Harvey Tindall b6537cef65
Add basic swagger documentation 
accessible by running with -swagger. Accessible at /swagger/index.html.
Currently doesn't have authentication setup, so no requests will work.
 2020-09-24 17:51:13 +01:00
Harvey Tindall 9bd7fca95e
fix table sizing on bootstrap 4; fix profile application on single-use 
invites

use table-sm and no form-check-input so profile menu looks normal on
bs4. Profile was being read after being marked as used on invites, so
single-use invites were deleted and no profile was applied.
 2020-09-23 19:12:58 +01:00
Harvey Tindall 89e70f6f7a
Add default profile functionality 
Default profile can be selected in settings.
 2020-09-23 18:48:00 +01:00
Harvey Tindall 6b25215768
apply settings even if section doesn't exist 
in response to issue #7. Not sure why this wasn't the original
behaviour, nor how I hadn't noticed it earlier
 2020-09-23 17:20:48 +01:00
Harvey Tindall 903a61d0f2
Profiles replace user templates 
Profile functionality is essentially complete, and they can be created
in settings. Only thing currently missing is a way to set a default
profile.
 2020-09-23 00:01:07 +01:00
Harvey Tindall 2ab9b48f4b
Move settings menu to a tab 
settings is now its own tab instead of a modal.
 2020-09-22 20:46:48 +01:00
Harvey Tindall b6ceee508c
Fix bug with invites in webui, add profile selector 
invite codes starting with a digit don't work with the webui, so
GenerateInvite regenerates uuids until theres one that doesn't.
 2020-09-22 00:34:11 +01:00
Harvey Tindall 32b8ed4aa2
rewrite* most web ui code in typescript 
i wanted to split up the web ui components into multiple files, and
figured it'd be a good chance to try out typescript. run make typescript
to compile everything in ts/ and put it in data/static/.

This is less of a rewrite and more of a refactoring, most of it still
works the same but bits have been cleaned up too.

Remaining javascript found in setup.js and form.html
 2020-09-21 22:06:27 +01:00
Harvey Tindall c4acb43cb8
Initial features for move to profiles 
user templates will become profiles. You will be able to make multiple,
and assign them  to invites individually. This commit migrates the
separate template files into one profile entry called "Default", and
lets you select them on invites. No way to create profiles has been
added yet.
 2020-09-20 11:21:04 +01:00
Harvey Tindall 49b056f1d6
fix notification buttons 
their current status wouldn't display because of a slight mistake, and
they did the wrong thing because i forgot there isn't a nil value for
bools.
 2020-09-19 17:05:09 +01:00
Harvey Tindall 5ba40cd6f8
fix panic when jfa-go user has no email set with jellyfin_login 2020-09-19 09:09:30 +01:00
Harvey Tindall d4b94bc9d9
add user button 
added create user button for the admin to use.
 2020-09-18 00:59:59 +01:00
Harvey Tindall 9213f2a078
Add account deletion with email notification 
Select users to delete, then optionally opt to notify the user in an
email with a provided reason.
 2020-09-17 23:50:07 +01:00
Harvey Tindall 7ac750879f
Remove email addresses in settings, move to accounts tab 
still a little rough, but it works.
 2020-09-17 21:23:45 +01:00
Harvey Tindall cd61989495
Initial features of accounts tab 
It's rough right now, but the accounts tab shows a list of users and
info. Right now the only action available is to apply settings (from
template or another user) to a selection of users. More to come.
 2020-09-17 16:51:19 +01:00
Harvey Tindall a8b4842895
add more info to getUsers, move admin.html css to scss files 
more deatils included in getUsers response in prep for feature request #5. bs4 and bs5 css are now compiled instead of being copied.
 2020-09-16 21:42:22 +01:00
Harvey Tindall b8dfb5d6a3
decouple email content from sender to ensure thread safety 
If two emails fired off at once, they would previously replace each
other's content and possibly send the wrong email to the wrong person.
construct* methods now return the email content, which is sent
separately.
 2020-09-13 21:18:47 +01:00
Harvey Tindall 51839b5942
Restructure email sending 
smtp and mailgun now implement an emailClient interface, which the
Emailer can use.
 2020-09-13 21:07:15 +01:00