Adjust some types

RocketChat · Jan 11, 2024 · 344161c · 344161c
1 parent 6416ffb
commit 344161c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 16 deletions.
diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
@@ -100,8 +100,7 @@ export const useInstallApp = (file: File, url: string): { install: () => void; i
 	/** @deprecated	*/
 	const getAppFile = async (): Promise<File | undefined> => {
 		try {
-			// @ts-ignore-next-line
-			const { buff } = await downloadPrivateAppFromUrl({ url, downloadOnly: true });
+			const { buff } = (await downloadPrivateAppFromUrl({ url, downloadOnly: true })) as { buff: { data: ArrayLike<number> } };
 
 			return new File([Uint8Array.from(buff.data)], 'app.zip', { type: 'application/zip' });
 		} catch (error) {

diff --git a/apps/meteor/ee/client/apps/orchestrator.ts b/apps/meteor/ee/client/apps/orchestrator.ts
@@ -91,12 +91,12 @@ class AppClientOrchestrator {
 	}
 
 	public async installApp(appId: string, version: string, permissionsGranted?: IPermission[]): Promise<App> {
-		const { app } = await sdk.rest.post<'/apps'>('/apps', {
+		const { app } = (await sdk.rest.post<'/apps'>('/apps', {
 			appId,
 			marketplace: true,
 			version,
 			permissionsGranted,
-		});
+		})) as { app: App };
 		return app;
 	}
 

diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -217,7 +217,7 @@ export class AppsRestApi {
 
 		// WE NEED TO MOVE EACH ENDPOINT HANDLER TO IT'S OWN FILE
 		this.api.addRoute(
-			'' as '/apps', // this is the default route, but an empty path was confusing the type
+			'',
 			{ authRequired: true, permissionsRequired: ['manage-apps'] },
 			{
 				async get() {
@@ -332,7 +332,7 @@ export class AppsRestApi {
 
 							return API.v1.success({ buff });
 						}
-					} else if (this.bodyParams.appId && this.bodyParams.marketplace && this.bodyParams.version) {
+					} else if ('appId' in this.bodyParams && this.bodyParams.appId && this.bodyParams.marketplace && this.bodyParams.version) {
 						const baseUrl = orchestrator.getMarketplaceUrl();
 
 						const headers = getDefaultHeaders();

diff --git a/packages/rest-typings/src/apps/index.ts b/packages/rest-typings/src/apps/index.ts
@@ -239,15 +239,27 @@ export type AppsEndpoints = {
 			  }[])
 			| (() => { apps: App[] });
 
-		POST: (params: {
-			appId: string;
-			marketplace: boolean;
-			version: string;
-			permissionsGranted?: IPermission[];
-			url?: string;
-			downloadOnly?: boolean;
-		}) => {
-			app: App;
+		POST: {
+			(
+				params:
+					| {
+							appId: string;
+							marketplace: boolean;
+							version: string;
+							permissionsGranted?: IPermission[];
+							url?: string;
+							downloadOnly?: boolean;
+					  }
+					| { url: string; downloadOnly?: boolean },
+			):
+				| {
+						app: App;
+				  }
+				| {
+						buff: {
+							data: ArrayLike<number>;
+						};
+				  };
 		};
 	};
 

diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
@@ -186,7 +186,7 @@ export type MatchPathPattern<TPath extends Path> = TPath extends any ? Extract<O
 
 export type JoinPathPattern<TBasePath extends string, TSubPathPattern extends string> = Extract<
 	PathPattern,
-	`${TBasePath}/${TSubPathPattern}` | TSubPathPattern
+	`${TBasePath}${TSubPathPattern extends '' ? TSubPathPattern : `/${TSubPathPattern}`}` | TSubPathPattern
 >;
 
 type GetParams<TOperation> = TOperation extends (...args: any) => any ? Parameters<TOperation>[0] : never;