[FIX] Service Accounts bugs fixed

.meteor/versions

@@ -129,7 +129,7 @@ rocketchat:i18n@0.0.1
 rocketchat:livechat@0.0.1
 rocketchat:mongo-config@0.0.1
 rocketchat:monitoring@2.30.2_3
-rocketchat:oauth2-server@2.0.0
+rocketchat:oauth2-server@2.1.0
 rocketchat:push@3.3.1
 rocketchat:streamer@1.0.2
 rocketchat:version@1.0.0

app/api/server/v1/roles.js

@@ -3,6 +3,7 @@ import { Match, check } from 'meteor/check';
 
 import { Roles } from '../../../models';
 import { API } from '../api';
+import { getUsersInRole, hasPermission } from '../../../authorization/server';
 
 API.v1.addRoute('roles.list', { authRequired: true }, {
 	get() {
@@ -55,3 +56,33 @@ API.v1.addRoute('roles.addUserToRole', { authRequired: true }, {
 		});
 	},
 });
+
+API.v1.addRoute('roles.getUsersInRole', { authRequired: true }, {
+	get() {
+		const { roomId, role } = this.queryParams;
+		const { offset, count = 50 } = this.getPaginationItems();
+
+		const fields = {
+			name: 1,
+			username: 1,
+			emails: 1,
+		};
+
+		if (!role) {
+			throw new Meteor.Error('error-param-not-provided', 'Query param "role" is required');
+		}
+		if (!hasPermission(this.userId, 'access-permissions')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed');
+		}
+		if (roomId && !hasPermission(this.userId, 'view-other-user-channels')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed');
+		}
+		const users = getUsersInRole(role, roomId, {
+			limit: count,
+			sort: { username: 1 },
+			skip: offset,
+			fields,
+		}).fetch();
+		return API.v1.success({ users });
+	},
+});

app/api/server/v1/users.js

@@ -369,7 +369,7 @@ API.v1.addRoute('users.setStatus', { authRequired: true }, {
 		}
 
 		Meteor.runAsUser(user._id, () => {
-			if (this.bodyParams.message) {
+			if (this.bodyParams.message || this.bodyParams.message.length === 0) {
 				setStatusText(user._id, this.bodyParams.message);
 			}
 			if (this.bodyParams.status) {

app/apps/assets/stylesheets/apps.css

@@ -1,3 +1,4 @@
+.rc-apps-section,
 .rc-apps-marketplace {
 	display: flex;
 
@@ -300,6 +301,12 @@
 
 		height: 100vh;
 
+		margin-top: 20px;
+
+		& .rc-form-filters {
+			margin: 8px 0;
+		}
+
 		& .js-sort {
 			cursor: pointer;
 
@@ -321,6 +328,50 @@
 				font-size: 1rem;
 			}
 		}
+
+		& tbody .rc-table-tr:not(.table-no-click):not(.table-no-pointer):hover {
+			background-color: #f7f8fa;
+		}
+
+		& .rc-table-info {
+			margin: 0;
+			justify-content: center;
+
+			& .rc-table-title,
+			& .rc-table-subtitle {
+				font-size: 0.875rem;
+				line-height: 1.25rem;
+			}
+
+			& .rc-apps-categories {
+				display: flex;
+
+				height: 1.25rem;
+				margin: 0 -0.25rem;
+				align-items: center;
+				flex-wrap: wrap;
+
+				& .rc-apps-category {
+					overflow: hidden;
+					flex: 0 0 auto;
+
+					box-sizing: border-box;
+					margin: 0.125rem 0.25rem;
+					padding: 0.0625rem 0.25rem;
+
+					text-transform: none;
+					text-overflow: ellipsis;
+
+					color: #9da1a8;
+					border-radius: 9999px;
+					background-color: #eef0f3;
+
+					font-size: 0.625rem;
+					font-weight: 500;
+					line-height: 0.875rem;
+				}
+			}
+		}
 	}
 
 	@media (width <= 700px) {

app/apps/client/admin/appManage.css

@@ -0,0 +1,147 @@
+#rocket-chat .content .rc-apps-details {
+	&__content {
+		justify-content: flex-start;
+	}
+
+	&__app-name {
+		flex: 0 0 1.75rem;
+
+		margin: 0;
+
+		letter-spacing: 0;
+		text-transform: none;
+
+		color: rgb(84, 88, 94);
+
+		font-family: inherit;
+		font-size: 1.375rem;
+		font-weight: normal;
+		line-height: 1.75rem;
+	}
+
+	&__app-info {
+		display: flex;
+		flex: 0 0 1.25rem;
+		flex-wrap: nowrap;
+
+		> span::after {
+			display: inline-block;
+
+			width: 1px;
+			height: 12px;
+			margin: 0 8px;
+
+			content: '';
+
+			background: rgb(203, 206, 209);
+		}
+
+		> span:last-child::after {
+			display: none;
+
+			content: none;
+		}
+	}
+
+	&__app-author {
+		letter-spacing: -0.2px;
+
+		color: rgb(158, 162, 168);
+
+		font-family: inherit;
+		font-size: 14px;
+		font-weight: 500;
+		line-height: 20px;
+	}
+
+	&__app-version {
+		letter-spacing: -0.2px;
+
+		color: rgb(158, 162, 168);
+
+		font-family: inherit;
+		font-size: 14px;
+		font-weight: normal;
+		line-height: 20px;
+	}
+
+	&__app-status {
+		display: flex;
+		flex: 1;
+
+		margin-top: 8px;
+		align-items: center;
+	}
+
+	&__app-install-status {
+		display: flex;
+
+		height: 40px;
+
+		letter-spacing: 0;
+
+		color: rgb(158, 162, 168);
+
+		font-family: inherit;
+		font-size: 14px;
+		font-weight: 500;
+		align-items: center;
+		flex-wrap: nowrap;
+
+		& > .rc-icon {
+			color: var(--rc-color-button-primary);
+		}
+	}
+
+	&__app-price {
+		letter-spacing: -0.2px;
+
+		color: rgb(157, 161, 168);
+
+		font-family: inherit;
+		font-size: 14px;
+		font-weight: normal;
+		line-height: 20px;
+
+		&::before {
+			display: inline-block;
+
+			width: 1px;
+			height: 12px;
+			margin: 0 16px;
+
+			content: '';
+
+			background: rgb(203, 206, 209);
+		}
+	}
+
+	&__app-button-wrapper {
+		flex: 1;
+	}
+
+	& .rc-button.loading {
+		padding: 0 1.5rem;
+
+		opacity: 0.6;
+
+		&::before {
+			display: none;
+		}
+
+		& > .rc-icon {
+			animation: spin 1s linear infinite;
+		}
+	}
+
+	&__app-menu-trigger {
+		padding: 0;
+
+		&::before {
+			display: inline-block;
+			flex: 1;
+
+			content: '';
+		}
+	}
+}