Add support for Microsoft Active Directory in LDAP authentication#1
Open
stuartcampbell wants to merge 838 commits intoNSLS-II:masterfrom
Open
Add support for Microsoft Active Directory in LDAP authentication#1stuartcampbell wants to merge 838 commits intoNSLS-II:masterfrom
stuartcampbell wants to merge 838 commits intoNSLS-II:masterfrom
Conversation
* add diff archived comment if industry proposal * Update client/src/js/modules/visits/views/visit_list.vue Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> --------- Co-authored-by: Neeli Katti <neeli.katti@diamond.ac.uk> Co-authored-by: NKatti2011 <108797920+NKatti2011@users.noreply.github.com> Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
…Selenium (DiamondLightSource#504) * LIMS-89: Add data-testids for data collections view * LIMS-89: Add data-testids for shipment and container views * LIMS-89: Add data-testids for beamline status view * LIMS-89: Add data-testids for dewar dispatch request view * LIMS-89: Add data-testids for protein view/add/clone --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…DiamondLightSource#505) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…#506) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <7570055+John-Holt-Tessella@users.noreply.github.com>
…rce#507) * LIMS-267: Dont allow lab contacts to be plate owners * Use strict equality Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
…ndLightSource#521) * LIMS-608: Check a user is not null before checking if an admin * Make all valid authentications have a user A valid authentication is if a user auth or machine via IP * Must have a user when we are on the page --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…creening (DiamondLightSource#508) * LIMS-142: Screening filter should show non-zero overlap or DCG.type=Screening * Full collections should not include Screenings --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…ming (DiamondLightSource#510) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…d scan snapshots (DiamondLightSource#517) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…release Bad merge left and else rows in (DiamondLightSource#530)
…-release/Fix/LIMS-645/Make_parse_request_paramters_allow_string_and_other_types Update string match to be more like original
…-release/Fix/LIMS-645/Make_parse_request_paramters_allow_string_and_other_types Pre release/fix/lims 645/make parse request paramters allow string and other types
…-release/Fix/LIMS-645/Make_parse_request_paramters_allow_string_and_other_types return false on non string
…/fix-broken-downloads
…/LIMS-596/speed-up-getUsers LIMS-596: Speed up most common call to getUsers by using UNION instead of OR
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* Add extra logging for OIDC endpoint discovery failure * Log HTTP code, error code * synctax error --------- Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…htSource#675) * LIMS-933: Attach auth header to shipping service requests * LIMS-933: Build shipping headers when building request
Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…e#676) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…ource#677) * I15_1-1318: Cannot create default shipment for visit 0 * I15_1-1318: Fix container names * I15_1-1318: Remove debug statement --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…-release/2023-R4.2 * LIMS-222: Apply experimental parameters to all samples (DiamondLightSource#595) * LIMS-222: Apply experimental parameters to all samples * LIMS-222: Fix bug from renaming method * Use toArray instead of filter and make names better --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk> * LIMS-210: Prevent double clicking to create multiple samples (DiamondLightSource#660) * LIMS-210: Prevent double clicking to create multiple samples * Use loading state to avoid double click --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk> * LIMS-499: Make reciprocal space viewer more obvious (DiamondLightSource#653) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-395: Display warning if no spots or incomplete PIA (DiamondLightSource#623) * LIMS-395: Display a warning on grid scans if no spots found or incomplete PIA results * LIMS-395: Use new XRC tables --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-759: Show multipin samples and their sublocations (DiamondLightSource#648) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-154: Enable display of all grid scan snapshots in full (DiamondLightSource#631) * LIMS-154: Enable display of all grid scan snapshots in full * Avoid overwriting globally scoped variable n Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * LIMS-952: Display xray centring results if running 3d xray centring (DiamondLightSource#647) * LIMS-952: Display xray centring results if running 3d xray centring * LIMS-952: Mark no results as xray centring failure * LIMS-952: Display message if no diffraction found --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-862: Reset registered container after creating container (DiamondLightSource#628) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> * LIMS-77: Link Lab Contacts to fedids (DiamondLightSource#622) * LIMS-77: Link Lab Contacts to fedids * Use Promise.all rather than $.when Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> * Fix user data invocation tests * Revert "LIMS-759: Show multipin samples and their sublocations (DiamondLightSource#648)" This reverts commit 5ec00f1. --------- Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com> Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> Co-authored-by: NKatti2011 <108797920+NKatti2011@users.noreply.github.com>
Merge master into prerelease
…iamondLightSource#597) * LIMS-59: Never write null to DewarTransportHistory.storageLocation * LIMS-59: Write a location to DTH when marking a dewar as unprocessing * LIMS-59: Check for nulls before doing inserts * LIMS-59: Ensure tests pass * Update test * tidy --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…LightSource#678) * LIMS-140: Fix pia_estimated_d_min display on VMXi grid scans * LIMS-140: Clear up inverting of data * Apply suggestions from code review Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk> --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk> Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>
…or MX (DiamondLightSource#685) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* LIMS-1074: Allow access to compressed processing logs etc * LIMS-1074: Remove debug message * LIMS-1074: Fix map/model viewer * LIMS-1074: Fix downstream processing * LIMS-1074: Remove debug message * LIMS-1074: Remove debug message * LIMS-1074: Use readgzfile instead of gzopen/gzread/gzclose * LIMS-1074: Download file zipped if already zipped * LIMS-1074: Fix download filenames * LIMS-1074: Use readgzfile to replace readfile, and gzdecode the contents of files to manipulate * LIMS-1074: Use readgzfile to replace readfile, and gzdecode the contents of files to manipulate * LIMS-1074: Tidy up setting content disposition * LIMS-1074: Deploy suggestions from code review --------- Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
…/lims-1068/oidc-discovery-endpoint-fix LIMS-1068: Move discovery away from constructor, get cookie expiry dynamically
…-release/2023-R4.3 Pre release/2023 r4.3
Merge pull request DiamondLightSource#687 from DiamondLightSource/pre-release/2023-R4.3
…LightSource#671) Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
* Move globals in OIDC and tidy, remove static ref in Download, conform to php7 in processing * implement strpos properly --------- Co-authored-by: John Holt <John.Holt@diamond.ac.uk>
…rove/make_php_lint_active Make psalm passing part of the build Only changes build proces
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
(This is just a PR into the NSLS-II fork that mirrors DiamondLightSource#346)