forked from FriendsOfGalaxy/galaxy-integration-steam
-
Notifications
You must be signed in to change notification settings - Fork 9
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
Fix files accidentally added during rebase #3
Open
ABaumher
wants to merge
46
commits into
GOG-Nebula:master
Choose a base branch
from
ABaumher:master_nebula
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
implemented the RSA call. updated gitignore
Took protobufs that we needed from various sources. Updated all associated code to work with these changes updated gitignore to ignore the proto files we aren't making available updated associated enums and constants that are related to the new protos. minor code cleanup
… webpage to go to step 2. various little bugfixes, including no more infinite loops on getters
…sic code to display all the other pages. This is largely unchanged from the original, but the login page has evidently changed. the code-behind isn't implemented. Various bugfixes as well
updated consts, protobuf, protocol buffer to report modern os types (Windows 11, macOS12,13). login calls and processing are implemented and passed to/from the backend and websocket.
Remove legacy code such as sentry, etc. Add classes and enumerations dealing with two factor information: Polling data, Authentication ui updates, etc, propegate these calls through the websocket, backend, and protocol/protobuf code. Code likely still needs some work to function properly
…ning about types overshadowing the standard types. Removed authentication.py. Moved all enums i could find in Steam_network to a dedicated enums.py. Moved All top level functions that may have been called in multiple spots to a utils.py Internally, downgraded my environment to 3.7 as per GOG Galaxy instructions. The resulting file was added to .gitignore
add type hints throughout the code. correctly parse Public Key data from steam, which was returned in hexadecimal format, updated imports that were causing issues. Full login with no SteamGuard test prototyped. - Testing revealed that the confirm login with token (used to stay logged in, eventually) was not implemented. It is now prototyped out so the code won't break (it just won't work)
Adds the protobuf files used adds tasks.py so the invoke instructions actually work Update bindings Fix AttributeError('out_of_game_heartbeat_seconds')
Partial cleanup of Proto files so they parse and build correctly from tasks.py This code is in progress; other code was prioritized to prevent burnout Added Protos. Updated Tasks.py to properly import them. They still don't print like i want them to, which annoys me immensely. Need to retrieve old py files in the repo before calling build install, which broke them Reverted py files to what they were before merging with Thibmo's fork.
…few conflicts, i'll have to figure out the best way to handle them Figured out how to handle conflicts with the service messages. we should now be able to get the latest proto and py files from them Finally found the version of protoc the old version was using. we can finally build this thing and it'll run properly.
…d remaining logged in. will likely need to revert some changes in this commit, and possibly others back to the original fork.
…ntLogIn CMsg and the rest of the calls.
Update README_ALPHA.md
preparing to call old client login method. preparing to remove public profiles. Preparing to clean up unused calls.
… Public Profiles should be unneccessary now, so it should be able to be removed. Finished removing public profiles. Started adding the token login call (final auth flow step in new flow). Removed some old, unused calls. Started support for confirm mobile login Fixed a few issues created by removing public backend
…e file when we started pulling sync information.
… in method is disabled. To re-enable the stay login, is_initialized in user_info_cache.py needs to be toggled. disabled cache login. Wrote comments explaining it
Remove guard data requirements, as they were breaking mobile login Bugfix to properly recover when refresh token expires or is revoked.
Update README_ALPHA.md Update README_ALPHA.md Added notes for people with multiple python installs Update README_ALPHA.md Update README_ALPHA.md Update README_ALPHA.md Update README.md
fix proto2 syntax statement
makes the reference here static since it's not going to change anyway. Update README.md Update README.md Update README.md Fix the readme and install.txt so they now work Actually fixed it this time. Requires galaxy plugin in install Added beautiful soup to app requirements so it does not crash. fixed enums.py so the stuff i was working on to clean up the code no longer crashes the thing revert app.txt change. remove user_profile, which caused the conflict. it is now unused.
updated translate error to log the error received so we can more easily debug bugfix for mobile confirm. If you hit continue before confirming, it will now recover.
… it's better. show password button now simplified, and it actually works.
…login attempt, an errant throw on a failed login attempt, printing the error code now works properly when we get an int instead of an EResult (it errored), and several statements failed to update with the login page fix. missed a pair of errors related to removing user name from pages.
check whether users have py installed
…ill need to update the website, but for now this should fix the bugs
Bugfixes (again). Email code works again. Tracked down a bug where the client would silently crash if you revoked permission while it was running. It should now do something, but likely needs more work. bugfix, priority list was sorting ascending, wanted descending.
…ly not). parsing Kwargs for url no longer errors. A silent authentication revoke now hopefully causes GOG to ask you to log in. Bugfix. Wrapping recv in a task was done improperly. it's now fixed. packet was also not awaiting, so that is fixed.
…er color Experiemental Resend Code implementation. Two Factor expire now kicks you back to login page. Hopefully, anyway. Revert "Updated the ui for mobile confirm for clarity. link now uses the proper color" This reverts commit c8b8a7b. Revert "Experiemental Resend Code implementation. Two Factor expire now kicks you back to login page. Hopefully, anyway." This reverts commit bb47e90. Reverts all the changes made to try to fix the resend issue. We now just do what steam does. Time outs now fallback to the login page
Updated index with a message explaining what happens when email times out, the old code may still be valid. Update README.md Update in prep for release Update README.md fix installation instructions
readme tweaks Update gitignore to ignore zip files, so it excudes the release. reimplemented the html and css changes accidentally reverted when fixing my experimental patch.
…1.0.5 added windows and mac scripts to automatically copy folders to proper destination. on mac, this should also clear gatekeepter.
…ers or are too long. Cleans up general code as per merge request fix suggestions. updated the readmes for clarity. fixed bug introduced into 1.0.6 beta during cleanup Update dev.txt This is fixed in other branches but required for new installs, and especially on MacOS.
…est to point there as well. cleaned up user info cache (again) so the is_initialized call is clean (tested it). and updated enum message to be less scary.
enums: Corrected type hint in `to_TwoFactorMethod` steam_auth_polling_data: Corrected 'any' check in 'has_valid_confirmation_method'. No 2FA's enum value is 0, which was being coerced to False. backend_steam_network: The value from no two-factor is now returned instead of set to result and unused. The _handle_steam_guard_none function now properly calls the finish auth process so we're actually logged in. previously it'd just short-circuit that process and then error later. Properly does this, expected wrong UserActionRequired value and also wasn't awaited. in other words, several small, dumb mistakes. bumped manifest and current version to 1.0.7 as a result of these changes. Hardened the User Info Cache code so it would not error if the data somehow was cleared to Null and written to the credentials storage. It will also write an empty dict to the credentials instead of a dict of nulls. Stripped the leading and trailing whitespace characters during 2FA code inputs so the whitespace wouldn't make your 2FA fail. Properly type-hint 2FA code so it would resolve nicely in any IDE or MyPy Fixed broken urls in current_version,json Updated version.py to have 1.0.7 with relevant changelog information Hardened the User Info Cache code so it would not error if the data somehow was cleared to Null and written to the credentials storage. It will also write an empty dict to the credentials instead of a dict of nulls. Stripped the leading and trailing whitespace characters during 2FA code inputs so the whitespace wouldn't make your 2FA fail. Properly type-hint 2FA code so it would resolve nicely in any IDE or MyPy Fixed broken urls in current_version,json update gitignore to avoid .gz files. The mac with installer is uses that compression. partially updated the batch file to deal with issues, still needs some tweaking
Fixed license.txt - missed a merge commit message mistake Updated auto-copy-windows to use a full path. Was not done on nebula so i didn't break the reviews, but now that squashing did that anyway, i might as well.
Fix rebase issues. Should put us one commit ahead of Nebula with no conflicts. will likely be conflicts because rebase is a pain sometimes.
Merged
yeah git can be a pain lmao |
urwrstkn8mare
previously approved these changes
Jun 27, 2023
just rebased my master branch to this (it got weird with the PR, so now that that's through i can just go back to it instead of being 46 ahead and 45 behind for no reason). so we could use that branch instead. But this one i can delete afterward and be fine. |
I'd recommend a squash merge on this so we lose that terrible message lol. |
ABaumher
added a commit
that referenced
this pull request
Jul 4, 2023
various fixes to readme, upgrade module versions, get pytests closer to running ok
The merge-base changed after approval.
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.
The gift that keeps giving, lol.
Anyway, i believe these files were from the initial
tasks.py
insert code and were merged in and somehow not deleted. This removes them.