CNREL support #2076
Merged
CNREL support #2076
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| // Send response. | ||
| ctx.json(responseData); | ||
|
|
||
| // Log to console. | ||
| Grasscutter.getLogger().info(translate("messages.dispatch.account.login_attempt", ctx.ip())); | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
Please leave the new line at the end of the file.
KingRainbow44
requested changes
Mar 10, 2023
There was a problem hiding this comment.
Consider removing the messages.status.versionos key from the languages file. As the message is more of a 'debug message' instead of a critical message for the server administrator, it makes more sense to keep this message hardcoded in existing places. (and to switch the log level for these messages from info to debug)
Comment on lines
120
to
121
| .getSessionKeyAuthenticator() | ||
| .authenticate(AuthenticationSystem.fromComboTokenRequest(ctx, bodyData, tokenData)); |
Comment on lines
94
to
95
| .getTokenAuthenticator() | ||
| .authenticate(AuthenticationSystem.fromTokenRequest(ctx, bodyData)); |
Comment on lines
71
to
72
| .getPasswordAuthenticator() | ||
| .authenticate(AuthenticationSystem.fromPasswordRequest(ctx, bodyData)); |
Comment on lines
40
to
54
| .handleLogin(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| javalin.post("/authentication/register", ctx -> Grasscutter.getAuthenticationSystem().getExternalAuthenticator() | ||
| .handleAccountCreation(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| .handleAccountCreation(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| javalin.post("/authentication/change_password", ctx -> Grasscutter.getAuthenticationSystem().getExternalAuthenticator() | ||
| .handlePasswordReset(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| .handlePasswordReset(AuthenticationSystem.fromExternalRequest(ctx))); | ||
|
|
||
| // External login (from OAuth2). | ||
| javalin.post("/hk4e_global/mdk/shield/api/loginByThirdparty", ctx -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator() | ||
| .handleLogin(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| .handleLogin(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| javalin.get("/authentication/openid/redirect", ctx -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator() | ||
| .handleTokenProcess(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| .handleTokenProcess(AuthenticationSystem.fromExternalRequest(ctx))); | ||
| javalin.get("/Api/twitter_login", ctx -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator() | ||
| .handleRedirection(AuthenticationSystem.fromExternalRequest(ctx), ClientType.DESKTOP)); | ||
| .handleRedirection(AuthenticationSystem.fromExternalRequest(ctx), ClientType.DESKTOP)); | ||
| javalin.get("/sdkTwitterLogin.html", ctx -> Grasscutter.getAuthenticationSystem().getOAuthAuthenticator() | ||
| .handleRedirection(AuthenticationSystem.fromExternalRequest(ctx), ClientType.MOBILE)); | ||
| .handleRedirection(AuthenticationSystem.fromExternalRequest(ctx), ClientType.MOBILE)); |
| // Use the CN region list. | ||
| QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponsecn); | ||
| event.call(); | ||
| logger.info(translate("messages.status.versioncn")); |
There was a problem hiding this comment.
Suggested change
| logger.info(translate("messages.status.versioncn")); | |
| logger.debug(translate("messages.status.versioncn")); |
| // Use the OS region list. | ||
| QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); | ||
| event.call(); | ||
| logger.info(translate("messages.status.versionos")); |
There was a problem hiding this comment.
Suggested change
| logger.info(translate("messages.status.versionos")); | |
| logger.debug(translate("messages.status.versionos")); |
| // Use the default region list. | ||
| QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); | ||
| event.call(); | ||
| logger.info(translate("messages.status.versionos")); |
There was a problem hiding this comment.
Suggested change
| logger.info(translate("messages.status.versionos")); | |
| logger.debug(translate("messages.status.versionos")); |
| // Use the default region list. | ||
| QueryAllRegionsEvent event = new QueryAllRegionsEvent(regionListResponse); | ||
| event.call(); | ||
| logger.info(translate("messages.status.versionos")); |
There was a problem hiding this comment.
Suggested change
| logger.info(translate("messages.status.versionos")); | |
| logger.debug(translate("messages.status.versionos")); |
|
Already deleted the language keys and hardcoded the debug output |
KingRainbow44
approved these changes
Mar 11, 2023
|
can you/someone else test it and send a video of it working here? (with debug logs on preferably) |
CNREL.mp4 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Please carefully read the Contributing note and Code of conduct before making any pull requests.
And, Do not make a pull request to merge into stable unless it is a hotfix. Use the development branch instead.
Issues fixed by this PR
Fix CNREL client can't be played
Special thanks to @xlpmyxhdr
Type of changes
Checklist: