chore: using object as parameter

RocketChat · Oct 22, 2024 · 5263a7d · 5263a7d
1 parent 203fa1d
commit 5263a7d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/apps/meteor/app/apps/server/bridges/cloud.ts b/apps/meteor/app/apps/server/bridges/cloud.ts
@@ -12,7 +12,7 @@ export class AppCloudBridge extends CloudWorkspaceBridge {
 	public async getWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
 		this.orch.debugLog(`App ${appId} is getting the workspace's token`);
 
-		const token = await getWorkspaceAccessTokenWithScope(scope);
+		const token = await getWorkspaceAccessTokenWithScope({ scope });
 
 		return token;
 	}

diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessToken.ts
@@ -42,7 +42,7 @@ export async function getWorkspaceAccessToken(forceNew = false, scope = '', save
 
 	SystemLogger.debug(`Workspace credentials cache miss using scope: ${scope}, fetching new access token from cloud services.`);
 
-	const accessToken = await getWorkspaceAccessTokenWithScope(scope, throwOnError);
+	const accessToken = await getWorkspaceAccessTokenWithScope({ scope, throwOnError });
 
 	if (save) {
 		await WorkspaceCredentials.updateCredentialByScope({

diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceAccessTokenWithScope.ts
@@ -14,7 +14,15 @@ type WorkspaceAccessTokenWithScope = {
 	scope: string;
 };
 
-export async function getWorkspaceAccessTokenWithScope(scope = '', throwOnError = false): Promise<WorkspaceAccessTokenWithScope> {
+type GetWorkspaceAccessTokenWithScopeParams = {
+	scope?: string;
+	throwOnError?: boolean;
+};
+
+export async function getWorkspaceAccessTokenWithScope({
+	scope = '',
+	throwOnError = false,
+}: GetWorkspaceAccessTokenWithScopeParams): Promise<WorkspaceAccessTokenWithScope> {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
 
 	const tokenResponse = { token: '', expiresAt: new Date(), scope: '' };

diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -189,7 +189,7 @@ export class AppsRestApi {
 						return API.v1.failure({ error: 'Invalid purchase type' });
 					}
 
-					const response = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+					const response = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
 					if (!response.token) {
 						return API.v1.failure({ error: 'Unauthorized' });
 					}
@@ -289,7 +289,7 @@ export class AppsRestApi {
 							return API.v1.failure({ error: 'Invalid purchase type' });
 						}
 
-						const token = await getWorkspaceAccessTokenWithScope('marketplace:purchase');
+						const token = await getWorkspaceAccessTokenWithScope({ scope: 'marketplace:purchase' });
 						if (!token) {
 							return API.v1.failure({ error: 'Unauthorized' });
 						}