Skip to content

regression: desambiguate manually app routes #35145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 4 commits into from
Feb 7, 2025
Merged

regression: desambiguate manually app routes #35145

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe88d43
fix: desambiguate manually the routes
Gustrb Feb 6, 2025
851e03d
Merge branch 'develop' into fix/ambiguous-app-routes
Gustrb Feb 7, 2025
9e443ae
Merge branch 'develop' into fix/ambiguous-app-routes
Gustrb Feb 7, 2025
01728b3
Merge branch 'develop' into fix/ambiguous-app-routes
Gustrb Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
272 changes: 136 additions & 136 deletions apps/meteor/ee/server/apps/communication/rest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,142 @@ export class AppsRestApi {
},
);

this.api.addRoute(
'app-request',
{ authRequired: true },
{
async get() {
const baseUrl = orchestrator.getMarketplaceUrl();
const { appId, q = '', sort = '', limit = 25, offset = 0 } = this.queryParams;
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

try {
const request = await fetch(`${baseUrl}/v1/app-request?appId=${appId}&q=${q}&sort=${sort}&limit=${limit}&offset=${offset}`, {
headers,
});
const result = await request.json();

if (!request.ok) {
throw new Error(result.error);
}
return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error getting all non sent app requests from the Marketplace:', e.message);

return API.v1.failure(e.message);
}
},
},
);

this.api.addRoute(
'app-request/stats',
{ authRequired: true },
{
async get() {
const baseUrl = orchestrator.getMarketplaceUrl();
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

try {
const request = await fetch(`${baseUrl}/v1/app-request/stats`, { headers });
const result = await request.json();
if (!request.ok) {
throw new Error(result.error);
}
return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error getting the app requests stats from marketplace', e.message);

return API.v1.failure(e.message);
}
},
},
);

this.api.addRoute(
'app-request/markAsSeen',
{ authRequired: true },
{
async post() {
const baseUrl = orchestrator.getMarketplaceUrl();
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

const { unseenRequests } = this.bodyParams;

try {
const request = await fetch(`${baseUrl}/v1/app-request/markAsSeen`, {
method: 'POST',
headers,
body: { ids: unseenRequests },
});
const result = await request.json();

if (!request.ok) {
throw new Error(result.error);
}

return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error marking app requests as seen', e.message);

return API.v1.failure(e.message);
}
},
},
);

this.api.addRoute(
'notify-admins',
{ authRequired: true },
{
async post() {
const { appId, appName, appVersion, message } = this.bodyParams;
const workspaceUrl = settings.get<string>('Site_Url');

const regex = new RegExp('\\/$', 'gm');
const safeWorkspaceUrl = workspaceUrl.replace(regex, '');
const learnMore = `${safeWorkspaceUrl}/marketplace/explore/info/${appId}/${appVersion}/requests`;

try {
const msgs: (params: { adminUser: IUser }) => Promise<Partial<IMessage>> = async ({ adminUser }) => {
return {
msg: i18n.t('App_Request_Admin_Message', {
admin_name: adminUser.name || '',
app_name: appName || '',
user_name: `@${this.user.username}`,
message: message || '',
learn_more: learnMore,
interpolation: { escapeValue: false },
}),
};
};

await sendMessagesToAdmins({ msgs });

return API.v1.success();
} catch (e) {
orchestrator.getRocketChatLogger().error('Error when notifying admins that an user requested an app:', e);
return API.v1.failure();
}
},
},
);

this.api.addRoute(
':id',
{ authRequired: true, permissionsRequired: ['manage-apps'] },
Expand Down Expand Up @@ -882,43 +1018,6 @@ export class AppsRestApi {
},
);

this.api.addRoute(
'notify-admins',
{ authRequired: true },
{
async post() {
const { appId, appName, appVersion, message } = this.bodyParams;
const workspaceUrl = settings.get<string>('Site_Url');

const regex = new RegExp('\\/$', 'gm');
const safeWorkspaceUrl = workspaceUrl.replace(regex, '');
const learnMore = `${safeWorkspaceUrl}/marketplace/explore/info/${appId}/${appVersion}/requests`;

try {
const msgs: (params: { adminUser: IUser }) => Promise<Partial<IMessage>> = async ({ adminUser }) => {
return {
msg: i18n.t('App_Request_Admin_Message', {
admin_name: adminUser.name || '',
app_name: appName || '',
user_name: `@${this.user.username}`,
message: message || '',
learn_more: learnMore,
interpolation: { escapeValue: false },
}),
};
};

await sendMessagesToAdmins({ msgs });

return API.v1.success();
} catch (e) {
orchestrator.getRocketChatLogger().error('Error when notifying admins that an user requested an app:', e);
return API.v1.failure();
}
},
},
);

this.api.addRoute(
':id/sync',
{ authRequired: true, permissionsRequired: ['manage-apps'] },
Expand Down Expand Up @@ -1208,104 +1307,5 @@ export class AppsRestApi {
},
},
);

this.api.addRoute(
'app-request',
{ authRequired: true },
{
async get() {
const baseUrl = orchestrator.getMarketplaceUrl();
const { appId, q = '', sort = '', limit = 25, offset = 0 } = this.queryParams;
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

try {
const request = await fetch(`${baseUrl}/v1/app-request?appId=${appId}&q=${q}&sort=${sort}&limit=${limit}&offset=${offset}`, {
headers,
});
const result = await request.json();

if (!request.ok) {
throw new Error(result.error);
}
return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error getting all non sent app requests from the Marketplace:', e.message);

return API.v1.failure(e.message);
}
},
},
);

this.api.addRoute(
'app-request/stats',
{ authRequired: true },
{
async get() {
const baseUrl = orchestrator.getMarketplaceUrl();
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

try {
const request = await fetch(`${baseUrl}/v1/app-request/stats`, { headers });
const result = await request.json();
if (!request.ok) {
throw new Error(result.error);
}
return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error getting the app requests stats from marketplace', e.message);

return API.v1.failure(e.message);
}
},
},
);

this.api.addRoute(
'app-request/markAsSeen',
{ authRequired: true },
{
async post() {
const baseUrl = orchestrator.getMarketplaceUrl();
const headers = getDefaultHeaders();

const token = await getWorkspaceAccessToken();
if (token) {
headers.Authorization = `Bearer ${token}`;
}

const { unseenRequests } = this.bodyParams;

try {
const request = await fetch(`${baseUrl}/v1/app-request/markAsSeen`, {
method: 'POST',
headers,
body: { ids: unseenRequests },
});
const result = await request.json();

if (!request.ok) {
throw new Error(result.error);
}

return API.v1.success(result);
} catch (e: any) {
orchestrator.getRocketChatLogger().error('Error marking app requests as seen', e.message);

return API.v1.failure(e.message);
}
},
},
);
}
}
Loading