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

Merge Changes For Upcoming Release 4.1.1+portage-4.2.0 #893

Merged
merged 127 commits into from
Sep 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
cc8c5f2
Adding a openid connect gem
Jun 28, 2024
09d9e31
Omniauth Callback changes, this is not finalized will be changing
Jun 28, 2024
a0d3e5e
adding cilogon to the devise settings and user changes, this is not f…
200455939-yashu Jun 28, 2024
efcecc7
adding sign-in with the cilogon option
200455939-yashu Jun 28, 2024
3d2bf95
adding the openid devise settings
200455939-yashu Jun 28, 2024
89b45e9
adding cilogon callback to the route
200455939-yashu Jun 28, 2024
c6d46bd
adding the session changes to the cilogon, not finalized
200455939-yashu Jun 28, 2024
3634c70
session changes to support cilogon
200455939-yashu Jun 28, 2024
12d8393
changes not required will be cleaned
200455939-yashu Jun 28, 2024
a8a2409
Merge remote-tracking branch 'origin/integration' into yashu-sso-cilogon
200455939-yashu Jun 28, 2024
a54a0a4
Temporary changes to test the credentials
200455939-yashu Jul 9, 2024
160a9fc
This file contains multiple trial and error methods on callback needs…
200455939-yashu Jul 19, 2024
00071d5
since we will be having the eppn value with cilogon instead of the uid
200455939-yashu Jul 19, 2024
dd715a6
Devise openid_connect trial and errors
200455939-yashu Jul 19, 2024
86fabb4
merge after resolving gem lock file conflicts by accepting the incomi…
200455939-yashu Jul 19, 2024
afb6e58
This is working code so far! still need lot of clean-up on this
200455939-yashu Jul 26, 2024
adf7840
Merge remote-tracking branch 'origin/integration' into yashu-sso-cilogon
200455939-yashu Jul 26, 2024
8f501fd
The debugging of the sessions. This major Needs cleanup
200455939-yashu Jul 30, 2024
39eb671
Altering the MAX cookies size for the browser
200455939-yashu Aug 1, 2024
db6d65c
To enable the recaptcha in localhost we use 127 instead of localhost
200455939-yashu Aug 8, 2024
7f8f71b
This the working code of the SSO sing-in testing connect to ORCID
200455939-yashu Aug 14, 2024
0c21df3
Merge remote-tracking branch 'origin/integration' into yashu-sso-cilogon
200455939-yashu Aug 14, 2024
d645bb6
WIP Updates to sso
lagoan Aug 14, 2024
4deb83d
Update email title for changed admin perms
aaronskiba Aug 19, 2024
7b788d6
Fix handling of `privileges_changed` assignment
aaronskiba Aug 19, 2024
fbe1162
Make rubocop happy
aaronskiba Aug 19, 2024
67aa127
Update CHANGELOG.md
aaronskiba Aug 19, 2024
ae66ef0
code clean up and added test cases
200455939-yashu Aug 19, 2024
209533f
Merge pull request #858 from portagenetwork/aaron/issues/835-and-836
aaronskiba Aug 19, 2024
9a9e6e2
Delete sessions.rake
aaronskiba Aug 20, 2024
124bc52
Create and run migration to drop sessions table
aaronskiba Aug 20, 2024
5361188
Update CHANGELOG.md
aaronskiba Aug 22, 2024
072b68d
Add omniauth tests and fix identifier_scheme bug
lagoan Aug 22, 2024
4b6e583
Merge pull request #859 from portagenetwork/aaron/issues/723
aaronskiba Aug 22, 2024
1ace30b
Create `GET "/api/ca_dashboard/stats"` endpoint
aaronskiba Aug 13, 2024
c51cbb4
Cleanup of integration tests
lagoan Aug 22, 2024
fdd9adf
Testcases in progress changes
200455939-yashu Aug 22, 2024
af061db
Merging the branches
200455939-yashu Aug 22, 2024
8ce73fc
Merging the branches
200455939-yashu Aug 22, 2024
1066be2
Bypass JWT auth for `GET /api/ca_dashboard/stats`
aaronskiba Aug 22, 2024
04223f9
WIP of testcases
200455939-yashu Aug 23, 2024
ab73c4f
adding the keys secrets file
200455939-yashu Aug 26, 2024
e8ef17f
reupdating the return on empty email
200455939-yashu Aug 26, 2024
b79800b
Removing commented byebugs
200455939-yashu Aug 26, 2024
0fc1876
Test cases with flash one is clearing checking the other one
200455939-yashu Aug 27, 2024
a9d7a2f
fixes with button name and uri updates
200455939-yashu Aug 27, 2024
19661b1
syntax correction
200455939-yashu Aug 27, 2024
5a1db67
updates with URI url and testcase link with
200455939-yashu Aug 27, 2024
f76758b
Add link account with CILogon
lagoan Aug 27, 2024
1e018b1
Update CHANGELOG.md
aaronskiba Aug 28, 2024
277ae25
Add missing changes
lagoan Aug 28, 2024
cb05397
Merge branch 'yashu-sso-cilogon' into yashu-sso-link-accounts
lagoan Aug 28, 2024
9148ffe
Fix failing tests due to incorrect mocking
lagoan Aug 28, 2024
54edd81
Add extended scope for SSO
lagoan Aug 28, 2024
4ddfff5
Update devise initializer
lagoan Aug 28, 2024
9600dfd
Add another devise fix
lagoan Aug 28, 2024
0cdc68f
Pass tests for openid_connect_sso_test
lagoan Aug 28, 2024
4bcae55
Return maximum name for identifier scheme
lagoan Aug 28, 2024
eab41b0
Testcases for the Ominiauth controller openid connect
200455939-yashu Aug 29, 2024
050b7db
Code cleanup - specs controllers omniauth
200455939-yashu Aug 29, 2024
1f94fb1
Fix flaky tests / optimize checking of page title
aaronskiba Aug 29, 2024
1a09e2c
Update CHANGELOG.md
aaronskiba Aug 29, 2024
929c126
Merge pull request #871 from portagenetwork/aaron/issues/870
aaronskiba Aug 29, 2024
04f2e21
Merge pull request #852 from portagenetwork/aaron/stats-api
aaronskiba Aug 29, 2024
2242154
Robust name handling when creating user & CC
lagoan Aug 29, 2024
f539af6
Update favicons and associated html code
aaronskiba Aug 28, 2024
e355197
Update CHANGELOG.md
aaronskiba Aug 29, 2024
d392ceb
More code cleanup
lagoan Aug 29, 2024
b929fbc
Code cleanup
lagoan Aug 29, 2024
40ebe29
Code cleanup
lagoan Aug 29, 2024
6823d7f
Code cleanup
lagoan Aug 29, 2024
87bef5a
Add missing line in new plans view
lagoan Aug 30, 2024
22fde67
Issue fix for the multiple accounts
200455939-yashu Aug 30, 2024
bc836bf
Merge pull request #873 from portagenetwork/aaron/favicon
aaronskiba Aug 30, 2024
8da1e3a
Clean up configuration
lagoan Aug 30, 2024
e95c10c
Resolving conflicts after the yashu-sso-link-accounts
200455939-yashu Aug 30, 2024
377f62c
Merge remote-tracking branch 'origin/yashu-sso-2user-accounts-issue-f…
200455939-yashu Aug 30, 2024
45e54e3
Resolving the conflicts after merge
200455939-yashu Aug 30, 2024
a07d923
Code cleanup
lagoan Aug 30, 2024
8ab358a
Add mising translation piece
lagoan Aug 30, 2024
b31c2f9
Code cleanup
lagoan Aug 30, 2024
84c2ef7
adding test cases for the linked successfylly and 2 users condition
200455939-yashu Aug 30, 2024
58d4ee8
Translation related changes
200455939-yashu Aug 30, 2024
9678eda
Merge remote-tracking branch 'origin/yashu-sso-link-accounts' into ya…
200455939-yashu Aug 30, 2024
a3b5ab6
Spelling correction
200455939-yashu Aug 30, 2024
7f70edf
Removing the byebug and the updates related to translations.
200455939-yashu Sep 3, 2024
4da5fdd
Add CHANGELOG entry
lagoan Sep 3, 2024
0aece6b
Adding the changelog
200455939-yashu Sep 3, 2024
3649013
commit after Resolving the conflicts in Changelog
200455939-yashu Sep 3, 2024
7eb53a1
Review Changes
200455939-yashu Sep 4, 2024
28d4e33
Fix tests
lagoan Sep 5, 2024
87b2fa3
Merge branch 'yashu-sso-link-accounts' into yashu-controller-spec
200455939-yashu Sep 5, 2024
1fb6100
Merge branch 'integration' into yashu-sso-link-accounts
lagoan Sep 5, 2024
8f7ef2b
About and help page updates of SSO
200455939-yashu Sep 5, 2024
c21e69d
Merge branch 'yashu-sso-link-accounts' into yashu-controller-spec
200455939-yashu Sep 6, 2024
991dabd
PR update on changelog
200455939-yashu Sep 6, 2024
277f0a6
Update CHANGELOG entry
lagoan Sep 6, 2024
d423f09
Merge branch 'yashu-sso-link-accounts' from repo
lagoan Sep 6, 2024
4deb172
Remove unused instance variable / db query
aaronskiba Sep 5, 2024
907bb88
Address `GET /users/edit` Bullet Warnings
aaronskiba Sep 5, 2024
3d4b6a6
Update CHANGELOG.md
aaronskiba Sep 5, 2024
afcef7a
Merge branch 'yashu-sso-link-accounts' into yashu-sso-about-help-updates
200455939-yashu Sep 6, 2024
7072c5c
Merge pull request #883 from portagenetwork/aaron/issues/880
aaronskiba Sep 6, 2024
d4906c4
Merge pull request #882 from portagenetwork/yashu-sso-about-help-updates
200455939-yashu Sep 6, 2024
268baa2
Address comments on PR
lagoan Sep 6, 2024
90625ab
Merge branch 'yashu-sso-link-accounts' of repo
lagoan Sep 6, 2024
936aae5
Update CHANGELOG
lagoan Sep 6, 2024
c973e16
Update CHANGELOG
lagoan Sep 6, 2024
8303962
Review changes 2 O
200455939-yashu Sep 9, 2024
8d3bd79
Resolving the conflicts after merging the link accounts branch
200455939-yashu Sep 9, 2024
bf0d279
Review changes 2.1
200455939-yashu Sep 10, 2024
ea4e25a
Removing conflict HEAD
200455939-yashu Sep 10, 2024
64e6ebd
Patch to put back ORCID linking functionality
aaronskiba Sep 10, 2024
b14a337
Fix broken test
lagoan Sep 10, 2024
f2bbd3e
Remove unused code in omniauth callbacks
lagoan Sep 10, 2024
57da037
Make rubocop happy
aaronskiba Sep 10, 2024
240aed5
Update CHANGELOG.md
aaronskiba Sep 10, 2024
5cfcf25
Merge pull request #891 from portagenetwork/aaron/issues/orcid-patch
aaronskiba Sep 10, 2024
a71c056
Merge pull request #869 from portagenetwork/yashu-controller-spec
aaronskiba Sep 11, 2024
d30ed72
Remove hyphen from "signing-up" string
aaronskiba Sep 11, 2024
e840763
Add rake task for `4.1.1+portage-4.2.0` upgrade
aaronskiba Sep 11, 2024
0f19dc3
Update CHANGELOG.md
aaronskiba Sep 11, 2024
2329cbe
Merge pull request #892 from portagenetwork/aaron/add-4.2.0-rake-upgr…
aaronskiba Sep 11, 2024
3d69ec6
Merge pull request #872 from portagenetwork/yashu-sso-link-accounts
lagoan Sep 11, 2024
6c0ae13
Update ruby workflow command for executing tests
aaronskiba Sep 11, 2024
ced3a96
Update CHANGELOG.md
aaronskiba Sep 11, 2024
3f63a66
Merge pull request #896 from portagenetwork/aaron/ruby-workflow-update
aaronskiba Sep 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update email title for changed admin perms
  • Loading branch information
aaronskiba committed Aug 19, 2024
commit 4deb83dd7dd1f6b614ab1a2da6b255ed652e5874
2 changes: 1 addition & 1 deletion app/mailers/user_mailer.rb
Original file line number Diff line number Diff line change
@@ -195,7 +195,7 @@ def admin_privileges(user)

I18n.with_locale I18n.locale do
mail(to: user.email,
subject: format(_('Administrator privileges granted in %{tool_name}'),
subject: format(_('Administrator privileges updated in %{tool_name}'),
tool_name: tool_name))
end
end