Merge pull request #5986 from RocketChat/improvements/anonymous

Anonymous use

client/routes/router.js

@@ -27,7 +27,7 @@ FlowRouter.route('/', {
 		Tracker.autorun(function(c) {
 			if (FlowRouter.subsReady() === true) {
 				Meteor.defer(function() {
-					if (Meteor.user().defaultRoom) {
+					if (Meteor.user() && Meteor.user().defaultRoom) {
 						const room = Meteor.user().defaultRoom.split('/');
 						FlowRouter.go(room[0], { name: room[1] }, FlowRouter.current().queryParams);
 					} else {

package.json

@@ -56,7 +56,7 @@
 		"email": "support@rocket.chat"
 	},
 	"devDependencies": {
-		"chimp": "^0.47.2",
+		"chimp": "^0.48.0",
 		"eslint": "^3.19.0",
 		"stylelint": "^7.10.1",
 		"supertest": "^3.0.0",

packages/rocketchat-authorization/client/lib/ChatPermissions.js

@@ -1,6 +1,8 @@
 RocketChat.authz.cachedCollection = new RocketChat.CachedCollection({
 	name: 'permissions',
-	eventType: 'onLogged'
+	eventType: 'onLogged',
+	userRelated: false
 });
+RocketChat.authz.cachedCollection.init();
 
 this.ChatPermissions = RocketChat.authz.cachedCollection.collection;

packages/rocketchat-authorization/server/functions/canAccessRoom.js

@@ -1,15 +1,19 @@
 /* globals RocketChat */
 RocketChat.authz.roomAccessValidators = [
-	function(room, user) {
+	function(room, user = {}) {
+		if (room.t === 'c') {
+			if (!user._id && RocketChat.settings.get('Accounts_AllowAnonymousAccess') === true) {
+				return true;
+			}
+
+			return RocketChat.authz.hasPermission(user._id, 'view-c-room');
+		}
+	},
+	function(room, user = {}) {
 		const subscription = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(room._id, user._id);
 		if (subscription) {
 			return subscription._room;
 		}
-	},
-	function(room, user) {
-		if (room.t === 'c') {
-			return RocketChat.authz.hasPermission(user._id, 'view-c-room');
-		}
 	}
 ];
 

packages/rocketchat-channel-settings/client/startup/tabBar.js

@@ -2,6 +2,7 @@ Meteor.startup(() => {
 	RocketChat.TabBar.addButton({
 		groups: ['channel', 'group', 'direct'],
 		id: 'channel-settings',
+		anonymous: true,
 		i18nTitle: 'Room_Info',
 		icon: 'icon-info-circled',
 		template: 'channelSettings',

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -17,6 +17,7 @@
   "Accessing_permissions": "Accessing permissions",
   "Account_SID": "Account SID",
   "Accounts": "Accounts",
+  "Accounts_AllowAnonymousAccess": "Allow anonymous access",
   "Accounts_AllowDeleteOwnAccount": "Allow users to delete own account",
   "Accounts_AllowedDomainsList": "Allowed Domains List",
   "Accounts_AllowedDomainsList_Description": "Comma-separated list of allowed domains",
@@ -1227,6 +1228,7 @@
   "Register": "Register a new account",
   "Registration": "Registration",
   "Registration_Succeeded": "Registration Succeeded",
+  "Register_or_login_to_send_messages": "Register or login to send messages",
   "Registration_via_Admin": "Registration via Admin",
   "Regular_Expressions": "Regular Expressions",
   "Release": "Release",

packages/rocketchat-lib/client/lib/cachedCollection.js

@@ -165,7 +165,7 @@ class CachedCollection {
 		}
 
 		localforage.getItem(this.name, (error, data) => {
-			if (data && (data.version < this.version || data.token !== this.getToken())) {
+			if (data && (data.version < this.version || data.token !== this.getToken() || this.getToken() === undefined)) {
 				this.clearCache();
 				callback(false);
 				return;

packages/rocketchat-lib/client/lib/openRoom.coffee

@@ -5,12 +5,13 @@ currentTracker = undefined
 
 	Meteor.defer ->
 		currentTracker = Tracker.autorun (c) ->
-			if RoomManager.open(type + name).ready() isnt true
-				BlazeLayout.render 'main', { modal: RocketChat.Layout.isEmbedded(), center: 'loading' }
+			user = Meteor.user()
+			if (user? and not user.username?) or (not user? and RocketChat.settings.get('Accounts_AllowAnonymousAccess') is false)
+				BlazeLayout.render 'main'
 				return
 
-			user = Meteor.user()
-			unless user?.username
+			if RoomManager.open(type + name).ready() isnt true
+				BlazeLayout.render 'main', { modal: RocketChat.Layout.isEmbedded(), center: 'loading' }
 				return
 
 			currentTracker = undefined

packages/rocketchat-lib/server/methods/getRoomRoles.js

@@ -3,7 +3,7 @@ Meteor.methods({
 
 		check(rid, String);
 
-		if (!Meteor.userId()) {
+		if (!Meteor.userId() && RocketChat.settings.get('Accounts_AllowAnonymousAccess') === false) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getRoomRoles' });
 		}
 

packages/rocketchat-lib/server/models/Rooms.coffee

@@ -188,6 +188,22 @@ class ModelRooms extends RocketChat.models._Base
 
 		return @find query, options
 
+	findByNameAndType: (name, type, options) ->
+		query =
+			t: type
+			name: name
+
+		return @find query, options
+
+	findByNameAndTypeNotDefault: (name, type, options) ->
+		query =
+			t: type
+			name: name
+			default:
+				$ne: true
+
+		return @find query, options
+
 	findByNameAndTypeNotContainingUsername: (name, type, username, options) ->
 		query =
 			t: type

packages/rocketchat-lib/server/startup/settings.js

@@ -8,6 +8,10 @@ RocketChat.settings.add('uniqueID', process.env.DEPLOYMENT_ID || Random.id(), {
 // if you add a node to the i18n.json with the same setting name but with `_Description` it will automatically work.
 
 RocketChat.settings.addGroup('Accounts', function() {
+	this.add('Accounts_AllowAnonymousAccess', false, {
+		type: 'boolean',
+		public: true
+	});
 	this.add('Accounts_AllowDeleteOwnAccount', false, {
 		type: 'boolean',
 		'public': true,

packages/rocketchat-lib/startup/defaultRoomTypes.js

@@ -28,7 +28,7 @@ RocketChat.roomTypes.add('c', 10, {
 	},
 
 	condition() {
-		return RocketChat.authz.hasAtLeastOnePermission(['view-c-room', 'view-joined-room']);
+		return RocketChat.authz.hasAtLeastOnePermission(['view-c-room', 'view-joined-room']) || RocketChat.settings.get('Accounts_AllowAnonymousAccess') === true;
 	},
 
 	showJoinLink(roomId) {

packages/rocketchat-theme/client/imports/base.less

@@ -2685,7 +2685,7 @@ label.required::after {
 	margin: 60px 20px 0 0;
 	overflow: hidden;
 	width: 100%;
-	height: calc(~'100% - 120px');
+	height: calc(~'100% - 130px');
 
 	.message-cog-container {
 		.message-action {

packages/rocketchat-ui-flextab/client/flexTabBar.js

@@ -14,6 +14,10 @@ Template.flexTabBar.helpers({
 	},
 
 	visible() {
+		if (!Meteor.userId() && !this.anonymous) {
+			return 'hidden';
+		}
+
 		if (this.groups.indexOf(Template.instance().tabBar.currentGroup()) === -1) {
 			return 'hidden';
 		}

packages/rocketchat-ui-login/client/login/form.html

@@ -7,7 +7,7 @@
 		<form id="login-card" class="content-background-color color-primary-font-color" method='/' novalidate>
 			{{#if state 'wait-activation'}}
 				<header>
-					<h2>{{{_ "Registration_Succeeded"}}}</h2>
+					<h2 data-i18n="Registration_Succeeded">{{{_ "Registration_Succeeded"}}}</h2>
 					<p>{{{_ "Wait_activation_warning"}}}</p>
 					<p>{{{_ "Please_wait_activation"}}}</p>
 				</header>

packages/rocketchat-ui-login/client/login/form.js

@@ -108,6 +108,8 @@ Template.loginForm.events({
 							return instance.state.set('login');
 						} else if (error && error.error === 'error-user-is-not-activated') {
 							return instance.state.set('wait-activation');
+						} else {
+							Session.set('forceLogin', false);
 						}
 					});
 				});
@@ -130,6 +132,7 @@ Template.loginForm.events({
 						}
 						return;
 					}
+					Session.set('forceLogin', false);
 					if (user && user.language) {
 						localStorage.setItem('userLanguage', user.language);
 						return setLanguage(Meteor.user().language);

packages/rocketchat-ui-master/client/main.js

@@ -110,7 +110,7 @@ Template.main.helpers({
 		return RocketChat.settings.get('Site_Name');
 	},
 	logged() {
-		if (Meteor.userId() != null) {
+		if (Meteor.userId() != null || (RocketChat.settings.get('Accounts_AllowAnonymousAccess') === true && Session.get('forceLogin') !== true)) {
 			$('html').addClass('noscroll').removeClass('scroll');
 			return true;
 		} else {
@@ -134,7 +134,7 @@ Template.main.helpers({
 		return ready;
 	},
 	hasUsername() {
-		return (Meteor.userId() != null) && (Meteor.user().username != null);
+		return (Meteor.userId() != null && Meteor.user().username != null) || (Meteor.userId() == null && RocketChat.settings.get('Accounts_AllowAnonymousAccess') === true);
 	},
 	requirePasswordChange() {
 		const user = Meteor.user();

packages/rocketchat-ui-message/client/message.coffee

@@ -114,7 +114,7 @@ Template.message.helpers
 
 	reactions: ->
 		msgReactions = []
-		userUsername = Meteor.user().username
+		userUsername = Meteor.user()?.username
 
 		for emoji, reaction of @reactions
 			total = reaction.usernames.length

packages/rocketchat-ui-message/client/messageBox.coffee

@@ -30,7 +30,7 @@ Template.messageBox.helpers
 	showFormattingTips: ->
 		return RocketChat.settings.get('Message_ShowFormattingTips') and (RocketChat.Markdown or RocketChat.MarkdownCode or katexSyntax())
 	canJoin: ->
-		return RocketChat.roomTypes.verifyShowJoinLink @_id
+		return Meteor.userId()? and RocketChat.roomTypes.verifyShowJoinLink @_id
 	joinCodeRequired: ->
 		return Session.get('roomData' + this._id)?.joinCodeRequired
 	subscribed: ->
@@ -124,6 +124,9 @@ Template.messageBox.helpers
 	showSandstorm: ->
 		return Meteor.settings.public.sandstorm && !Meteor.isCordova
 
+	isAnonymous: ->
+		return not Meteor.userId()? and RocketChat.settings.get('Accounts_AllowAnonymousAccess') is true
+
 firefoxPasteUpload = (fn) ->
 	user = navigator.userAgent.match(/Firefox\/(\d+)\.\d/)
 	if !user or user[1] > 49
@@ -178,6 +181,11 @@ Template.messageBox.events
 				RoomHistoryManager.getRoom(@_id).loaded = undefined
 				RoomManager.computation.invalidate()
 
+	'click .register': (event) ->
+		event.stopPropagation()
+		event.preventDefault()
+		Session.set('forceLogin', true)
+
 	'focus .input-message': (event, instance) ->
 		KonchatNotification.removeRoomNotification @_id
 		chatMessages[@_id].input = instance.find('.input-message')

packages/rocketchat-ui-message/client/messageBox.html

@@ -143,6 +143,11 @@
 				<button class="button join"><span><i class="icon-login"></i> {{_ "join"}}</span></button>
 			</div>
 			{{/if}}
+			{{#if isAnonymous}}
+				<div>
+					<button class="button register"><span><i class="icon-login"></i> {{_ "Register_or_login_to_send_messages"}}</span></button>
+				</div>
+			{{/if}}
 		{{/with}}
 	{{/if}}
 </template>

packages/rocketchat-ui-sidenav/client/accountBox.js

@@ -1,5 +1,14 @@
 Template.accountBox.helpers({
 	myUserInfo() {
+		if (Meteor.user() == null && RocketChat.settings.get('Accounts_AllowAnonymousAccess')) {
+			return {
+				name: t('Anonymous'),
+				status: 'online',
+				visualStatus: t('online'),
+				username: 'anonymous'
+			};
+		}
+
 		let visualStatus = 'online';
 		const user = Meteor.user() || {};
 		const { name, username } = user;
@@ -41,6 +50,10 @@ Template.accountBox.events({
 	},
 
 	'click .account-box'() {
+		if (Meteor.userId() == null && RocketChat.settings.get('Accounts_AllowAnonymousAccess')) {
+			return;
+		}
+
 		return AccountBox.toggle();
 	},
 

packages/rocketchat-ui-sidenav/client/channelsAnonymous.html

@@ -0,0 +1,13 @@
+<template name="channelsAnonymous">
+	<h3 class="add-room background-transparent-darker-hover {{isActive}}">
+		{{_ "Channels"}} <span class="room-count-small">({{rooms.count}})</span>
+	</h3>
+	<ul>
+		{{#each rooms}}
+			{{> chatRoomItem }}
+		{{else}}
+			<p class="empty">{{_ "No_channels_yet" }}</p>
+		{{/each}}
+	</ul>
+	<button class="more more-channels background-transparent-darker-hover">{{_ "More_channels"}}...</button>
+</template>

packages/rocketchat-ui-sidenav/client/channelsAnonymous.js

@@ -0,0 +1,23 @@
+Template.channelsAnonymous.helpers({
+	isActive() {
+		const currentRoom = RocketChat.models.Rooms.findOne({ _id: Session.get('openedRoom') });
+		if (currentRoom) {
+			return 'active';
+		}
+	},
+
+	rooms() {
+		const query = {
+			t: 'c'
+		};
+
+		return RocketChat.models.Rooms.find(query, { sort: { name: 1 } });
+	}
+});
+
+Template.channelsAnonymous.events({
+	'click .more-channels'() {
+		SideNav.setFlex('listChannelsFlex');
+		SideNav.openFlex();
+	}
+});

packages/rocketchat-ui-sidenav/client/chatRoomItem.js

@@ -32,7 +32,7 @@ Template.chatRoomItem.helpers({
 	},
 
 	active() {
-		if (Session.get('openedRoom') === this.rid) {
+		if (Session.get('openedRoom') && Session.get('openedRoom') === this.rid || Session.get('openedRoom') === this._id) {
 			return 'active';
 		}
 	},

packages/rocketchat-ui-sidenav/client/sideNav.html

@@ -3,8 +3,8 @@
 		<header class="header">
 			{{> accountBox }}
 		</header>
+		{{> toolbar}}
 		{{#if currentUser}}
-			{{> toolbar}}
 			<div class="unread-rooms background-primary-action-color color-primary-action-contrast top-unread-rooms hidden">
 				{{_ "More_unreads"}} <i class="icon-up-big"></i>
 			</div>
@@ -34,6 +34,12 @@ <h3 class="history-div">
 				</section>
 			</div>
 			<span class="arrow bottom"></span>
+		{{else}}
+			<div class="rooms-list" aria-label="{{_ "Channels"}}" role="region">
+				<div class="wrapper">
+					{{> channelsAnonymous}}
+				</div>
+			</div>
 		{{/if}}
 		<footer class="footer">
 			{{{footer}}}