Chore: Add typings for /v1/webdav.getMyAccounts (#25276)

Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
RocketChat · May 4, 2022 · 4a47110 · 4a47110
1 parent c53409f
commit 4a47110
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/apps/meteor/app/api/server/lib/webdav.ts b/apps/meteor/app/api/server/lib/webdav.ts
@@ -2,15 +2,13 @@ import type { IWebdavAccount } from '@rocket.chat/core-typings';
 
 import { WebdavAccounts } from '../../../models/server/raw';
 
-export async function findWebdavAccountsByUserId({ uid }: { uid: string }): Promise<{ accounts: IWebdavAccount[] }> {
-	return {
-		accounts: await WebdavAccounts.findWithUserId(uid, {
-			projection: {
-				_id: 1,
-				username: 1,
-				serverURL: 1,
-				name: 1,
-			},
-		}).toArray(),
-	};
+export async function findWebdavAccountsByUserId({ uid }: { uid: string }): Promise<IWebdavAccount[]> {
+	return WebdavAccounts.findWithUserId(uid, {
+		projection: {
+			_id: 1,
+			username: 1,
+			serverURL: 1,
+			name: 1,
+		},
+	}).toArray();
 }
diff --git a/apps/meteor/app/api/server/v1/webdav.js → apps/meteor/app/api/server/v1/webdav.ts b/apps/meteor/app/api/server/v1/webdav.js → apps/meteor/app/api/server/v1/webdav.ts
@@ -5,8 +5,10 @@ API.v1.addRoute(
 	'webdav.getMyAccounts',
 	{ authRequired: true },
 	{
-		get() {
-			return API.v1.success(Promise.await(findWebdavAccountsByUserId({ uid: this.userId })));
+		async get() {
+			return API.v1.success({
+				accounts: await findWebdavAccountsByUserId({ uid: this.userId }),
+			});
 		},
 	},
 );
diff --git a/packages/core-typings/src/IWebdavAccount.ts b/packages/core-typings/src/IWebdavAccount.ts
@@ -8,4 +8,4 @@ export interface IWebdavAccount extends IRocketChatRecord {
 	name: string;
 }
 
-export type IWebdavAccountPayload = Omit<IWebdavAccount, 'userId' | '_id' | '_updatedAt'>;
+export type IWebdavAccountPayload = Pick<IWebdavAccount, 'serverURL' | 'username' | 'password' | 'name'>;
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
@@ -30,7 +30,9 @@ import type { TeamsEndpoints } from './v1/teams';
 import type { UsersEndpoints } from './v1/users';
 import type { VideoConferenceEndpoints } from './v1/videoConference';
 import type { VoipEndpoints } from './v1/voip';
+import type { WebdavEndpoints } from './v1/webdav';
 import type { OAuthAppsEndpoint } from './v1/oauthapps';
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/interface-name-prefix
 export interface Endpoints
 	extends BannersEndpoints,
@@ -61,6 +63,7 @@ export interface Endpoints
 		InvitesEndpoints,
 		E2eEndpoints,
 		CustomSoundEndpoint,
+		WebdavEndpoints,
 		OAuthAppsEndpoint {}
 
 type OperationsByPathPattern<TPathPattern extends keyof Endpoints> = TPathPattern extends any

diff --git a/packages/rest-typings/src/v1/webdav.ts b/packages/rest-typings/src/v1/webdav.ts
@@ -0,0 +1,9 @@
+import type { IWebdavAccount } from '@rocket.chat/core-typings';
+
+export type WebdavEndpoints = {
+	'webdav.getMyAccounts': {
+		GET: () => {
+			accounts: Pick<IWebdavAccount, '_id' | 'username' | 'serverURL' | 'name'>[];
+		};
+	};
+};