Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Pull Request for UCL team summer project B2C #204

Open
wants to merge 363 commits into
base: main
Choose a base branch
from
Open
Changes from 8 commits
Commits
Show all changes
363 commits
Select commit Hold shift + click to select a range
be262b7
Merge branch 'LH_custom_policy' into consolidated_deploy_branch
RyeLilinH Jul 21, 2022
bd2ac32
Fix Object ID
RyeLilinH Jul 21, 2022
fb405c9
Update the custom policy template.
RyeLilinH Jul 22, 2022
14e3e88
working auth and sending bearer token
warrenbuhler Jul 22, 2022
854f996
Documentation Update
Sundramucl Jul 22, 2022
dc65e25
Documentation Updated
Sundramucl Jul 22, 2022
f113de4
Fixed bug when calling b2cDeployment.ps1 via powershell.exe from Depl…
danielmusselwhite Jul 22, 2022
e12f204
Fixed merge issues
danielmusselwhite Jul 22, 2022
5c15b0c
adding back users so assignment works
warrenbuhler Jul 22, 2022
4063c21
Modified B2CDeploymnent.ps1 to allow users to input ID's all at once …
danielmusselwhite Jul 25, 2022
3311232
b2c parameters updating for ad mode
RyeLilinH Jul 25, 2022
688a4c9
Documentations
DuyNguyen19993010 Jul 25, 2022
cfc0c6b
Merge branch 'RB_LTI_Auth' of https://github.com/UCL-MSc-Learn-LTI/Le…
DuyNguyen19993010 Jul 25, 2022
3b245ac
Cleanup finished
DuyNguyen19993010 Jul 25, 2022
d610e5c
Cleanup 2.0 finished
DuyNguyen19993010 Jul 25, 2022
5fe7639
Fixed issues in B2CDeployment script and Deployment script so it now …
danielmusselwhite Jul 25, 2022
0d2ebf8
Merge pull request #7 from UCL-MSc-Learn-LTI/RB_LTI_Auth
warrenbuhler Jul 26, 2022
5aa3d81
feat: token validation
tianchen-zhang Jul 26, 2022
fd274f1
Merge branch 'all-test1' into consolidated_deploy_branch
warrenbuhler Jul 26, 2022
09abdaa
Merge pull request #8 from UCL-MSc-Learn-LTI/consolidated_deploy_branch
warrenbuhler Jul 26, 2022
ec15978
fix: update function call to the TryGet methods
tianchen-zhang Jul 26, 2022
c6ea6ce
Merge branch 'all-test1' into RB_LTI_Auth
warrenbuhler Jul 26, 2022
64d986a
Merge pull request #9 from UCL-MSc-Learn-LTI/RB_LTI_Auth
warrenbuhler Jul 26, 2022
af210ff
Fixed merge issues
danielmusselwhite Jul 26, 2022
cb84bab
Fixed merge conflicts
danielmusselwhite Jul 26, 2022
517df13
Fixed issue in B2CCleanup not removing facebook secret; and added to …
danielmusselwhite Jul 26, 2022
d6415ff
B2C auth works
warrenbuhler Jul 26, 2022
ac66bc3
Cleanup doc update
Sundramucl Jul 26, 2022
2f3598a
Add the claim "_isB2CToken" to B2C_1A_signin.xml
RyeLilinH Jul 26, 2022
87e9d6c
fix: update client id and dependencies versions
tianchen-zhang Jul 26, 2022
d1203f3
Gitignore fix
DuyNguyen19993010 Jul 26, 2022
f5834f2
Hardcoded b2c values to remove tedious inputs; improved .env.producti…
danielmusselwhite Jul 26, 2022
5ea8645
generate a SPA uri during deploy
warrenbuhler Jul 27, 2022
3400644
app auth changes -- should be tweaked
warrenbuhler Jul 27, 2022
ffb2a40
Azure template changes
DuyNguyen19993010 Jul 27, 2022
91dd1a0
Fixed bug in updating .env.development rewriting old file with missin…
danielmusselwhite Jul 27, 2022
d8f7091
prompt for b2c cleanup at the beginning
warrenbuhler Jul 27, 2022
9e6422b
Fixed merge conflict in .env.production
danielmusselwhite Jul 27, 2022
b23ebfe
Merged in the improved and restructured scripts
danielmusselwhite Jul 27, 2022
15ca7fa
renamed 'Update-ServerConfig' to 'Update-DevelopmentConfig' to improv…
danielmusselwhite Jul 27, 2022
1c0288e
Merge branch 'consolidated_deploy_branch' of https://github.com/UCL-M…
DuyNguyen19993010 Jul 27, 2022
f90ed9a
Modified code to select AD vs B2C tenant depending on value of b2cOrA…
danielmusselwhite Jul 27, 2022
0c9b22b
Add checking on prerequisites
RyeLilinH Jul 27, 2022
ec2e3bd
Deploy SPA uri to B2C
warrenbuhler Jul 27, 2022
92f3ed1
Issue 192 resolved
Sundramucl Jul 27, 2022
f5b1767
Fixed formatting issues when updating .env.development and .env.produ…
danielmusselwhite Jul 27, 2022
4c25ace
Merged in changes from all-test1: updating URI and changing authentic…
danielmusselwhite Jul 27, 2022
0ad26b1
feat: token validation and stable b2c-ad-token handlers
tianchen-zhang Jul 27, 2022
80f09be
Added defensive programming to Deploy.ps1 region and subscription sel…
danielmusselwhite Jul 27, 2022
4d055f0
fix: change adconfig into openid configuration
tianchen-zhang Jul 27, 2022
c91ea12
feat: use dependency injection to retrieve openid configurations
tianchen-zhang Jul 27, 2022
791aa0b
reverted platforms page change
warrenbuhler Jul 28, 2022
56a744d
tweaks to authentication
warrenbuhler Jul 28, 2022
bb8d825
change to the policy we add
warrenbuhler Jul 28, 2022
b400409
Merge branch 'TZ_Auth_Val' into all-test1
tianchen-zhang Jul 28, 2022
df69db1
Update function app settings
DuyNguyen19993010 Jul 28, 2022
908f8a8
Merged with function settings updates
DuyNguyen19993010 Jul 28, 2022
eea4503
Deleted azuredeploy
DuyNguyen19993010 Jul 28, 2022
75b03d3
Add title when clean up completed before redeploy
RyeLilinH Jul 28, 2022
ef1d4aa
Fixed issues in B2CDeployment.ps1 and Deploy.ps1 resulting in script …
danielmusselwhite Jul 28, 2022
298927c
Merge branch 'consolidated_deploy_branch' of https://github.com/UCL-M…
danielmusselwhite Jul 28, 2022
88a88b0
Removed debug stop
DuyNguyen19993010 Jul 28, 2022
9fffe0e
Merge branch 'consolidated_deploy_branch' of https://github.com/UCL-M…
DuyNguyen19993010 Jul 28, 2022
f189ff5
Merge pull request #11 from UCL-MSc-Learn-LTI/consolidated_deploy_branch
warrenbuhler Jul 28, 2022
6ce4225
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 28, 2022
9d92f06
Add changes for the pull requested
RyeLilinH Jul 28, 2022
7342c38
fixing merging issues
warrenbuhler Jul 28, 2022
202c9b0
Fixed merge error
danielmusselwhite Jul 28, 2022
ffff30d
Merged in all-test1 AppAuthConfig.ts changes
danielmusselwhite Jul 28, 2022
6d5696e
update on .net framework
Sundramucl Jul 28, 2022
77c2ecf
Add the lost bracket
RyeLilinH Jul 28, 2022
df809af
testing changes
warrenbuhler Jul 29, 2022
292218b
Moved secret values to end of script to make it less manual
danielmusselwhite Jul 29, 2022
983e91b
Merge branch 'all-test1' into consolidated_deploy_branch
danielmusselwhite Jul 29, 2022
3f841f5
Merge pull request #12 from UCL-MSc-Learn-LTI/consolidated_deploy_branch
danielmusselwhite Jul 29, 2022
5986860
minor changes
warrenbuhler Jul 29, 2022
fb85183
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
454a513
Fixed merge errors
danielmusselwhite Jul 29, 2022
9e70e38
added while try defensive programming around suspected race conditions
danielmusselwhite Jul 29, 2022
0d08871
FIxed bug in logging where transcript was trying to be written to by …
danielmusselwhite Jul 29, 2022
dd13917
minor change to b2c deploy
warrenbuhler Jul 29, 2022
d72b23a
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
407681d
Added error log if b2c fails
danielmusselwhite Jul 29, 2022
3cb3feb
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
f7282cf
Improved logging of errors occuring in b2cDeployment.ps1
danielmusselwhite Jul 29, 2022
3fcd06e
minor changes
warrenbuhler Jul 29, 2022
63b0a4d
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
c7e8db6
Added extra write-hosts
danielmusselwhite Jul 29, 2022
f9f9f41
AdTenant update
Sundramucl Jul 29, 2022
a5b64bd
Logging the secrets and id's for the app creations
danielmusselwhite Jul 29, 2022
7af6ee7
auth config change
warrenbuhler Jul 29, 2022
8c135f1
ad template change
warrenbuhler Jul 29, 2022
93ba78d
taking out setting client secret to empty string
warrenbuhler Jul 29, 2022
7c86905
Logging responses for all race conditions so when they are encountere…
danielmusselwhite Jul 29, 2022
05d29e9
working deployment, figuring out authentication
warrenbuhler Jul 29, 2022
d5c48f3
Fixed bugs due to duplicate code and moved writing number of tries in…
danielmusselwhite Jul 29, 2022
3bbbfea
Fixed bugs due to duplicate code and moved writing number of tries in…
danielmusselwhite Jul 29, 2022
ad0e1f3
additional changes
warrenbuhler Jul 29, 2022
f169774
Fixed bug where PMA info wasn't being converted from json
danielmusselwhite Jul 29, 2022
78aac10
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
db9c752
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Jul 29, 2022
942c779
patched merge errors
warrenbuhler Jul 29, 2022
5325358
Improved defensive programming
danielmusselwhite Jul 29, 2022
a002d58
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
danielmusselwhite Jul 29, 2022
76bf7ab
temp: remove all defensive programming
tianchen-zhang Jul 30, 2022
d67b880
Added code to force the minimum cli required to run the b2cDeploy and…
danielmusselwhite Jul 30, 2022
8e7be3e
Moved azureVersion checking to be underneath logging setup
danielmusselwhite Jul 30, 2022
0117fbb
Added check for azureVersion before specifying b2c or ad choice
danielmusselwhite Jul 30, 2022
299546f
optimize b2c deployment script
tianchen-zhang Jul 30, 2022
5c977a1
remove hardcoding, limited client deploy, fix secret
warrenbuhler Jul 30, 2022
f84dcc9
feat: expose b2c.read api for the b2c web app
tianchen-zhang Aug 1, 2022
a163606
fixing auth by adding accounts and scope
warrenbuhler Aug 1, 2022
e260348
Updated documentation to be correct to the current version of the dep…
danielmusselwhite Aug 1, 2022
3e803c2
Removed duplicate screenshot from B2C_Deployment.md
danielmusselwhite Aug 1, 2022
869be61
Modified B2CDeployment.ps1 to explicitly mention the automatic steps
danielmusselwhite Aug 1, 2022
1613861
Added unhandled exceptions for if the az cli commands return empty to…
danielmusselwhite Aug 1, 2022
34a03b7
using the correct b2c read link
warrenbuhler Aug 1, 2022
73ad9df
pushing changes for the limited client install
warrenbuhler Aug 1, 2022
34a8e3b
Merge branch 'all-test1' of https://github.com/UCL-MSc-Learn-LTI/Lear…
warrenbuhler Aug 1, 2022
720a3b3
using redirect, and other critical changes
warrenbuhler Aug 1, 2022
610d28d
Update DEPLOYMENT_GUIDE.md
danielmusselwhite Aug 2, 2022
8b51cf0
cleanup doc update
Sundramucl Aug 2, 2022
38b259e
asas
Sundramucl Aug 2, 2022
c7a30d5
updated cleanup guide in troubleshooting.md
danielmusselwhite Aug 2, 2022
a4f5090
cleanup debug output and todos
tianchen-zhang Aug 2, 2022
fb800f4
replace hardcoding resource group and app names into default ones
tianchen-zhang Aug 2, 2022
75f8941
Modified code to support custom domains for AD tenant and pass AD ten…
danielmusselwhite Aug 3, 2022
1010bc7
Fixed bugs due to tenantName now including extension; and updating do…
danielmusselwhite Aug 3, 2022
b22a356
Removed unneeded file
danielmusselwhite Aug 3, 2022
e0c684c
Merge pull request #15 from UCL-MSc-Learn-LTI/DM_Pass_AD_ID
warrenbuhler Aug 3, 2022
5cbd679
Merge pull request #14 from UCL-MSc-Learn-LTI/all-test1
warrenbuhler Aug 3, 2022
983af36
correcting names for deploy and cleanup
warrenbuhler Aug 3, 2022
682622b
changed prompt slightly
warrenbuhler Aug 3, 2022
deafd80
updated deployment guide docs to move b2c or ad choice to be under su…
danielmusselwhite Aug 4, 2022
6969ec5
Removed legacy signupsignin custom policy
danielmusselwhite Aug 4, 2022
5d8776a
Modified b2c deployment docs to be more clear on the whitelist requir…
danielmusselwhite Aug 4, 2022
edcc0a2
Moved B2C related docs into the doc and image folders used for the re…
danielmusselwhite Aug 4, 2022
6a4c7f5
update devtestenv documentation about b2c login configurations for mo…
tianchen-zhang Aug 4, 2022
e9eb1e6
fix: add documentation images
tianchen-zhang Aug 4, 2022
e754859
Merge pull request #16 from UCL-MSc-Learn-LTI/TZ_Moodle_Doc
tianchen-zhang Aug 4, 2022
ce77555
platform page update
Sundramucl Aug 4, 2022
95e2e0a
platform page update
Sundramucl Aug 4, 2022
8c55328
Update DEPLOYMENT_GUIDE.md
danielmusselwhite Aug 5, 2022
ffb03e2
Create UITest.yml
duynguyen3010 Aug 8, 2022
a1ff07a
Delete UITest.yml
duynguyen3010 Aug 8, 2022
c2b45cc
Fixed markdown link in b2c deployment script
danielmusselwhite Aug 9, 2022
2482fef
Fixed bug where setting subscription back upon returning from b2c scr…
danielmusselwhite Aug 9, 2022
ff0ab75
Create UITest.yml
duynguyen3010 Aug 11, 2022
0d4a44a
Delete UITest.yml
duynguyen3010 Aug 11, 2022
8540f0e
feat: unit testing for validation; remove code cloning
tianchen-zhang Aug 15, 2022
87747fb
temp: unit test github actions on test branch
tianchen-zhang Aug 15, 2022
af13607
fix: change RSA key in unit testing to 2048 bit to make the tests faster
tianchen-zhang Aug 15, 2022
453e0d8
Alphabetized Location List displayed in deploy.ps1
danielmusselwhite Aug 15, 2022
fa87f97
unit test github actions triggered on branch all_test-2
tianchen-zhang Aug 15, 2022
7e7b2ab
npm build cleanup
warrenbuhler Aug 15, 2022
9fb0e92
Merge branch 'all_test-2' into TZ_Unit_Test
warrenbuhler Aug 15, 2022
58a0330
Fixed issue with double single quotes added to .env.development when …
danielmusselwhite Aug 15, 2022
031921c
Merge branch 'main' into DM_Fix_AD_Deploy
danielmusselwhite Aug 15, 2022
083c736
doc: add unit test descriptions
tianchen-zhang Aug 15, 2022
5b9b689
fix: null metadata address error in ad mode
tianchen-zhang Aug 15, 2022
bc3edf3
Merge branch 'DM_Fix_AD_Deploy' of https://github.com/UCL-MSc-Learn-L…
danielmusselwhite Aug 15, 2022
5bed432
added code for adding the user_impersonation scope to the AD app
danielmusselwhite Aug 15, 2022
d4ad13f
added the ADConfigurationUrl and ValidAudience into the ADtemplate to…
danielmusselwhite Aug 15, 2022
ec2a041
add the other scopes we need to collect info
warrenbuhler Aug 15, 2022
6e7f94a
Renamed whitelist to allowlist to be better understandable from a use…
danielmusselwhite Aug 16, 2022
98671f4
Added code to display the platform page azure url to the user
danielmusselwhite Aug 16, 2022
2e035a7
Merge branch 'DM_Fix_AD_Deploy' of https://github.com/UCL-MSc-Learn-L…
danielmusselwhite Aug 16, 2022
d24a876
Merge remote-tracking branch 'origin/ADtenant-name-update' into DM_Fi…
danielmusselwhite Aug 16, 2022
48ea2d2
Modified list of users allowed to access platform page to add all ali…
danielmusselwhite Aug 16, 2022
263c977
Replaced Get-Mailbox with Get-Recipient so you can get alias' for oth…
danielmusselwhite Aug 16, 2022
a5336c6
adding a prompt for AD tenant
warrenbuhler Aug 16, 2022
3ff2f1f
Merge branch 'DM_Fix_AD_Deploy' of https://github.com/UCL-MSc-Learn-L…
warrenbuhler Aug 16, 2022
d7fd9d2
changing brackets on deploy
warrenbuhler Aug 16, 2022
eec0c4c
Merge branch 'DM_Fix_AD_Deploy' of https://github.com/UCL-MSc-Learn-L…
warrenbuhler Aug 16, 2022
e34caa0
Merge pull request #20 from UCL-MSc-Learn-LTI/DM_Fix_AD_Deploy
warrenbuhler Aug 16, 2022
5db01c1
change to not treat warnings as errors
warrenbuhler Aug 16, 2022
9a098ba
Merge branch 'all_test-2' of https://github.com/UCL-MSc-Learn-LTI/Lea…
warrenbuhler Aug 16, 2022
a6c4995
switching back to null so we don't auto-deploy
warrenbuhler Aug 16, 2022
9ffce79
swapping to standard rg name and app name
warrenbuhler Aug 16, 2022
dc9db05
Merge pull request #19 from UCL-MSc-Learn-LTI/all_test-2
warrenbuhler Aug 16, 2022
41f6d4d
slight updates to email alias code
warrenbuhler Aug 16, 2022
2e4d005
Fixed merging errors in alias email code
danielmusselwhite Aug 17, 2022
4e43517
Added accessToken optional claims + granted permission to fix issue o…
danielmusselwhite Aug 17, 2022
f4ee2d7
Minor wording + formatting changes to improve UX
danielmusselwhite Aug 17, 2022
3291a3d
Added output of the values required for the b2c Moodle configuration;…
danielmusselwhite Aug 18, 2022
7c9bc15
Minor code cleanup of deploy.ps1
danielmusselwhite Aug 18, 2022
abcdcd1
Minor code cleanup of deploy.ps1
danielmusselwhite Aug 18, 2022
3768915
Updated docs to be correct to the merged version
danielmusselwhite Aug 19, 2022
1f1e866
Converted Deploy.ps1 params back to default values used in main
danielmusselwhite Aug 19, 2022
5a61b1c
changes to solve future refreshes
warrenbuhler Aug 22, 2022
8773327
Merge branch 'main' of https://github.com/UCL-MSc-Learn-LTI/Learn-LTI
warrenbuhler Aug 22, 2022
28e4da4
Merge pull request #21 from UCL-MSc-Learn-LTI/all_test-2
warrenbuhler Aug 22, 2022
3f5be90
change ci configuration into main; fix npm issue by ignoring conflicts
tianchen-zhang Aug 22, 2022
e5a917a
Minor docs changes
danielmusselwhite Aug 22, 2022
b5e4cb7
Merge branch 'main' of https://github.com/UCL-MSc-Learn-LTI/Learn-LTI
danielmusselwhite Aug 22, 2022
cbf4674
More minor docs changes
danielmusselwhite Aug 22, 2022
76e8c81
Merge pull request #22 from UCL-MSc-Learn-LTI/TZ_Unit_Test
warrenbuhler Aug 23, 2022
5584861
Minor docs changes (flexible links + consistency fixes)
danielmusselwhite Aug 23, 2022
10e05a2
Merge branch 'main' of https://github.com/UCL-MSc-Learn-LTI/Learn-LTI
danielmusselwhite Aug 23, 2022
637ceb2
Minor docs changes
danielmusselwhite Aug 23, 2022
64e22e1
More minor docs changes
danielmusselwhite Aug 23, 2022
5198cf5
Minor doc changes
danielmusselwhite Aug 23, 2022
34b07f4
Minor docs changes
danielmusselwhite Aug 23, 2022
2346f26
Added flexible links into Troubleshooting.md
danielmusselwhite Aug 23, 2022
26476e8
critical changes from Duy's selenium branch
warrenbuhler Aug 25, 2022
e44d397
Merge pull request #25 from UCL-MSc-Learn-LTI/Selenium_v3
warrenbuhler Aug 26, 2022
7efde9d
changed refresh timespan for caching
warrenbuhler Aug 26, 2022
eb9ecf9
feat: set the refresh interval of configuration managers to be max va…
tianchen-zhang Aug 27, 2022
e98d132
Merge pull request #26 from UCL-MSc-Learn-LTI/TZ_Refresh
warrenbuhler Aug 27, 2022
5341d87
Added code for addional dependency on MacOS
danielmusselwhite Aug 29, 2022
8f6644c
Created doc file for developers
danielmusselwhite Aug 29, 2022
b14a3f9
Doc update
danielmusselwhite Aug 29, 2022
440b3f5
doc test
danielmusselwhite Aug 29, 2022
48859eb
docs test
danielmusselwhite Aug 29, 2022
52840f2
finished deploy section version 1
danielmusselwhite Aug 29, 2022
1880aca
Remove our TODOs
warrenbuhler Aug 29, 2022
183b4c5
Selenium documentation
DuyNguyen19993010 Aug 29, 2022
efe1fe9
swapping back .env changes
warrenbuhler Aug 29, 2022
48a127d
removing additional log errors
warrenbuhler Aug 29, 2022
e78594a
cleaning up authentication code
warrenbuhler Aug 29, 2022
dd98bd7
moving the limited scripts to a new folder
warrenbuhler Aug 29, 2022
5e7005f
Added create assignment steps
DuyNguyen19993010 Aug 29, 2022
e7b1542
Small change
DuyNguyen19993010 Aug 29, 2022
c7e85bd
Small changes
DuyNguyen19993010 Aug 29, 2022
c134785
Small changes
DuyNguyen19993010 Aug 29, 2022
584ac30
Signin image added
DuyNguyen19993010 Aug 29, 2022
b2d61f1
adding soft delete and purge protection back in
warrenbuhler Aug 30, 2022
79d8b22
Merge pull request #28 from UCL-MSc-Learn-LTI/UCL_Final_Testing_and_C…
warrenbuhler Aug 30, 2022
f26dd9f
doc: secret renew
tianchen-zhang Sep 1, 2022
f1df8c8
Docs updates
danielmusselwhite Sep 1, 2022
fa5483d
Merge branch 'main' of https://github.com/UCL-MSc-Learn-LTI/Learn-LTI
danielmusselwhite Sep 1, 2022
901378d
Added code to ensure user inputs a tenant in all lower case
danielmusselwhite Sep 1, 2022
3e30ddc
Updated to xplain why it must be all lower case
danielmusselwhite Sep 1, 2022
2b9585a
Creating branch for the b2cLowerCase changes
danielmusselwhite Sep 1, 2022
972229b
Merge pull request #31 from UCL-MSc-Learn-LTI/b2cLowerCase
danielmusselwhite Sep 1, 2022
063d6bd
Merge branch 'UCL_Final_Testing_and_Cleanup' into LH_SG_issue_192_196
tianchen-zhang Sep 2, 2022
e25b165
fix: change exit to throw exceptions
tianchen-zhang Sep 2, 2022
2d33914
Merge pull request #29 from UCL-MSc-Learn-LTI/LH_SG_issue_192_196
tianchen-zhang Sep 2, 2022
afdcb54
Merge pull request #27 from UCL-MSc-Learn-LTI/Selenium_Documentation
warrenbuhler Sep 5, 2022
b2e58c3
Merge pull request #30 from UCL-MSc-Learn-LTI/TZ_Secret
warrenbuhler Sep 5, 2022
43531d0
Merge pull request #32 from UCL-MSc-Learn-LTI/UCL_Final_Testing_and_C…
warrenbuhler Sep 5, 2022
2514c8d
change to deployment
warrenbuhler Sep 5, 2022
e49c9f4
Merge pull request #33 from UCL-MSc-Learn-LTI/UCL_Final_Testing_and_C…
warrenbuhler Sep 5, 2022
1ff6419
basic developer information
warrenbuhler Sep 5, 2022
a9d8ea1
Merge pull request #34 from UCL-MSc-Learn-LTI/developerDocs
warrenbuhler Sep 5, 2022
b68a3d5
Updates images to the newer versions
danielmusselwhite Sep 5, 2022
0bab6d9
Updated arch images
danielmusselwhite Sep 5, 2022
e4c07a2
Update DOCS_FOR_DEVELOPERS.md
danielmusselwhite Sep 5, 2022
6c32395
Update DOCS_FOR_DEVELOPERS.md
danielmusselwhite Sep 5, 2022
0dd1baa
Update DOCS_FOR_DEVELOPERS.md
danielmusselwhite Sep 5, 2022
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
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

// TODO - File appears to contain the important functions for receiving and validating tokens and credentials

using System;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

// TODO - file appears to get the Azure Key Vault JWK Key from the Key Vault.

using System.Threading.Tasks;
using Edna.Utils.Http;
using IdentityModel.Jwk;
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

// TODO - file handled names and roles provisioning services client; maybe needs updating for b2c??

using System;
using System.Collections.Generic;
using System.Linq;
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

// TODO - File seems to define the open id client interface (this may need to be updated?)

using System.Collections.Specialized;
using System.Web;
using Edna.Bindings.LtiAdvantage.Models;
Original file line number Diff line number Diff line change
@@ -3,8 +3,6 @@
// Licensed under the MIT license.
// --------------------------------------------------------------------------------------------

// TODO - very important fiel seems to be responsible for the actual valid of the JWK Token

using System;
using System.Collections.Generic;
using System.IdentityModel.Tokens.Jwt;
Original file line number Diff line number Diff line change
@@ -75,20 +75,14 @@ public async Task<IActionResult> GetAllAssignmentLearnContent(
[Table(AssignmentLearnContentTableName)] CloudTable assignmentLearnContentTable,
string assignmentId)
{
_logger.LogError($"Fetching all selected learn content for assignment {assignmentId}."); // TODO return to loginfo
_logger.LogInformation($"Fetching all selected learn content for assignment {assignmentId}.");

List<AssignmentLearnContentEntity> assignmentSelectedLearnContent = await GetAllAssignmentLearnContentEntities(assignmentLearnContentTable, assignmentId);

IEnumerable<AssignmentLearnContentDto> assignmentSelectedLearnContentDtos = assignmentSelectedLearnContent
.OrderBy(entity => entity.Timestamp.Ticks)
.Select(_mapper.Map<AssignmentLearnContentDto>);

// TODO remove
_logger.LogError("My dtos are " + assignmentSelectedLearnContentDtos.Count().ToString());
if (assignmentSelectedLearnContentDtos.Count() > 0)
{
_logger.LogError(assignmentSelectedLearnContentDtos.FirstOrDefault().ContentUid);
}
return new OkObjectResult(assignmentSelectedLearnContentDtos);
}

Original file line number Diff line number Diff line change
@@ -107,11 +107,10 @@ public async Task<IActionResult> CreateOrUpdateAssignment(
return new InternalServerErrorResult();
}

_logger.LogError($"Saved assignment {assignmentEntity.ToAssignmentId()}."); // TODO: switch back to loginfo
_logger.LogInformation($"Saved assignment {assignmentEntity.ToAssignmentId()}.");

string assignmentUrl = $"{req.Scheme}://{req.Host}/api/{AssignmentsRoutePath}/{assignmentEntity.ToAssignmentId()}";
AssignmentDto savedAssignmentDto = _mapper.Map<AssignmentDto>(assignmentEntity);
_logger.LogError(savedAssignmentDto.CourseName + savedAssignmentDto.Id);
return new CreatedResult(assignmentUrl, savedAssignmentDto);
}

@@ -121,9 +120,7 @@ public async Task<IActionResult> GetAssignment(
[Table(AssignmentsTableName)] CloudTable table,
[Platform] PlatformsClient platformsClient,
string assignmentId)
{
_logger.LogError("In Get Assignment");

{
AssignmentEntity assignmentEntity = await FetchAssignment(table, assignmentId);
if (assignmentEntity == null)
return new NotFoundResult();
@@ -135,7 +132,6 @@ public async Task<IActionResult> GetAssignment(
Platform platform = await platformsClient.GetPlatform(assignmentEntity.PlatformId);
assignmentDto.PlatformPersonalization = _mapper.Map<PlatformPersonalizationDto>(platform);
}
_logger.LogError(assignmentDto.CourseName + assignmentDto.Name);
return new OkObjectResult(assignmentDto);
}

12 changes: 6 additions & 6 deletions client/.env.development
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
GENERATE_SOURCEMAP='false'
REACT_APP_EDNA_AUTH_CLIENT_ID='87627e40-a86e-4f3e-b016-37f63130bb32'
REACT_APP_EDNA_B2C_TENANT='w3jnkb2corg'
REACT_APP_EDNA_B2C_CLIENT_ID='87627e40-a86e-4f3e-b016-37f63130bb32'
REACT_APP_EDNA_AUTH_CLIENT_ID='902124e7-55c2-49bd-bcb9-8245c5d15e64'
REACT_APP_EDNA_B2C_TENANT='placeholder'
REACT_APP_EDNA_B2C_CLIENT_ID='902124e7-55c2-49bd-bcb9-8245c5d15e64'
REACT_APP_EDNA_PLATFORM_SERVICE_URL='http://localhost:7075/api'
REACT_APP_EDNA_USERS_SERVICE_URL='http://localhost:7075/api'
REACT_APP_EDNA_LEARN_CONTENT='http://localhost:7074/api'
REACT_APP_EDNA_LINKS_SERVICE_URL='http://localhost:7073/api'
REACT_APP_EDNA_ASSIGNMENT_SERVICE_URL='http://localhost:7071/api'
REACT_APP_EDNA_TENANT_ID='21510bb9-6414-46d0-9a07-1faf98f25937'
REACT_APP_EDNA_DEFAULT_SCOPE='api://f47872b6-bdeb-4b69-a3c2-25528a9a9f5b/default'
REACT_APP_EDNA_TENANT_ID='902124e7-55c2-49bd-bcb9-8245c5d15e64'
REACT_APP_EDNA_DEFAULT_SCOPE='api://902124e7-55c2-49bd-bcb9-8245c5d15e64/default'
REACT_APP_EDNA_MAIN_URL='http://localhost:3000'
REACT_APP_EDNA_AAD_CLIENT_ID='f47872b6-bdeb-4b69-a3c2-25528a9a9f5b'
REACT_APP_EDNA_AAD_CLIENT_ID='902124e7-55c2-49bd-bcb9-8245c5d15e64'
22 changes: 11 additions & 11 deletions client/.env.production
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
GENERATE_SOURCEMAP='false'
REACT_APP_EDNA_AUTH_CLIENT_ID='87627e40-a86e-4f3e-b016-37f63130bb32'
REACT_APP_EDNA_AUTH_CLIENT_ID='d41fd017-4c7d-4867-ac93-3cac32d3f7a9'
REACT_APP_EDNA_B2C_TENANT='w3jnkb2corg'
REACT_APP_EDNA_B2C_CLIENT_ID='87627e40-a86e-4f3e-b016-37f63130bb32'
REACT_APP_EDNA_PLATFORM_SERVICE_URL='https://platforms-utepejgvf.azurewebsites.net/api'
REACT_APP_EDNA_USERS_SERVICE_URL='https://users-utepejgvf.azurewebsites.net/api'
REACT_APP_EDNA_LEARN_CONTENT='https://learncontent-utepejgvf.azurewebsites.net/api'
REACT_APP_EDNA_LINKS_SERVICE_URL='https://links-utepejgvf.azurewebsites.net/api'
REACT_APP_EDNA_ASSIGNMENT_SERVICE_URL='https://assignments-utepejgvf.azurewebsites.net/api'
REACT_APP_EDNA_TENANT_ID='21510bb9-6414-46d0-9a07-1faf98f25937'
REACT_APP_EDNA_DEFAULT_SCOPE='api://c86e988f-062a-43b0-ae18-e759030a5c83/user_impersonation'
REACT_APP_EDNA_MAIN_URL='https://learnclientutepejgvf.z33.web.core.windows.net/'
REACT_APP_EDNA_AAD_CLIENT_ID='c86e988f-062a-43b0-ae18-e759030a5c83'
REACT_APP_EDNA_B2C_CLIENT_ID='d41fd017-4c7d-4867-ac93-3cac32d3f7a9'
REACT_APP_EDNA_PLATFORM_SERVICE_URL='https://edna-lti-ab-platfomrs.azurewebsites.net/api'
REACT_APP_EDNA_USERS_SERVICE_URL='https://edna-lti-ab-users.azurewebsites.net/api'
REACT_APP_EDNA_LEARN_CONTENT='https://edna-lti-ab-learncontent.azurewebsites.net/api'
REACT_APP_EDNA_LINKS_SERVICE_URL='https://edna-lti-ab-links.azurewebsites.net/api'
REACT_APP_EDNA_ASSIGNMENT_SERVICE_URL='https://edna-lti-ab-assignments.azurewebsites.net/api'
REACT_APP_EDNA_TENANT_ID='d41fd017-4c7d-4867-ac93-3cac32d3f7a9'
REACT_APP_EDNA_DEFAULT_SCOPE='api://d41fd017-4c7d-4867-ac93-3cac32d3f7a9/user_impersonation'
REACT_APP_EDNA_MAIN_URL='https://ednaltiabclient.z23.web.core.windows.net/'
REACT_APP_EDNA_AAD_CLIENT_ID='d41fd017-4c7d-4867-ac93-3cac32d3f7a9'
3 changes: 0 additions & 3 deletions client/src/Core/Auth/AppAuthConfig.ts
Original file line number Diff line number Diff line change
@@ -63,13 +63,10 @@ const config: Configuration = {
console.error(message);
return;
case LogLevel.Info:
console.info(message);
return;
case LogLevel.Verbose:
console.debug(message);
return;
case LogLevel.Warning:
console.warn(message);
return;
}
},
3 changes: 0 additions & 3 deletions client/src/Core/Auth/AxiosBasicAuthInitializer.tsx
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ export const AxiosBasicAuthInitializer = ({ children }: PropsWithChildren<{}>):
// Called everytime time the LTI app is accessed to authenticate the user before allowing access.
request.account = accounts[0];
request.loginHint = request.account.username;
// request.loginHint = request.account.
useEffect(() => {
if (!isTokenLoaded && inProgress === InteractionStatus.None) {
instance
@@ -29,8 +28,6 @@ export const AxiosBasicAuthInitializer = ({ children }: PropsWithChildren<{}>):
setIsTokenLoaded(true);
})
.catch(error => {
console.log('silent failed');
console.log(error);
// acquireTokenSilent can fail for a number of reasons, fallback to interaction
if (error instanceof InteractionRequiredAuthError || error instanceof BrowserAuthError) {
instance.acquireTokenRedirect(request);
1 change: 0 additions & 1 deletion deployment/B2CDeployment.ps1
Original file line number Diff line number Diff line change
@@ -681,7 +681,6 @@ try{
#endregion

#region "B2C STEP 11.D: Create the Facebook keyset"
#TODO - eventually only run this B2C STEP if we are using Facebook (and then use different contract templates for linking facebook vs without)
Write-Title "B2C STEP 11.D: Creating the Facebook Key"

if($keysets -contains "B2C_1A_FacebookSecret"){
4 changes: 0 additions & 4 deletions deployment/Deploy.ps1
Original file line number Diff line number Diff line change
@@ -282,7 +282,6 @@ process {
}
Write-Log -Message "Returned from the B2C setup script, continuing with LTI deployment"

# TODO - indexing from -1 etc. because it seems to return meaningless values before the final 3 which we actually want; need to work out why and perhaps fix if it is deemed an issue
$AD_Tenant_Name_full = $results[-7] # tenant name of the AD server
$b2c_tenant_name_full = $results[-6] #b2c tenant name
$REACT_APP_EDNA_B2C_CLIENT_ID = $results[-5] #webclient ID
@@ -306,9 +305,6 @@ process {
$policy_name = "b2c_1a_signin"

#Updating function apps's settings

#$B2C_APP_CLIENT_ID_IDENTIFIER = "0cd1d1d6-a7aa-41e2-b569-1ca211147973" # TODO remove hardcode
#$AD_APP_CLIENT_ID_IDENTIFIER = "cb508fc8-6a5f-49b1-b688-dac065ba59e4" # TODO remove hardcode
$OPENID_B2C_CONFIG_URL_IDENTIFIER = "https://${REACT_APP_EDNA_B2C_TENANT}.b2clogin.com/${b2c_tenant_name_full}/${policy_name}/v2.0/.well-known/openid-configuration"
$OPENID_AD_CONFIG_URL_IDENTIFIER = "https://login.microsoft.com/${AD_Tenant_Name_full}/v2.0/.well-known/openid-configuration"

3 changes: 2 additions & 1 deletion deployment/azuredeployADtemplate.json
Original file line number Diff line number Diff line change
@@ -400,7 +400,8 @@
"enabledForDeployment": "[variables('enabledForDeployment')]",
"enabledForDiskEncryption": "[variables('enabledForDiskEncryption')]",
"enabledForTemplateDeployment": "[variables('enabledForTemplateDeployment')]",
"enableSoftDelete": false,
"enableSoftDelete": true,
"enablePurgeProtection": true,
"tenantId": "[variables('tenantId')]",
"accessPolicies": [
{
3 changes: 2 additions & 1 deletion deployment/azuredeployB2CTemplate.json
Original file line number Diff line number Diff line change
@@ -429,7 +429,8 @@
"enabledForDeployment": "[variables('enabledForDeployment')]",
"enabledForDiskEncryption": "[variables('enabledForDiskEncryption')]",
"enabledForTemplateDeployment": "[variables('enabledForTemplateDeployment')]",
"enableSoftDelete": false,
"enableSoftDelete": true,
"enablePurgeProtection": true,
"tenantId": "[variables('tenantId')]",
"accessPolicies": [
{