Secret URL - Fixes #1574

RocketChat · Dec 4, 2015 · 527ffac · 527ffac
1 parent 13df770
commit 527ffac
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 12 deletions.
diff --git a/client/routes/router.coffee b/client/routes/router.coffee
@@ -107,13 +107,15 @@ FlowRouter.route '/fxos',
 FlowRouter.route '/register/:hash',
 	name: 'register-secret-url'
 	action: (params) ->
-		if RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL'
-			Meteor.call 'checkRegistrationSecretURL', params.hash, (err, success) ->
-				if success
-					Session.set 'loginDefaultState', 'register'
-					BlazeLayout.render 'main', {center: 'home'}
-					KonchatNotification.getDesktopPermission()
-				else
-					BlazeLayout.render 'blankLayout', { render: 'invalidSecretURL' }
-		else
-			BlazeLayout.render 'blankLayout', { render: 'invalidSecretURL' }
+		BlazeLayout.render 'secretURL'
+
+		# if RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL'
+		# 	Meteor.call 'checkRegistrationSecretURL', params.hash, (err, success) ->
+		# 		if success
+		# 			Session.set 'loginDefaultState', 'register'
+		# 			BlazeLayout.render 'main', {center: 'home'}
+		# 			KonchatNotification.getDesktopPermission()
+		# 		else
+		# 			BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
+		# else
+		# 	BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
diff --git a/...ketchat-ui-master/master/blankLayout.html → ...cketchat-ui-master/master/logoLayout.html b/...ketchat-ui-master/master/blankLayout.html → ...cketchat-ui-master/master/logoLayout.html
@@ -1,4 +1,4 @@
-<template name="blankLayout">
+<template name="logoLayout">
 	<section class="full-page">
 		<div class="wrapper">
 			<header>

diff --git a/packages/rocketchat-ui-master/package.js b/packages/rocketchat-ui-master/package.js
@@ -25,7 +25,7 @@ Package.onUse(function(api) {
 	api.addFiles('master/main.html', 'client');
 	api.addFiles('master/loading.html', 'client');
 	api.addFiles('master/error.html', 'client');
-	api.addFiles('master/blankLayout.html', 'client');
+	api.addFiles('master/logoLayout.html', 'client');
 
 	api.addFiles('master/main.coffee', 'client');
 });
diff --git a/packages/rocketchat-ui/package.js b/packages/rocketchat-ui/package.js
@@ -82,6 +82,7 @@ Package.onUse(function(api) {
 	api.addFiles('views/app/privateHistory.html', 'client');
 	api.addFiles('views/app/room.html', 'client');
 	api.addFiles('views/app/roomSearch.html', 'client');
+	api.addFiles('views/app/secretURL.html', 'client');
 	api.addFiles('views/app/userSearch.html', 'client');
 	api.addFiles('views/app/spotlight/mobileMessageMenu.html', 'client');
 	api.addFiles('views/app/spotlight/spotlight.html', 'client');
@@ -97,6 +98,7 @@ Package.onUse(function(api) {
 	api.addFiles('views/app/privateHistory.coffee', 'client');
 	api.addFiles('views/app/room.coffee', 'client');
 	api.addFiles('views/app/roomSearch.coffee', 'client');
+	api.addFiles('views/app/secretURL.coffee', 'client');
 	api.addFiles('views/app/spotlight/mobileMessageMenu.coffee', 'client');
 	api.addFiles('views/app/spotlight/spotlight.coffee', 'client');
 	api.addFiles('views/app/videoCall/videoButtons.coffee', 'client');

diff --git a/packages/rocketchat-ui/views/app/secretURL.coffee b/packages/rocketchat-ui/views/app/secretURL.coffee
@@ -0,0 +1,21 @@
+Template.secretURL.helpers
+	registrationAllowed: ->
+		return RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL' and Template.instance().hashIsValid?.get()
+
+	ready: ->
+		return Template.instance().subscriptionsReady?() and Template.instance().hashReady?.get()
+
+
+Template.secretURL.onCreated ->
+	@subscribe 'admin-settings'
+	@hashIsValid = new ReactiveVar false
+	@hashReady = new ReactiveVar false
+
+	Meteor.call 'checkRegistrationSecretURL', FlowRouter.getParam('hash'), (err, success) =>
+		@hashReady.set true
+		if success
+			Session.set 'loginDefaultState', 'register'
+			KonchatNotification.getDesktopPermission()
+			@hashIsValid.set true
+		else
+			@hashIsValid.set false
diff --git a/packages/rocketchat-ui/views/app/secretURL.html b/packages/rocketchat-ui/views/app/secretURL.html
@@ -0,0 +1,11 @@
+<template name="secretURL">
+	{{#if ready}}
+		{{#if registrationAllowed}}
+			{{> main center="home"}}
+		{{else}}
+			{{> logoLayout render="invalidSecretURL"}}
+		{{/if}}
+	{{else}}
+		{{> loading}}
+	{{/if}}
+</template>