Skip to content

Add Google Wallet integration - #6028

Merged
ThiefMaster merged 89 commits into
indico:masterfrom
openprojects:Add-Google-Wallet-integration
Feb 26, 2024
Merged

Add Google Wallet integration#6028
ThiefMaster merged 89 commits into
indico:masterfrom
openprojects:Add-Google-Wallet-integration

Conversation

@openprojects

@openprojects openprojects commented Nov 9, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Add Google Wallet integration.

Google Wallet Event ticket preview:

Screenshot 2024-01-17 at 13 24 28 Screenshot 2024-01-17 at 13 50 12

@openprojects
openprojects force-pushed the Add-Google-Wallet-integration branch 3 times, most recently from 2653814 to 7f7a84a Compare November 9, 2023 17:01
ThiefMaster
ThiefMaster reviewed Nov 9, 2023
View reviewed changes
Comment thread indico/modules/events/__init__.py Outdated
Comment thread indico/modules/events/registration/blueprint.py Outdated
Comment thread indico/modules/events/registration/badges.py Outdated
Comment thread indico/modules/events/registration/badges.py Outdated
Comment thread indico/modules/events/registration/badges.py Outdated
@openprojects
openprojects marked this pull request as ready for review November 9, 2023 20:35
@openprojects
openprojects force-pushed the Add-Google-Wallet-integration branch from dafec5a to 57a496e Compare November 13, 2023 14:40
@ThiefMaster

ThiefMaster commented Nov 13, 2023

Copy link
Copy Markdown
Member

You accidentally pushed an empty branch. To recover this without having to open a new PR (assuming origin is your remote):

  • git push --force origin 010d0293235:Add-Google-Wallet-integration
  • Now the "reopen" button should be available here

(010d0293235 is the "Move GoogleWalletManager class to separate file" commit you pushed earlier today)

Then to properly sync it with master:

  • git fetch upstream
  • git rebase upstream/master
  • git push --force

@openprojects

openprojects commented Nov 13, 2023 via email •
edited by ThiefMaster
Loading

Copy link
Copy Markdown
Contributor Author

@openprojects openprojects reopened this Nov 13, 2023
ThiefMaster
ThiefMaster reviewed Nov 17, 2023
View reviewed changes
Comment thread indico/modules/events/registration/templates/display/registration_summary.html Outdated
Comment thread indico/modules/events/registration/templates/display/conference_home.html Outdated
Comment thread indico/modules/events/registration/templates/display/conference_home.html Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/migrations/versions/20231107_0956_492c6d801a4a_add_google_wallet_integration.py Outdated
Comment thread indico/migrations/versions/20231107_0956_492c6d801a4a_add_google_wallet_integration.py Outdated
Comment thread indico/modules/categories/controllers/management.py Outdated
@tomasr8

tomasr8 commented Nov 22, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

@openprojects Could you please rebase the PR (and update the migration)? thanks!

tomasr8
tomasr8 reviewed Nov 22, 2023
View reviewed changes
Comment thread indico/modules/events/models/events.py Outdated
Comment thread indico/modules/categories/controllers/management.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
@openprojects
openprojects force-pushed the Add-Google-Wallet-integration branch from f839e20 to f5e8f96 Compare November 23, 2023 08:56
@openprojects
openprojects requested a review from tomasr8 November 23, 2023 09:48
tomasr8
tomasr8 reviewed Nov 27, 2023
View reviewed changes
Comment thread indico/modules/events/registration/google_wallet.py Outdated
tomasr8
tomasr8 reviewed Nov 27, 2023
View reviewed changes
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/templates/display/registration_summary.html Outdated
Comment thread indico/modules/events/registration/controllers/display.py Outdated
tomasr8
tomasr8 reviewed Nov 28, 2023
View reviewed changes
Comment thread indico/migrations/versions/20231107_0956_492c6d801a4a_add_google_wallet_integration.py Outdated
@openprojects
openprojects requested a review from tomasr8 November 28, 2023 15:08
@tomasr8

tomasr8 commented Jan 31, 2024

Copy link
Copy Markdown
Member

@openprojects Could you rebase the PR? :)

@openprojects

openprojects commented Jan 31, 2024

Copy link
Copy Markdown
Contributor Author

@openprojects Could you rebase the PR? :)

Done.

@tomasr8

tomasr8 commented Jan 31, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

@ThiefMaster

ThiefMaster commented Jan 31, 2024

Copy link
Copy Markdown
Member

And while we usually squash-and-merge PRs anyway, it's way easier if we can do a quick git rebase master locally for testing (at least I always do that to test on the latest version regardless of how fresh the PR 's branch is)

@openprojects
openprojects force-pushed the Add-Google-Wallet-integration branch from e08c595 to 3b8fe26 Compare January 31, 2024 16:01
@openprojects

openprojects commented Feb 1, 2024

Copy link
Copy Markdown
Contributor Author

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

Working on it...

@tomasr8

tomasr8 commented Feb 1, 2024

Copy link
Copy Markdown
Member

@openprojects Could you rebase the PR? :)

Done.

Could you rebase instead of merging master? We try to avoid merge commits to keep the history clean

Working on it...

Try this:

git checkout Add-Google-Wallet-integration
git reset --hard HEAD~3  # To remove the last 3 commits which shouldn't be there
git fetch upstream
git rebase upstream/master
git push -f origin Add-Google-Wallet-integration

GovernmentPlates
GovernmentPlates reviewed Feb 1, 2024
View reviewed changes
Comment thread indico/modules/events/registration/google_wallet.py Outdated
@openprojects
openprojects force-pushed the Add-Google-Wallet-integration branch 2 times, most recently from 6a4213a to 4349e6b Compare February 1, 2024 09:43
@ThiefMaster
Refactor google id generation
e5dc4cb 
- better naming
- util to prepend issuer id part
@ThiefMaster
Move baase API URLs outside GWM class
4a7b71c
@ThiefMaster
Improve category field descriptions
3d5ff47
@ThiefMaster
Use shorter key for google credentials
21509ac
@ThiefMaster
Update docstring
c871c82
@ThiefMaster
Bail out early if GW is disabled
44b9a40
@ThiefMaster
Refactor GWM credentials init
e38a87f
@ThiefMaster
Persist ticket class ID
23eb414 
It should never change, but by saving it in the event settings we know
for which events a ticket class can been created. That may come in handy
in the future...
OmeGak
OmeGak reviewed Feb 26, 2024
View reviewed changes
Comment thread indico/modules/categories/forms.py Outdated
Comment thread indico/modules/categories/controllers/management.py Outdated
Comment thread indico/modules/events/registration/forms.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/google_wallet.py
Comment thread indico/modules/events/registration/google_wallet.py Outdated
Comment thread indico/modules/events/registration/models/registrations.py
@ThiefMaster @OmeGak
Fix field description
396c4b3 
Co-authored-by: Alejandro Avilés <omegak@gmail.com>
@ThiefMaster
ThiefMaster force-pushed the Add-Google-Wallet-integration branch from 99d3fb6 to 396c4b3 Compare February 26, 2024 13:05
@ThiefMaster ThiefMaster self-assigned this Feb 26, 2024
@ThiefMaster

ThiefMaster commented Feb 26, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Final TODOs for later or tomorrow before this this is finally getting merged:

  • Expose event logo via secret (signed) URL so even private events can have their logo in Google Wallet
  • Mention that wallet tickets are not available for accompanying persons?
  • Warn when exactly one of address/venue are set and wallet tickets are enabled
  • Separate setting for wallet logo URL? Also super useful for developers whose instance is not accessible by Google's servers

@ThiefMaster ThiefMaster added this to the v3.3 milestone Feb 26, 2024
@ThiefMaster
ThiefMaster force-pushed the Add-Google-Wallet-integration branch from 8573e81 to 960c133 Compare February 26, 2024 18:29
@ThiefMaster
ThiefMaster enabled auto-merge (squash) February 26, 2024 18:30
@ThiefMaster
Use better default wallet logo
856bd7e 
It gets squeezed into a square so the default logo with the full
"Indico" text looks really weird
@ThiefMaster
ThiefMaster force-pushed the Add-Google-Wallet-integration branch from 960c133 to 856bd7e Compare February 26, 2024 18:59
@ThiefMaster
ThiefMaster merged commit b509a5e into indico:master Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ThiefMaster ThiefMaster ThiefMaster approved these changes
@tomasr8 tomasr8 Awaiting requested review from tomasr8
+2 more reviewers
@OmeGak OmeGak OmeGak left review comments
@GovernmentPlates GovernmentPlates GovernmentPlates left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@ThiefMaster ThiefMaster

Labels

None yet

Projects

None yet

Milestone

v3.3

Development

Successfully merging this pull request may close these issues.

5 participants

@openprojects @ThiefMaster @tomasr8 @OmeGak @GovernmentPlates