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

Add support for Microsoft Active Directory in LDAP authentication #1

Open
wants to merge 838 commits into
base: master
Choose a base branch
from

Conversation

stuartcampbell
Copy link
Member

(This is just a PR into the NSLS-II fork that mirrors DiamondLightSource#346)

John-Holt-Tessella and others added 30 commits April 20, 2023 13:00
* add diff archived comment if industry proposal

* Update client/src/js/modules/visits/views/visit_list.vue

Co-authored-by: Mark W <[email protected]>

---------

Co-authored-by: Neeli Katti <[email protected]>
Co-authored-by: NKatti2011 <[email protected]>
Co-authored-by: Mark W <[email protected]>
…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 <[email protected]>
Co-authored-by: John Holt <[email protected]>
…rce#507)

* LIMS-267: Dont allow lab contacts to be plate owners

* Use strict equality

Co-authored-by: Guilherme Francisco <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
…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 <[email protected]>
Co-authored-by: John Holt <[email protected]>
…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 <[email protected]>
Co-authored-by: John Holt <[email protected]>
…-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
…/LIMS-596/speed-up-getUsers

LIMS-596: Speed up most common call to getUsers by using UNION instead of OR
ndg63276 and others added 30 commits September 25, 2023 16:17
* Add extra logging for OIDC endpoint discovery failure

* Log HTTP code, error code

* synctax error

---------

Co-authored-by: John Holt <[email protected]>
…htSource#675)

* LIMS-933: Attach auth header to shipping service requests

* LIMS-933: Build shipping headers when building request
…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 <[email protected]>
…-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 <[email protected]>
Co-authored-by: John Holt <[email protected]>

* 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 <[email protected]>
Co-authored-by: John Holt <[email protected]>

* LIMS-499: Make reciprocal space viewer more obvious (DiamondLightSource#653)

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

* LIMS-759: Show multipin samples and their sublocations (DiamondLightSource#648)

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

* 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 <[email protected]>

* LIMS-862: Reset registered container after creating container (DiamondLightSource#628)

Co-authored-by: Mark Williams <[email protected]>

* 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 <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>

* 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 <[email protected]>
Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: John Holt <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
Co-authored-by: NKatti2011 <[email protected]>
…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 <[email protected]>
Co-authored-by: John Holt <[email protected]>
)

* LIMS-95: Show max score for each drop in a plate

* Update UI to use radio buttons

* Update label

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: John Holt <[email protected]>
…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 <[email protected]>

---------

Co-authored-by: Mark Williams <[email protected]>
Co-authored-by: Guilherme Francisco <[email protected]>
* 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 <[email protected]>
…/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
* Move globals in OIDC and tidy, remove static ref in Download, conform to php7 in processing

* implement strpos properly

---------

Co-authored-by: John Holt <[email protected]>
…rove/make_php_lint_active

Make psalm passing part of the build

Only changes build proces
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants