Skip to content

fix(auth): hide instance token when exposure disabled #2736

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

Open
aim1sh wants to merge 1 commit into
base: develop
Choose a base branch
from
+13 −3
Open

fix(auth): hide instance token when exposure disabled #2736

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/api/controllers/instance.controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,16 @@ export class InstanceController {

public async fetchInstances({ instanceName, instanceId, number }: InstanceDto, key: string) {
const env = this.configService.get<Auth>('AUTHENTICATION').API_KEY;
const exposeToken = this.configService.get<Auth>('AUTHENTICATION').EXPOSE_IN_FETCH_INSTANCES;
const hideTokens = (instances: any[]) => {
if (exposeToken) return instances;

return instances.map((instance) => {
const publicInstance = { ...instance };
delete publicInstance.token;
return publicInstance;
});
};

if (env.KEY !== key) {
const instancesByKey = await this.prismaRepository.instance.findMany({
Expand All @@ -420,19 +430,19 @@ export class InstanceController {
if (instancesByKey.length > 0) {
const names = instancesByKey.map((instance) => instance.name);

return this.waMonitor.instanceInfo(names);
return hideTokens(await this.waMonitor.instanceInfo(names));
} else {
throw new UnauthorizedException();
}
}

if (instanceId || number) {
return this.waMonitor.instanceInfoById(instanceId, number);
return hideTokens(await this.waMonitor.instanceInfoById(instanceId, number));
}

const instanceNames = instanceName ? [instanceName] : null;

return this.waMonitor.instanceInfo(instanceNames);
return hideTokens(await this.waMonitor.instanceInfo(instanceNames));
}

public async setPresence({ instanceName }: InstanceDto, data: SetPresenceDto) {
Expand Down