From 7c141614edcf7e517ea5e5ff21bf1501a614b23c Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@yahoo.com>
Date: Sat, 30 Jun 2018 22:06:18 -0500
Subject: [PATCH] Api login party invites (#10486)

* Fixed incorrect variable

* Fixed redirect params
---
 website/client/components/settings/api.vue | 4 ++--
 website/client/router.js                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/client/components/settings/api.vue b/website/client/components/settings/api.vue
index d161024313..5b6627da14 100644
--- a/website/client/components/settings/api.vue
+++ b/website/client/components/settings/api.vue
@@ -99,13 +99,13 @@ export default {
   },
   methods: {
     receiveMessage (eventFrom) {
-      if (event.origin !== 'https://www.spritely.app') return;
+      if (eventFrom.origin !== 'https://www.spritely.app') return;
 
       const creds = {
         userId: this.user._id,
         apiToken: this.credentials.API_TOKEN,
       };
-      eventFrom.source.postMessage(creds, event.origin);
+      eventFrom.source.postMessage(creds, eventFrom.origin);
     },
     async addWebhook (url) {
       let webhookInfo = {
diff --git a/website/client/router.js b/website/client/router.js
index 05c41e65c0..bd74858d2c 100644
--- a/website/client/router.js
+++ b/website/client/router.js
@@ -297,7 +297,7 @@ router.beforeEach(function routerGuard (to, from, next) {
       name: redirectTo,
       query: redirectTo === 'login' ? {
         redirectTo: to.path,
-      } : null,
+      } : to.query,
     });
   }