Skip to content
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.

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

ProfileKeys fix #1069

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ThisTestUser
Copy link
Contributor

@ThisTestUser ThisTestUser commented Oct 4, 2024

Fixes #1068.

This PR only creates the ProfileKeys if the user is logged in to a Microsoft account. This is the way it is done in the vanilla code.

Copy link

coderabbitai bot commented Oct 4, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve modifications to the MicrosoftLoginManager and MinecraftClientMixin classes. In MicrosoftLoginManager, the account type for session creation is updated from Session.AccountType.MOJANG to Session.AccountType.MSA, reflecting a transition to Microsoft account authentication. In MinecraftClientMixin, the handling of user sessions and profile keys is refined, including a type change for the wurstProfileKeys variable and conditional logic for creating a UserApiService based on the session's account type.

Changes

File Path Change Summary
src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java Updated account type in login method from Session.AccountType.MOJANG to Session.AccountType.MSA.
src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java Changed wurstProfileKeys type from ProfileKeysImpl to ProfileKeys; updated setSession method for conditional UserApiService creation; modified getProfileKeys method to return ProfileKeys.MISSING under certain conditions.

Assessment against linked issues

Objective Addressed Explanation
ProfileKeys incorrectly being created for alts (#1068)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Outside diff range and nitpick comments (2)
src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java (2)

107-107: LGTM! Consider adding a comment for clarity.

The change from Session.AccountType.MOJANG to Session.AccountType.MSA correctly aligns with the modern Minecraft authentication system and addresses the issue of incorrect ProfileKeys creation for alternate accounts. This update ensures that only Microsoft accounts (MSA) are treated as valid, potentially preventing ProfileKey creation for cracked accounts.

Consider adding a brief comment explaining why MSA is used and how it relates to the ProfileKeys issue. For example:

// Use MSA account type to ensure ProfileKeys are only created for valid Microsoft accounts
Session.AccountType.MSA);

Line range hint 1-624: Overall, the change looks good and addresses the issue. Consider adding a safeguard.

The modification from MOJANG to MSA account type effectively addresses the issue of incorrect ProfileKeys creation for alternate accounts. This change aligns well with the PR objectives and the modern Minecraft authentication system.

To enhance robustness, consider adding a check to ensure that only Microsoft accounts are processed. This could prevent any potential issues with legacy or unsupported account types. For example:

if (!mcProfile.isMicrosoftAccount()) {
    throw new LoginException("Only Microsoft accounts are supported.");
}

This addition would provide an extra layer of security and clarity in the authentication process.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Files that changed from the base of the PR and between de4d5f4 and 44fe425.

📒 Files selected for processing (2)
  • src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java (1 hunks)
  • src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java (2 hunks)
🔇 Additional comments (2)
src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java (2)

60-60: Change variable type to ProfileKeys for better abstraction

Changing wurstProfileKeys from ProfileKeysImpl to ProfileKeys uses the interface type, which improves abstraction and flexibility. This is a good practice that enhances code maintainability.


214-220: Conditionally initialize UserApiService based on session type

The updated code correctly initializes UserApiService only when the session account type is MSA, and defaults to UserApiService.OFFLINE otherwise. This ensures that ProfileKeys are only created for Microsoft accounts, preventing unnecessary key creation for cracked accounts as per the PR objectives.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ProfileKeys incorrectly being created for alts
1 participant