Merge pull request #6591 from RocketChat/hotfix/one-password-not-defined

Fix recently introduced bug: OnePassword not defined
RocketChat · Apr 4, 2017 · c732a80 · c732a80
2 parents 413ac7a + cb2e3d6
commit c732a80
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/rocketchat-ui-login/client/login/form.js b/packages/rocketchat-ui-login/client/login/form.js
@@ -54,7 +54,7 @@ Template.loginForm.helpers({
 		return RocketChat.settings.get('Accounts_PasswordPlaceholder') || t('Password');
 	},
 	hasOnePassword() {
-		return (OnePassword && OnePassword.findLoginForUrl) && (device && device.platform && device.platform.toLocaleLowerCase() === 'ios');
+		return typeof OnePassword !== 'undefined' && OnePassword.findLoginForUrl && typeof device !== 'undefined' && device.platform && device.platform.toLocaleLowerCase() === 'ios';
 	}
 });
 
@@ -151,7 +151,7 @@ Template.loginForm.events({
 		return RocketChat.callbacks.run('loginPageStateChange', Template.instance().state.get());
 	},
 	'click .one-passsword'() {
-		if (OnePassword && OnePassword.findLoginForUrl) {
+		if (typeof OnePassword === 'undefined' || OnePassword.findLoginForUrl == null) {
 			return;
 		}
 		const succesCallback = function(credentials) {