From 36853e02c6815995dc48ef839e304c333dbae3cc Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Wed, 15 Jul 2020 12:36:36 +0200 Subject: [PATCH 1/2] Upgrade wms-core and properly redirect after auth --- src/controllers/MagicLinkController.ts | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/MagicLinkController.ts b/src/controllers/MagicLinkController.ts index d50070d..604a0f4 100644 --- a/src/controllers/MagicLinkController.ts +++ b/src/controllers/MagicLinkController.ts @@ -21,7 +21,7 @@ export default class MagicLinkController extends _MagicLinkController { // Auth success const user = await req.authGuard.getUserForSession(req.session!); req.flash('success', `Authentication success. Welcome, ${user?.name}!`); - res.redirect(Controller.route('home')); + res.redirect(req.query.redirect_uri?.toString() || Controller.route('home')); } break; } diff --git a/yarn.lock b/yarn.lock index eb89d7b..faf3665 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9837,9 +9837,9 @@ widest-line@^3.1.0: string-width "^4.0.0" wms-core@^0: - version "0.14.0" - resolved "https://registry.toot.party/wms-core/-/wms-core-0.14.0.tgz#896e6a0626fb8bf6c2e7b3a1e6de76239dd9092e" - integrity sha512-/Y2dXLgBbOOi2GKo9Dx8epQWSRQvp8TwGIJIJQyELnZpBiTo61W291tEK7QMDcjiOQ6FEjqjFR+p1u2QzuI/+w== + version "0.15.5" + resolved "https://registry.toot.party/wms-core/-/wms-core-0.15.5.tgz#40784c8dae3e5b2d1a71f78410233557dc885a2b" + integrity sha512-c/zrvs7otF+a2/KFBWQN3bJi0Gtd/FlX31CdKlrUl98bdfLwtmGfGfKhP6DNROvzznw9sUWOFEqPrG08KhqgGA== dependencies: argon2 "^0.26.2" compression "^1.7.4" From da26d6a8edbb3189d786e973658ebc07d5ea0f95 Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Wed, 15 Jul 2020 12:36:54 +0200 Subject: [PATCH 2/2] Version 0.4.6 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f8145f..7ce6fb3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ily.li", - "version": "0.4.5", + "version": "0.4.6", "description": "Self-hosted file pusher", "repository": "git@gitlab.com:ArisuOngaku/ily.li.git", "author": "Alice Gaudon ",