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.

Sign up for GitHub

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

Jump to bottom

feat: Add Organization Admin scope to API V1 #14860

Merged
merged 65 commits into from
May 21, 2024
Merged

feat: Add Organization Admin scope to API V1 #14860

merged 65 commits into from
May 21, 2024
+1,019 −202

Commits on May 2, 2024

  1. WIP AdminScope

    @alishaz-polymath
    alishaz-polymath committed May 2, 2024
    Configuration menu
    Copy the full SHA
    c61198b View commit details
    Browse the repository at this point in the history

  2. Cleanup isAdmin —> isSystemWideAdmin

    @alishaz-polymath
    alishaz-polymath committed May 2, 2024
    Configuration menu
    Copy the full SHA
    3000518 View commit details
    Browse the repository at this point in the history

  3. adds pagination

    @alishaz-polymath
    alishaz-polymath committed May 2, 2024
    Configuration menu
    Copy the full SHA
    d8ed1df View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. code improvement and orgs admin access

    @alishaz-polymath
    alishaz-polymath committed May 6, 2024
    Configuration menu
    Copy the full SHA
    6879d59 View commit details
    Browse the repository at this point in the history

  2. remove team admin access

    @alishaz-polymath
    alishaz-polymath committed May 6, 2024
    Configuration menu
    Copy the full SHA
    d60ad66 View commit details
    Browse the repository at this point in the history

  3. fix logic

    @alishaz-polymath
    alishaz-polymath committed May 6, 2024
    Configuration menu
    Copy the full SHA
    f6cedac View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 6, 2024
    Configuration menu
    Copy the full SHA
    16bb0f4 View commit details
    Browse the repository at this point in the history

  5. fix type err and test

    @alishaz-polymath
    alishaz-polymath committed May 6, 2024
    Configuration menu
    Copy the full SHA
    e714fb7 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 7, 2024
    Configuration menu
    Copy the full SHA
    e2a8398 View commit details
    Browse the repository at this point in the history

  2. adds _post logic

    @alishaz-polymath
    alishaz-polymath committed May 7, 2024
    Configuration menu
    Copy the full SHA
    82f255d View commit details
    Browse the repository at this point in the history

  3. adds logic to [id]

    @alishaz-polymath
    alishaz-polymath committed May 7, 2024
    Configuration menu
    Copy the full SHA
    cfd133f View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. type fix

    @alishaz-polymath
    alishaz-polymath committed May 8, 2024
    Configuration menu
    Copy the full SHA
    67076d3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 8, 2024
    Configuration menu
    Copy the full SHA
    68caf97 View commit details
    Browse the repository at this point in the history

  3. more fix

    @alishaz-polymath
    alishaz-polymath committed May 8, 2024
    Configuration menu
    Copy the full SHA
    78951b3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into feat/api-v1-team-org-admin

    @joeauyeung
    joeauyeung committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d64bb0e View commit details
    Browse the repository at this point in the history

  5. fix name

    @alishaz-polymath
    alishaz-polymath committed May 8, 2024
    Configuration menu
    Copy the full SHA
    e50a1ad View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

  1. performance and quality improvements

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    dd46291 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/api-v1-team-org-admin

    @joeauyeung
    joeauyeung committed May 9, 2024
    Configuration menu
    Copy the full SHA
    515c8c7 View commit details
    Browse the repository at this point in the history

  3. fix systemwide admin logic

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    16335f2 View commit details
    Browse the repository at this point in the history

  4. remove unnecessary comment

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    b7a0383 View commit details
    Browse the repository at this point in the history

  5. remove unnecessary comment

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    fc14f8a View commit details
    Browse the repository at this point in the history

  6. remove unnecessary comment

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    377c83d View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5aa77c0 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 10, 2024
    Configuration menu
    Copy the full SHA
    4612b58 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 10, 2024
    Configuration menu
    Copy the full SHA
    7fc80ac View commit details
    Browse the repository at this point in the history

  3. address early review suggestions

    @alishaz-polymath
    alishaz-polymath committed May 10, 2024
    Configuration menu
    Copy the full SHA
    61e13bb View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 13, 2024
    Configuration menu
    Copy the full SHA
    6a7e6b8 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. Merge branch 'main' into feat/api-v1-team-org-admin

    @joeauyeung
    joeauyeung committed May 14, 2024
    Configuration menu
    Copy the full SHA
    846afe6 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. add accepted true to membership queries

    @alishaz-polymath
    alishaz-polymath committed May 15, 2024
    Configuration menu
    Copy the full SHA
    a1b5564 View commit details
    Browse the repository at this point in the history

  2. orgOwnerOrAdmin accepted true

    @alishaz-polymath
    alishaz-polymath committed May 15, 2024
    Configuration menu
    Copy the full SHA
    17253a9 View commit details
    Browse the repository at this point in the history

  3. Update apps/api/v1/lib/utils/retrieveScopedAccessibleUsers.ts 

    Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
    @alishaz-polymath @CarinaWolli
    alishaz-polymath and CarinaWolli committed May 15, 2024
    Configuration menu
    Copy the full SHA
    014b769 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Added unit tests for verifyApiKey to ensure permissions are set

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    90614ea View commit details
    Browse the repository at this point in the history

  2. Added tests to make sure permission queries are correct

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    90cade8 View commit details
    Browse the repository at this point in the history

  3. Added another test for org member

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    ae1dd99 View commit details
    Browse the repository at this point in the history

  4. Added integration tests

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    5981740 View commit details
    Browse the repository at this point in the history

  5. Rename

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    ec8bc72 View commit details
    Browse the repository at this point in the history

  6. Added integration tests for PATCH bookings

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    afdbfa9 View commit details
    Browse the repository at this point in the history

  7. Added tests for auth middleware

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    1bff935 View commit details
    Browse the repository at this point in the history

  8. Fixing test

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    90012ae View commit details
    Browse the repository at this point in the history

  9. Changed the intention of the PATCH booking tests

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    1b15ea6 View commit details
    Browse the repository at this point in the history

  10. Started tests for retrieveScopedAccessibleUsers

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    9ba2110 View commit details
    Browse the repository at this point in the history

  11. Testing having the unit/integration tests in the same job

    @keithwillcode
    keithwillcode committed May 16, 2024
    Configuration menu
    Copy the full SHA
    3810b5c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. Added another test for getting accessible members

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    230df32 View commit details
    Browse the repository at this point in the history

  2. Added test for non-org admin

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    2a7f26e View commit details
    Browse the repository at this point in the history

  3. Added tests for retrieveOrgScopedAccessibleUsers

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    08a5c22 View commit details
    Browse the repository at this point in the history

  4. starting to add tests for GET bookings

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    ba4ac6c View commit details
    Browse the repository at this point in the history

  5. GET tests now passing

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    7b0fd1e View commit details
    Browse the repository at this point in the history

  6. More tests for GET bookings

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    c9fc1ca View commit details
    Browse the repository at this point in the history

  7. Updated the seed to add bookings for org users

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    a56e476 View commit details
    Browse the repository at this point in the history

  8. More assertions for GET bookings tests

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    d3480b6 View commit details
    Browse the repository at this point in the history

  9. Removing integration tests for the moment to test CI

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    fc4fd19 View commit details
    Browse the repository at this point in the history

  10. Fixed issues with Set

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    ac91493 View commit details
    Browse the repository at this point in the history

  11. Fixed PATCH booking test

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    b1413a4 View commit details
    Browse the repository at this point in the history

  12. Removed todos

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    b2ad041 View commit details
    Browse the repository at this point in the history

  13. Bringing back integration tests but with yarn test commented

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    ad7fa90 View commit details
    Browse the repository at this point in the history

  14. Making integration tests require builds so there isn't db corruption

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    3cd0a55 View commit details
    Browse the repository at this point in the history

  15. Grouped tests by name

    @keithwillcode
    keithwillcode committed May 17, 2024
    Configuration menu
    Copy the full SHA
    8bd1cfb View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. fixes integration test

    Syed Ali Shahbaz authored and Syed Ali Shahbaz committed May 21, 2024
    Configuration menu
    Copy the full SHA
    26b9949 View commit details
    Browse the repository at this point in the history

  2. remove obsolete comment

    Syed Ali Shahbaz authored and Syed Ali Shahbaz committed May 21, 2024
    Configuration menu
    Copy the full SHA
    c7e0aa1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into feat/api-v1-team-org-admin

    @alishaz-polymath
    alishaz-polymath committed May 21, 2024
    Configuration menu
    Copy the full SHA
    1bd346f View commit details
    Browse the repository at this point in the history

  4. Fix v1 build

    @alishaz-polymath
    alishaz-polymath committed May 21, 2024
    Configuration menu
    Copy the full SHA
    4f67b36 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into feat/api-v1-team-org-admin

    @keithwillcode
    keithwillcode committed May 21, 2024
    Configuration menu
    Copy the full SHA
    6819aa2 View commit details
    Browse the repository at this point in the history

  6. Delete .github/workflows/integration.yml

    @keithwillcode
    keithwillcode committed May 21, 2024
    Configuration menu
    Copy the full SHA
    fe52fd4 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'main' into feat/api-v1-team-org-admin

    @zomars
    zomars committed May 21, 2024
    Configuration menu
    Copy the full SHA
    f5c1df4 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into feat/api-v1-team-org-admin

    @keithwillcode
    keithwillcode committed May 21, 2024
    Configuration menu
    Copy the full SHA
    f0dab0c View commit details
    Browse the repository at this point in the history