refactor: addressed sonarqube lints

[SRINJAYDASGUPTA-Git]

User description

• '@prisma/client' imported multiple times.
• Merge the functions into one with an additional forRegisteredUser flag
• Replace as with upper case format AS.

Description

• Replaced as to AS in /apps/web/Dockerfile and /apps/api/DockerFile
• Merged two separate imports from @prisma/client into one in apps/api/src/common/api-key-roles.ts
• Added the forRegisteredUser boolean flag in apps/api/src/mail/services/interface.service.ts
• Commented out async workspaceInvitationMailForNonRegisteredUser and added the forRegisteredUser flag in async workspaceInvitationMailForRegisteredUser in apps/api/src/mail/services/mail.service.ts
• Commented out async workspaceInvitationMailForNonRegisteredUser and refactored the log statement according to the value of forRegisteredUser flag in apps/api/src/mail/services/mock.service.ts

Fixes #104

Dependencies

Mention any dependencies/packages used

Future Improvements

Mention any improvements to be done in future related to any file/feature

Mentions

@rajdip-b

Screenshots of relevant screens

Developer's checklist

• My PR follows the style guidelines of this project
• I have performed a self-check on my work

If changes are made in the code:

• I have followed the coding guidelines
• My changes in code generate no new warnings
• My changes are breaking another fix/feature of the project
• I have added test cases to show that my feature works
• I have added relevant screenshots in my PR
• There are no UI/UX issues

Documentation Update

• This PR requires an update to the documentation at docs.keyshade.xyz
• I have made the necessary updates to the documentation, or no documentation changes are required.

---

Type

Enhancement

---

Description

• Merged two separate imports from @prisma/client into one in apps/api/src/common/api-key-roles.ts.
• Added the forRegisteredUser boolean flag in workspaceInvitationMailForRegisteredUser method in apps/api/src/mail/services/interface.service.ts, apps/api/src/mail/services/mail.service.ts, and apps/api/src/mail/services/mock.service.ts.
• Commented out workspaceInvitationMailForNonRegisteredUser method in apps/api/src/mail/services/interface.service.ts, apps/api/src/mail/services/mail.service.ts, and apps/api/src/mail/services/mock.service.ts.
• Refactored the log statement according to the value of forRegisteredUser flag in apps/api/src/mail/services/mock.service.ts.
• Replaced as to AS in /apps/web/Dockerfile and /apps/api/Dockerfile.

---

Changes walkthrough

	Relevant files
Refactoring	api-key-roles.ts Consolidate imports from `@prisma/client`                                                apps/api/src/common/api-key-roles.ts Merged two separate imports from @prisma/client into one. +1/-2      interface.service.ts Refactor mail service interface                                                                    apps/api/src/mail/services/interface.service.ts Added the forRegisteredUser boolean flag in workspaceInvitationMailForRegisteredUser method. Commented out workspaceInvitationMailForNonRegisteredUser method. +9/-8      mail.service.ts Refactor mail service                                                                                        apps/api/src/mail/services/mail.service.ts Added the forRegisteredUser boolean flag in workspaceInvitationMailForRegisteredUser method. Commented out workspaceInvitationMailForNonRegisteredUser method. +32/-31  mock.service.ts Refactor mock mail service                                                                              apps/api/src/mail/services/mock.service.ts Added the forRegisteredUser boolean flag in workspaceInvitationMailForRegisteredUser method. Commented out workspaceInvitationMailForNonRegisteredUser method. Refactored the log statement according to the value of forRegisteredUser flag. +15/-13
Configuration changes	Dockerfile Update Dockerfile syntax                                                                                  apps/api/Dockerfile Replaced as to AS in the Dockerfile. +1/-1      Dockerfile Update Dockerfile syntax                                                                                  apps/web/Dockerfile Replaced as to AS in the Dockerfile. +1/-1

---

✨ Usage guide:

---

Overview:
The describe tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.

When commenting, to edit configurations related to the describe tool (pr_description section), use the following template:

/describe --pr_description.some_config1=... --pr_description.some_config2=...

With a configuration file, use the following template:

[pr_description]
some_config1=...
some_config2=...

Enabling\disabling automation When you first install the app, the default mode for the describe tool is: pr_commands = ["/describe --pr_description.add_original_user_description=true" "--pr_description.keep_original_user_title=true", ...] meaning the describe tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description. Markers are an alternative way to control the generated description, to give maximal control to the user. If you set: pr_commands = ["/describe --pr_description.use_description_markers=true", ...] the tool will replace every marker of the form pr_agent:marker_name in the PR description with the relevant content, where marker_name is one of the following: type: the PR type. summary: the PR summary. walkthrough: the PR walkthrough. Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.

Custom labels The default labels of the describe tool are quite generic: [Bug fix, Tests, Enhancement, Documentation, Other]. If you specify custom labels in the repo's labels page or via configuration file, you can get tailored labels for your use cases. Examples for custom labels: Main topic:performance - pr_agent:The main topic of this PR is performance New endpoint - pr_agent:A new endpoint was added in this PR SQL query - pr_agent:A new SQL query was added in this PR Dockerfile changes - pr_agent:The PR contains changes in the Dockerfile ... The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases. Note that Labels are not mutually exclusive, so you can add multiple label categories. Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.

Inline File Walkthrough 💎 For enhanced user experience, the describe tool can add file summaries directly to the "Files changed" tab in the PR page. This will enable you to quickly understand the changes in each file, while reviewing the code changes (diffs). To enable inline file summary, set pr_description.inline_file_summary in the configuration file, possible values are: 'table': File changes walkthrough table will be displayed on the top of the "Files changed" tab, in addition to the "Conversation" tab. true: A collapsable file comment with changes title and a changes summary for each file in the PR. false (default): File changes walkthrough will be added only to the "Conversation" tab.

Utilizing extra instructions The describe tool can be configured with extra instructions, to guide the model to a feedback tailored to the needs of your project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Notice that the general structure of the description is fixed, and cannot be changed. Extra instructions can change the content or style of each sub-section of the PR description. Examples for extra instructions: [pr_description] extra_instructions=""" - The PR title should be in the format: '<PR type>: <title>' - The title should be short and concise (up to 10 words) - ... """ Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

More PR-Agent commands To invoke the PR-Agent, add a comment using one of the following commands: /review: Request a review of your Pull Request. /describe: Update the PR title and description based on the contents of the PR. /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback. /ask <QUESTION>: Ask a question about the PR. /update_changelog: Update the changelog based on the PR's contents. /add_docs 💎: Generate docstring for new components introduced in the PR. /generate_labels 💎: Generate labels for the PR based on the PR's contents. /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. See the tools guide for more details. To list the possible configuration parameters, add a /config comment.

See the describe usage page for a comprehensive guide on using this tool.

[codiumai-pr-agent-free]

PR Description updated to latest commit (4b517f9)

[codiumai-pr-agent-free]

PR Analysis

• 🎯 Main theme: Code refactoring and cleanup
• 📝 PR summary: This PR addresses multiple code refactoring tasks. It merges two separate imports from '@prisma/client' into one, replaces lowercase 'as' to uppercase 'AS' in Dockerfiles, and merges two functions into one by adding a 'forRegisteredUser' flag. The PR also comments out the now redundant functions.
• 📌 Type of PR: Enhancement
• 🧪 Relevant tests added: No
• ⏱️ Estimated effort to review [1-5]: 2, because the changes are straightforward and limited to a few files. However, the lack of tests increases the review effort slightly.
• 🔒 Security concerns: No security concerns found

PR Feedback

💡 General suggestions: The PR is generally well-structured and the changes are clear. However, it would be better to remove the commented out code to keep the codebase clean. If the old implementation is needed for reference, it can always be retrieved from the git history.

---

✨ Usage guide:

---

Overview:
The review tool scans the PR code changes, and generates a PR review. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on any PR.
When commenting, to edit configurations related to the review tool (pr_reviewer section), use the following template:

/review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=...

With a configuration file, use the following template:

[pr_reviewer]
some_config1=...
some_config2=...

Utilizing extra instructions The review tool can be configured with extra instructions, which can be used to guide the model to a feedback tailored to the needs of your project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize. Examples for extra instructions: [pr_reviewer] # /review # extra_instructions=""" In the 'general suggestions' section, emphasize the following: - Does the code logic cover relevant edge cases? - Is the code logic clear and easy to understand? - Is the code logic efficient? ... """ Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

How to enable\disable automation When you first install PR-Agent app, the default mode for the review tool is: pr_commands = ["/review", ...] meaning the review tool will run automatically on every PR, with the default configuration. Edit this field to enable/disable the tool, or to change the used configurations

Auto-labels The review tool can auto-generate two specific types of labels for a PR: a possible security issue label, that detects possible security issues (enable_review_labels_security flag) a Review effort [1-5]: x label, where x is the estimated effort to review the PR (enable_review_labels_effort flag)

Extra sub-tools The review tool provides a collection of possible feedbacks about a PR. It is recommended to review the possible options, and choose the ones relevant for your use case. Some of the feature that are disabled by default are quite useful, and should be considered for enabling. For example: require_score_review, require_soc2_ticket, and more.

More PR-Agent commands To invoke the PR-Agent, add a comment using one of the following commands: /review: Request a review of your Pull Request. /describe: Update the PR title and description based on the contents of the PR. /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback. /ask <QUESTION>: Ask a question about the PR. /update_changelog: Update the changelog based on the PR's contents. /add_docs 💎: Generate docstring for new components introduced in the PR. /generate_labels 💎: Generate labels for the PR based on the PR's contents. /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. See the tools guide for more details. To list the possible configuration parameters, add a /config comment.

See the review usage page for a comprehensive guide on using this tool.

[codiumai-pr-agent-free]

PR Code Suggestions

	Suggestions
maintainability	Remove unused commented-out code.                                             Remove the commented-out method 'workspaceInvitationMailForNonRegisteredUser' if it's no longer needed to keep the codebase clean. apps/api/src/mail/services/interface.service.ts [17-23] -// workspaceInvitationMailForNonRegisteredUser( -// email: string, -// workspace: string, -// actionUrl: string, -// invitedBy: string, -// role: WorkspaceRole -// ): Promise<void> +(Remove the commented-out code) Refactor conditional logging for better readability.                          Refactor the conditional logging statement for clarity and maintainability. apps/api/src/mail/services/mock.service.ts [18-19] -forRegisteredUser? -`Workspace Invitation Mail for Registered User: ${email}, ${workspace}, ${actionUrl}, ${invitee}, ${role}`:`Workspace Invitation Mail for Non Registered User: ${email}, ${workspace}, ${actionUrl}, ${invitee}, ${role}` +const userType = forRegisteredUser ? 'Registered' : 'Non Registered'; +this.log.log(`Workspace Invitation Mail for ${userType} User: ${email}, ${workspace}, ${actionUrl}, ${invitee}, ${role}`);
security	Sanitize HTML email templates to prevent XSS attacks.                         Ensure HTML email templates are sanitized to prevent XSS attacks or consider using a template engine for safer dynamic content insertion. apps/api/src/mail/services/mail.service.ts [31-35] -const body = -`<!DOCTYPE html> - <html> - <head> - <title>Workspace Invitation</title> +const body = sanitizeHtml(` +<!DOCTYPE html> +<html> +<head> + <title>Workspace Invitation</title> +`);
best practice	Pin Node.js image to a specific version for consistent builds.                Pin the Node.js image to a specific version instead of using the major version tag '20-alpine' to ensure consistent, repeatable builds. apps/api/Dockerfile [1] -FROM node:20-alpine AS build +FROM node:20.1.0-alpine AS build

---

✨ Usage guide:

---

Overview:
The improve tool scans the PR code changes, and automatically generates suggestions for improving the PR code. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.
When commenting, to edit configurations related to the improve tool (pr_code_suggestions section), use the following template:

/improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...

With a configuration file, use the following template:

[pr_code_suggestions]
some_config1=...
some_config2=...

Enabling\disabling automation When you first install the app, the default mode for the improve tool is: pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...] meaning the improve tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically.

Utilizing extra instructions Extra instructions are very important for the improve tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project. Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on. Examples for extra instructions: [pr_code_suggestions] # /improve # extra_instructions=""" Emphasize the following aspects: - Does the code logic cover relevant edge cases? - Is the code logic clear and easy to understand? - Is the code logic efficient? ... """ Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

A note on code suggestions quality While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically. Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base. Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project, or use the custom suggestions 💎 tool With large PRs, best quality will be obtained by using 'improve --extended' mode.

More PR-Agent commands To invoke the PR-Agent, add a comment using one of the following commands: /review: Request a review of your Pull Request. /describe: Update the PR title and description based on the contents of the PR. /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback. /ask <QUESTION>: Ask a question about the PR. /update_changelog: Update the changelog based on the PR's contents. /add_docs 💎: Generate docstring for new components introduced in the PR. /generate_labels 💎: Generate labels for the PR based on the PR's contents. /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component. See the tools guide for more details. To list the possible configuration parameters, add a /config comment.

See the improve usage page for a more comprehensive guide on using this tool.

[rajdip-b]

Left some reviews. Also, the unit tests are failing. So make sure you have run them and they work.

[rajdip-b]

@SRINJAYDASGUPTA-Git

also, implement this in the code!

[rajdip-b]

@SRINJAYDASGUPTA-Git the unit tests are still failing https://github.com/keyshade-xyz/keyshade/actions/runs/7765045160/job/21179240008?pr=106#step:9:212

[rajdip-b]

The isses are resolved. Make sure the tests passes then we can merge this

[SRINJAYDASGUPTA-Git]

Please check if its ok now @rajdip-b

[sonarqubecloud]

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[rajdip-b]

🎉 This PR is included in version 1.0.0-alpha.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

[rajdip-b]

🎉 This PR is included in version 1.0.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀