From b13ddeb4e0c464c894baf159d25766b3cf26e670 Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Fri, 6 Nov 2020 18:09:17 +0530
Subject: [PATCH 1/4] remove intermidiate step

---
 app/controllers/register.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index ab1b1cb8cd1..9671ce19951 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -22,11 +22,8 @@ export default class RegisterController extends Controller {
     this.model.save()
       .then(user => {
         this.set('session.newUser', user.get('email'));
-        if (this.inviteToken) {
           this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event);
-        } else {
-          this.transitionToRoute('login');
-        }
+          this.transitionToRoute('/');
       })
       .catch(reason => {
         if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === 409) {
@@ -60,7 +57,9 @@ export default class RegisterController extends Controller {
             await this.store.findRecord('user', tokenPayload.identity)
           );
         }
-        this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } });
+        if(token != null) {
+          this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } });
+        }
       })
       .catch(reason => {
         if (!(this.isDestroyed || this.isDestroying)) {

From 581b4575ca147c727c1b3417c5632055702a8c12 Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Fri, 6 Nov 2020 18:17:32 +0530
Subject: [PATCH 2/4] fix

---
 app/controllers/register.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index 9671ce19951..0dccce35fd5 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -22,8 +22,8 @@ export default class RegisterController extends Controller {
     this.model.save()
       .then(user => {
         this.set('session.newUser', user.get('email'));
-          this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event);
-          this.transitionToRoute('/');
+        this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event);
+        this.transitionToRoute('/');
       })
       .catch(reason => {
         if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === 409) {
@@ -57,7 +57,7 @@ export default class RegisterController extends Controller {
             await this.store.findRecord('user', tokenPayload.identity)
           );
         }
-        if(token != null) {
+        if (token != null) {
           this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } });
         }
       })

From e103d379003bdec51091b89d4934245dbd48adbf Mon Sep 17 00:00:00 2001
From: sundaram <dubeysundaram057@gmail.com>
Date: Fri, 6 Nov 2020 19:10:37 +0530
Subject: [PATCH 3/4] changing

---
 app/controllers/register.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index 0dccce35fd5..e4c3f4d8982 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -22,8 +22,7 @@ export default class RegisterController extends Controller {
     this.model.save()
       .then(user => {
         this.set('session.newUser', user.get('email'));
-        this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event);
-        this.transitionToRoute('/');
+          this.send('loginExistingUser', user.get('email'), password, this.inviteToken, this.event);
       })
       .catch(reason => {
         if (reason && Object.prototype.hasOwnProperty.call(reason, 'errors') && reason.errors[0].status === 409) {
@@ -57,8 +56,10 @@ export default class RegisterController extends Controller {
             await this.store.findRecord('user', tokenPayload.identity)
           );
         }
-        if (token != null) {
+        if(token != null) {
           this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } });
+        } else {
+          this.transitionToRoute('/');
         }
       })
       .catch(reason => {

From 028953e9f25fd8441d78e432081a6107a0adcb2f Mon Sep 17 00:00:00 2001
From: Areeb Jamal <jamal.areeb@gmail.com>
Date: Sat, 7 Nov 2020 02:29:57 +0530
Subject: [PATCH 4/4] Update app/controllers/register.js

---
 app/controllers/register.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/register.js b/app/controllers/register.js
index e4c3f4d8982..7a071a7b713 100644
--- a/app/controllers/register.js
+++ b/app/controllers/register.js
@@ -56,7 +56,7 @@ export default class RegisterController extends Controller {
             await this.store.findRecord('user', tokenPayload.identity)
           );
         }
-        if(token != null) {
+        if (token) {
           this.transitionToRoute('public.role-invites', eventId, { queryParams: { token } });
         } else {
           this.transitionToRoute('/');