Merge branch 'develop' into fix/invalid-settings-remover

_templates/package/new/tsconfig.json.ejs.t

@@ -2,7 +2,7 @@
 to: packages/<%= name %>/tsconfig.json
 ---
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.base.client.json",
 	"compilerOptions": {
 		"rootDir": "./src",
 		"outDir": "./dist"

_templates/service/new/package.json.ejs.t

@@ -18,6 +18,7 @@ to: ee/apps/<%= name %>/package.json
 	],
 	"author": "Rocket.Chat",
 	"dependencies": {
+		"@rocket.chat/core-services": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/emitter": "0.31.22",
 		"@rocket.chat/model-typings": "workspace:^",

_templates/service/new/service.ejs.t

@@ -3,8 +3,8 @@ to: ee/apps/<%= name %>/src/service.ts
 ---
 import type { Document } from 'mongodb';
 import polka from 'polka';
+import { api } from '@rocket.chat/core-services';
 
-import { api } from '../../../../apps/meteor/server/sdk/api';
 import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
 import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';

_templates/service/new/servicesClass.ejs.t

@@ -1,7 +1,7 @@
 ---
 to: ee/apps/<%= name %>/src/<%= h.changeCase.pascalCase(name) %>.ts
 ---
-import { ServiceClass } from '../../../../apps/meteor/server/sdk/types/ServiceClass';
+import { ServiceClass } from '@rocket.chat/core-services';
 
 export class <%= h.changeCase.pascalCase(name) %> extends ServiceClass {
 	protected name = '<%= name %>';

_templates/service/new/tsconfig.json.ejs.t

@@ -2,31 +2,9 @@
 to: ee/apps/<%= name %>/tsconfig.json
 ---
 {
-	"extends": "../../../tsconfig.base.json",
+	"extends": "../../../tsconfig.base.server.json",
 	"compilerOptions": {
-		"target": "es2018",
-		"lib": ["esnext", "dom"],
-		"allowJs": true,
-		"checkJs": false,
-		"incremental": true,
-
-		/* Strict Type-Checking Options */
-		"noImplicitAny": true,
-		"strictNullChecks": true,
-		"strictPropertyInitialization": false,
-		"strictFunctionTypes": false,
-
-		/* Additional Checks */
-		"noUnusedLocals": true,
-		"noUnusedParameters": true,
-		"noImplicitReturns": false,
-		"noFallthroughCasesInSwitch": false,
-
-		/* Module Resolution Options */
-		"outDir": "./dist",
-		"importsNotUsedAsValues": "preserve",
-		"declaration": false,
-		"declarationMap": false
+		"outDir": "./dist"
 	},
 	"files": ["./src/service.ts"],
 	"include": ["../../../apps/meteor/definition/externals/meteor"],

apps/meteor/app/api/server/lib/getUploadFormData.ts

@@ -3,8 +3,7 @@ import type { Readable } from 'stream';
 import type { Request } from 'express';
 import busboy from 'busboy';
 import type { ValidateFunction } from 'ajv';
-
-import { MeteorError } from '../../../../server/sdk/errors';
+import { MeteorError } from '@rocket.chat/core-services';
 
 type UploadResult<K> = {
 	file: Readable & { truncated: boolean };

apps/meteor/app/api/server/v1/banners.ts

@@ -1,8 +1,8 @@
 import { Match, check } from 'meteor/check';
 import { BannerPlatform } from '@rocket.chat/core-typings';
+import { Banner } from '@rocket.chat/core-services';
 
 import { API } from '../api';
-import { Banner } from '../../../../server/sdk';
 
 /**
  * @deprecated

apps/meteor/app/api/server/v1/channels.js

@@ -2,14 +2,14 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 import { Integrations, Uploads, Messages as MessagesRaw, Rooms as RoomsRaw, Subscriptions as SubscriptionsRaw } from '@rocket.chat/models';
+import { Team } from '@rocket.chat/core-services';
 
 import { Rooms, Subscriptions, Messages, Users } from '../../../models/server';
 import { canAccessRoom, hasPermission, hasAtLeastOnePermission } from '../../../authorization/server';
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
 import { settings } from '../../../settings/server';
-import { Team } from '../../../../server/sdk';
 import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { addUserToFileObj } from '../helpers/addUserToFileObj';
 

apps/meteor/app/api/server/v1/channels.ts

@@ -19,12 +19,12 @@ import {
 	isChannelsDeleteProps,
 } from '@rocket.chat/rest-typings';
 import { Messages } from '@rocket.chat/models';
+import { Team } from '@rocket.chat/core-services';
 
 import { Rooms, Subscriptions } from '../../../models/server';
 import { hasPermission } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
-import { Team } from '../../../../server/sdk';
 
 // Returns the channel IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
 function findChannelByIdOrName({

apps/meteor/app/api/server/v1/emoji-custom.ts

@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 import { EmojiCustom } from '@rocket.chat/models';
+import { Media } from '@rocket.chat/core-services';
 
 import { API } from '../api';
 import { getUploadFormData } from '../lib/getUploadFormData';
 import { findEmojisCustom } from '../lib/emoji-custom';
-import { Media } from '../../../../server/sdk';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
 

apps/meteor/app/api/server/v1/groups.js

@@ -2,6 +2,7 @@ import _ from 'underscore';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import { Integrations, Messages as MessagesRaw, Uploads, Rooms as RoomsRaw, Subscriptions as SubscriptionsRaw } from '@rocket.chat/models';
+import { Team } from '@rocket.chat/core-services';
 
 import { mountIntegrationQueryBasedOnPermissions } from '../../../integrations/server/lib/mountQueriesBasedOnPermission';
 import { Subscriptions, Rooms, Messages, Users } from '../../../models/server';
@@ -14,7 +15,6 @@ import {
 } from '../../../authorization/server';
 import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMessagesForUser';
 import { API } from '../api';
-import { Team } from '../../../../server/sdk';
 import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { addUserToFileObj } from '../helpers/addUserToFileObj';
 

apps/meteor/app/api/server/v1/ldap.ts

@@ -1,10 +1,10 @@
 import { Match, check } from 'meteor/check';
+import { LDAP } from '@rocket.chat/core-services';
 
 import { hasPermission } from '../../../authorization/server';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
 import { SystemLogger } from '../../../../server/lib/logger/system';
-import { LDAP } from '../../../../server/sdk';
 
 API.v1.addRoute(
 	'ldap.testConnection',

apps/meteor/app/api/server/v1/roles.ts

@@ -9,13 +9,13 @@ import {
 } from '@rocket.chat/rest-typings';
 import type { IRole } from '@rocket.chat/core-typings';
 import { Roles } from '@rocket.chat/models';
+import { api } from '@rocket.chat/core-services';
 
 import { Users } from '../../../models/server';
 import { API } from '../api';
 import { hasRole } from '../../../authorization/server';
 import { getUsersInRolePaginated } from '../../../authorization/server/functions/getUsersInRole';
 import { settings } from '../../../settings/server/index';
-import { api } from '../../../../server/sdk/api';
 import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { hasAnyRoleAsync } from '../../../authorization/server/functions/hasRole';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';

apps/meteor/app/api/server/v1/rooms.js

@@ -1,5 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 import { Rooms as RoomsRaw } from '@rocket.chat/models';
+import { Media } from '@rocket.chat/core-services';
 
 import { FileUpload } from '../../../file-upload';
 import { Rooms, Messages } from '../../../models/server';
@@ -14,7 +15,6 @@ import {
 } from '../lib/rooms';
 import * as dataExport from '../../../../server/lib/dataExport';
 import { canAccessRoom, canAccessRoomId, hasPermission } from '../../../authorization/server';
-import { Media } from '../../../../server/sdk';
 import { settings } from '../../../settings/server/index';
 import { getUploadFormData } from '../lib/getUploadFormData';
 

apps/meteor/app/api/server/v1/teams.ts

@@ -13,11 +13,11 @@ import {
 } from '@rocket.chat/rest-typings';
 import type { ITeam } from '@rocket.chat/core-typings';
 import { TEAM_TYPE } from '@rocket.chat/core-typings';
+import { Team } from '@rocket.chat/core-services';
 
 import { removeUserFromRoom } from '../../../lib/server/functions/removeUserFromRoom';
 import { Rooms, Users } from '../../../models/server';
 import { canAccessRoom, hasAtLeastOnePermission, hasPermission } from '../../../authorization/server';
-import { Team } from '../../../../server/sdk';
 import { API } from '../api';
 
 API.v1.addRoute(

apps/meteor/app/api/server/v1/users.ts

@@ -21,6 +21,7 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import type { IExportOperation, IPersonalAccessToken, IUser } from '@rocket.chat/core-typings';
 import { Users as UsersRaw } from '@rocket.chat/models';
 import type { Filter } from 'mongodb';
+import { Team, api } from '@rocket.chat/core-services';
 
 import { Users, Subscriptions } from '../../../models/server';
 import { hasPermission } from '../../../authorization/server';
@@ -40,11 +41,9 @@ import { findUsersToAutocomplete, getInclusiveFields, getNonEmptyFields, getNonE
 import { getUserForCheck, emailCheck } from '../../../2fa/server/code';
 import { resetUserE2EEncriptionKey } from '../../../../server/lib/resetUserE2EKey';
 import { resetTOTP } from '../../../2fa/server/functions/resetTOTP';
-import { Team } from '../../../../server/sdk';
 import { isValidQuery } from '../lib/isValidQuery';
 import { getURL } from '../../../utils/server';
 import { getUploadFormData } from '../lib/getUploadFormData';
-import { api } from '../../../../server/sdk/api';
 
 API.v1.addRoute(
 	'users.getAvatar',

apps/meteor/app/api/server/v1/videoConference.ts

@@ -6,11 +6,11 @@ import {
 	isVideoConfInfoProps,
 	isVideoConfListProps,
 } from '@rocket.chat/rest-typings';
+import { VideoConf } from '@rocket.chat/core-services';
 
 import { API } from '../api';
 import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { VideoConf } from '../../../../server/sdk';
 import { videoConfProviders } from '../../../../server/lib/videoConfProviders';
 import { availabilityErrors } from '../../../../lib/videoConference/constants';
 

apps/meteor/app/api/server/v1/voip/events.ts

@@ -1,9 +1,9 @@
 import { Match, check } from 'meteor/check';
 import { VoipClientEvents } from '@rocket.chat/core-typings';
 import { VoipRoom } from '@rocket.chat/models';
+import { LivechatVoip } from '@rocket.chat/core-services';
 
 import { API } from '../../api';
-import { LivechatVoip } from '../../../../../server/sdk';
 import { canAccessRoom } from '../../../../authorization/server';
 
 API.v1.addRoute(

apps/meteor/app/api/server/v1/voip/extensions.ts

@@ -1,9 +1,9 @@
 import { Match, check } from 'meteor/check';
 import type { IVoipExtensionBase } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
+import { Voip } from '@rocket.chat/core-services';
 
 import { API } from '../../api';
-import { Voip } from '../../../../../server/sdk';
 import { generateJWT } from '../../../../utils/server/lib/JWTHelper';
 import { settings } from '../../../../settings/server';
 import { logger } from './logger';

apps/meteor/app/api/server/v1/voip/omnichannel.ts

@@ -1,9 +1,9 @@
 import { Match, check } from 'meteor/check';
 import type { IUser, IVoipExtensionWithAgentInfo } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
+import { LivechatVoip } from '@rocket.chat/core-services';
 
 import { API } from '../../api';
-import { LivechatVoip } from '../../../../../server/sdk';
 import { logger } from './logger';
 
 function filter(

apps/meteor/app/api/server/v1/voip/queues.ts

@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
 import type { IVoipConnectorResult, IQueueSummary, IQueueMembershipDetails, IQueueMembershipSubscription } from '@rocket.chat/core-typings';
+import { Voip } from '@rocket.chat/core-services';
 
-import { Voip } from '../../../../../server/sdk';
 import { API } from '../../api';
 
 API.v1.addRoute(

apps/meteor/app/api/server/v1/voip/rooms.ts

@@ -2,9 +2,9 @@ import { Random } from 'meteor/random';
 import type { ILivechatAgent, IVoipRoom } from '@rocket.chat/core-typings';
 import { isVoipRoomProps, isVoipRoomsProps, isVoipRoomCloseProps } from '@rocket.chat/rest-typings';
 import { VoipRoom, LivechatVisitors, Users } from '@rocket.chat/models';
+import { LivechatVoip } from '@rocket.chat/core-services';
 
 import { API } from '../../api';
-import { LivechatVoip } from '../../../../../server/sdk';
 import { hasPermission } from '../../../../authorization/server';
 import { typedJsonParse } from '../../../../../lib/typedJSONParse';
 

apps/meteor/app/api/server/v1/voip/server-connection.ts

@@ -1,7 +1,7 @@
 import { Match, check } from 'meteor/check';
+import { Voip } from '@rocket.chat/core-services';
 
 import { API } from '../../api';
-import { Voip } from '../../../../../server/sdk';
 
 API.v1.addRoute(
 	'voip/managementServer/checkConnection',

apps/meteor/app/apple/server/AppleCustomOAuth.ts

@@ -1,7 +1,7 @@
 import { Accounts } from 'meteor/accounts-base';
+import { MeteorError } from '@rocket.chat/core-services';
 
 import { CustomOAuth } from '../../custom-oauth/server/custom_oauth_server';
-import { MeteorError } from '../../../server/sdk/errors';
 import { handleIdentityToken } from '../lib/handleIdentityToken';
 
 export class AppleCustomOAuth extends CustomOAuth {

apps/meteor/app/apps/server/bridges/messages.ts

@@ -4,11 +4,11 @@ import type { IMessage } from '@rocket.chat/apps-engine/definition/messages';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
 import type { ISubscription } from '@rocket.chat/core-typings';
+import { api } from '@rocket.chat/core-services';
 
 import { Messages, Users, Subscriptions } from '../../../models/server';
 import { updateMessage } from '../../../lib/server/functions/updateMessage';
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
-import { api } from '../../../../server/sdk/api';
 import notifications from '../../../notifications/server/lib/Notifications';
 import type { AppServerOrchestrator } from '../orchestrator';
 

apps/meteor/app/apps/server/bridges/uiInteraction.ts

@@ -1,8 +1,8 @@
 import { UiInteractionBridge as UiIntBridge } from '@rocket.chat/apps-engine/server/bridges/UiInteractionBridge';
 import type { IUIKitInteraction } from '@rocket.chat/apps-engine/definition/uikit';
 import type { IUser } from '@rocket.chat/apps-engine/definition/users';
+import { api } from '@rocket.chat/core-services';
 
-import { api } from '../../../../server/sdk/api';
 import type { AppServerOrchestrator } from '../orchestrator';
 
 export class UiInteractionBridge extends UiIntBridge {

apps/meteor/app/apps/server/bridges/videoConferences.ts

@@ -1,8 +1,8 @@
 import { VideoConferenceBridge } from '@rocket.chat/apps-engine/server/bridges/VideoConferenceBridge';
 import type { AppVideoConference, VideoConference } from '@rocket.chat/apps-engine/definition/videoConferences';
 import type { IVideoConfProvider } from '@rocket.chat/apps-engine/definition/videoConfProviders';
+import { VideoConf } from '@rocket.chat/core-services';
 
-import { VideoConf } from '../../../../server/sdk';
 import type { AppServerOrchestrator } from '../orchestrator';
 import { videoConfProviders } from '../../../../server/lib/videoConfProviders';
 import type { AppVideoConferencesConverter } from '../converters/videoConferences';

apps/meteor/app/apps/server/communication/uikit.ts

@@ -6,11 +6,11 @@ import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import { UIKitIncomingInteractionType } from '@rocket.chat/apps-engine/definition/uikit';
 import { AppInterface } from '@rocket.chat/apps-engine/definition/metadata';
+import { UiKitCoreApp } from '@rocket.chat/core-services';
 
 import { settings } from '../../../settings/server';
 import type { AppServerOrchestrator } from '../orchestrator';
 import { Apps } from '../orchestrator';
-import { UiKitCoreApp } from '../../../../server/sdk';
 import { authenticationMiddleware } from '../../../api/server/middlewares/authentication';
 
 const apiServer = express();

apps/meteor/app/apps/server/converters/videoConferences.ts

@@ -1,7 +1,6 @@
 import type { VideoConference } from '@rocket.chat/apps-engine/definition/videoConferences';
 import type { IVideoConference } from '@rocket.chat/core-typings';
-
-import { VideoConf } from '../../../../server/sdk';
+import { VideoConf } from '@rocket.chat/core-services';
 
 export class AppVideoConferencesConverter {
 	async convertById(callId: string): Promise<VideoConference | undefined> {

apps/meteor/app/authorization/server/functions/canAccessRoom.ts

@@ -1,5 +1,5 @@
-import { Authorization } from '../../../../server/sdk';
-import type { IAuthorization } from '../../../../server/sdk/types/IAuthorization';
+import { Authorization } from '@rocket.chat/core-services';
+import type { IAuthorization } from '@rocket.chat/core-services';
 
 export const canAccessRoomAsync = Authorization.canAccessRoom;
 export const canAccessRoomIdAsync = Authorization.canAccessRoomId;

apps/meteor/app/authorization/server/functions/hasPermission.ts

@@ -1,6 +1,5 @@
 import type { IUser, IPermission, IRoom } from '@rocket.chat/core-typings';
-
-import { Authorization } from '../../../../server/sdk';
+import { Authorization } from '@rocket.chat/core-services';
 
 export const hasAllPermissionAsync = async (
 	userId: IUser['_id'],

apps/meteor/app/authorization/server/methods/addUserToRole.ts

@@ -2,11 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 import type { IRole, IUser, IRoom } from '@rocket.chat/core-typings';
 import { Roles } from '@rocket.chat/models';
+import { api } from '@rocket.chat/core-services';
 
 import { Users } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { hasPermission } from '../functions/hasPermission';
-import { api } from '../../../../server/sdk/api';
 import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 
 Meteor.methods({