Skip to content

Commit

Permalink
refactor: clean up whitespace and improve code formatting in Slack-re…
Browse files Browse the repository at this point in the history
…lated files
  • Loading branch information
simlarsen committed Mar 8, 2025
1 parent 27a7b57 commit 3238352
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 70 deletions.
1 change: 0 additions & 1 deletion Common/Server/API/SlackAPI.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ export default class SlackAPI {
},
);


return router;
}
}
1 change: 0 additions & 1 deletion Common/Server/Services/IncidentService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,6 @@ ${incidentSeverity.name}
);
}


public async getIncidentNumber(data: {
incidentId: ObjectID;
}): Promise<number | null> {
Expand Down
33 changes: 16 additions & 17 deletions Common/Server/Utils/Workspace/Slack/Actions/Auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ export default class SlackAuthAction {
// if there are no actions then return.
if (
(!payload["actions"] || (payload["actions"] as JSONArray).length === 0) &&
payload["type"] !== "view_submission" && payload["type"] !== "shortcut" && !payload["command"]
payload["type"] !== "view_submission" &&
payload["type"] !== "shortcut" &&
!payload["command"]
) {
logger.debug("No actions found in payload. Returning unauthorized.");
return {
Expand Down Expand Up @@ -99,17 +101,16 @@ export default class SlackAuthAction {
(payload as JSONObject)?.["user"] as JSONObject
)?.["username"] as string;


if(payload['user_id']) {
slackUserId = payload['user_id'] as string;
if (payload["user_id"]) {
slackUserId = payload["user_id"] as string;
}

if(payload['user_name']) {
slackUsername = payload['user_name'] as string;
if (payload["user_name"]) {
slackUsername = payload["user_name"] as string;
}

if(payload['team_id']) {
slackTeamId = payload['team_id'] as string;
if (payload["team_id"]) {
slackTeamId = payload["team_id"] as string;
}

const triggerId: string | undefined = payload?.["trigger_id"] as string;
Expand Down Expand Up @@ -219,20 +220,19 @@ export default class SlackAuthAction {
logger.debug(actions);
}

if(payload['callback_id']) {
if (payload["callback_id"]) {
const action: SlackAction = {
actionType: payload['callback_id'] as SlackActionType,
actionType: payload["callback_id"] as SlackActionType,
};

actions.push(action);
}


const command: string | undefined = payload["command"] as string;
const commandText: string | undefined = payload["text"] as string;
const commandText: string | undefined = payload["text"] as string;

// add command to actions.
if(command) {
if (command) {
const action: SlackAction = {
actionType: command as SlackActionType,
actionValue: commandText,
Expand All @@ -241,7 +241,7 @@ export default class SlackAuthAction {
actions.push(action);
}

const slackRequest: SlackRequest = {
const slackRequest: SlackRequest = {
isAuthorized: true,
slackUserId: slackUserId,
userId: userId,
Expand All @@ -259,11 +259,10 @@ export default class SlackAuthAction {
viewValues: viewValues,
};


logger.debug("Slack request authorized successfully");
logger.debug("Slack request: ");
logger.debug(slackRequest);

return slackRequest;
return slackRequest;
}
}
Loading

0 comments on commit 3238352

Please sign in to comment.