Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-07-15 12:37:02 +02:00
commit 1ce5b0ec17
3 changed files with 5 additions and 5 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "ily.li", "name": "ily.li",
"version": "0.4.5", "version": "0.4.6",
"description": "Self-hosted file pusher", "description": "Self-hosted file pusher",
"repository": "git@gitlab.com:ArisuOngaku/ily.li.git", "repository": "git@gitlab.com:ArisuOngaku/ily.li.git",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

View File

@ -21,7 +21,7 @@ export default class MagicLinkController extends _MagicLinkController {
// Auth success // Auth success
const user = await req.authGuard.getUserForSession(req.session!); const user = await req.authGuard.getUserForSession(req.session!);
req.flash('success', `Authentication success. Welcome, ${user?.name}!`); req.flash('success', `Authentication success. Welcome, ${user?.name}!`);
res.redirect(Controller.route('home')); res.redirect(req.query.redirect_uri?.toString() || Controller.route('home'));
} }
break; break;
} }

View File

@ -9837,9 +9837,9 @@ widest-line@^3.1.0:
string-width "^4.0.0" string-width "^4.0.0"
wms-core@^0: wms-core@^0:
version "0.14.0" version "0.15.5"
resolved "https://registry.toot.party/wms-core/-/wms-core-0.14.0.tgz#896e6a0626fb8bf6c2e7b3a1e6de76239dd9092e" resolved "https://registry.toot.party/wms-core/-/wms-core-0.15.5.tgz#40784c8dae3e5b2d1a71f78410233557dc885a2b"
integrity sha512-/Y2dXLgBbOOi2GKo9Dx8epQWSRQvp8TwGIJIJQyELnZpBiTo61W291tEK7QMDcjiOQ6FEjqjFR+p1u2QzuI/+w== integrity sha512-c/zrvs7otF+a2/KFBWQN3bJi0Gtd/FlX31CdKlrUl98bdfLwtmGfGfKhP6DNROvzznw9sUWOFEqPrG08KhqgGA==
dependencies: dependencies:
argon2 "^0.26.2" argon2 "^0.26.2"
compression "^1.7.4" compression "^1.7.4"