* Migrate vault lock screen to component library
* Remove unnecessary divs
* Remove card from trial
* Migrate to standalone component
* refactor to use AnonLayout
* revert login component
* migrate web component to bitSubmit
* remove class
* use inject
* update web pageTitle translation
* validate on submit, not on blur
---------
Co-authored-by: rr-bw <102181210+rr-bw@users.noreply.github.com>
* Added new report card and FeatureFlag for MemberAccessReport
* Add new "isEnterpriseOrgGuard"
* Add member access icon
* Show upgrade organization dialog for enterprise on member access report click
* verify member access featureflag on enterprise org guard
* add comment with TODO information for follow up task
* Initial member access report component
* Improved readability, removed path to wrong component and refactored buildReports to use the productType
* finished MemberAccessReport layout and added temporary service to provide mock data
* Moved member-access-report files to bitwarden_license/
Removed unnecessary files
* Added new tools path on bitwarden_license to the CODEOWNERS file
* added member access description to the messages.json
* layout changes to member access report
* Created new reports-routing under bitwarden_license
Moved member-access-report files to corresponding subfolder
* Added search logic
* Removed routing from member-access-report BL component on OSS.
Added member-access-report navigation to organizations-routing on BL
* removed unnecessary ng-container
* Added OrganizationPermissionsGuard and canAccessReports validation to member-access-report navigation
* replaced deprecated search code with searchControl
* Address PR feedback
* removed unnecessary canAccessReports method
* Add shared two-factor-options component
* Add new refactored two-factor-auth component and totp auth componnet behind feature flag
* Fix default value for twofactorcomponentrefactor featureflag
* create onload() for qrious as well as error messaging if QR code cannot be displayed
* button and message updates and formpromise removal
* load QR script async
* rename and reorder methods
* PM-7321 - Temp add input password
* PM-7321 - update input password based on latest PR changes to test.
* PM-7321 - Progress on testing input password component + RegistrationFinishComponent checks
* PM-7321 - more progress on registration finish.
* PM-7321 - Wire up RegistrationFinishRequest model + AccountApiService abstraction + implementation changes for new method.
* PM-7321 - WIP Registration Finish - wiring up request building and API call on submit.
* PM-7321 - WIP registratin finish
* PM-7321 - WIP on creating registration-finish service + web override to add org invite handling
* PM-7321 - (1) Move web-registration-finish svc to web (2) Wire up exports (3) wire up RegistrationFinishComponent to call registration finish service
* PM-7321 - Get CLI building
* PM-7321 - Move all finish registration service and content to registration-finish feature folder.
* PM-7321 - Fix RegistrationFinishService config
* PM-7321 - RegistrationFinishComponent- handlePasswordFormSubmit - error handling WIP
* PM-7321 - InputPasswordComp - Update to accept masterPasswordPolicyOptions as input instead of retrieving it as parent components in different scenarios will need to retrieve the policies differently (e.g., orgInvite token in registration vs direct call via org id post SSO on set password)
* PM-7321 - Registration Finish - Add web specific logic for retrieving master password policies and passing them into the input password component.
* PM-7321 - Registration Start - Send email via query param to registration finish page so it can create masterKey
* PM-7321 - InputPassword comp - (1) Add loading input (2) Add email validation to submit logic.
* PM-7321 - Registration Finish - Add submitting state and pass into input password so that the rest of the registration process keeps the child form disabled.
* PM-7321 - Registration Finish - use validation service for error handling.
* PM-7321 - All register routes must be dynamic and change if the feature flag changes.
* PM-7321 - Test registration finish services.
* PM-7321 - RegisterRouteService - Add comment documenting why the service exists.
* PM-7321 - Add missing input password translations to browser & desktop
* PM-7321 - WebRegistrationFinishSvc - apply PR feedback
* feat: catch and log exceptions during migration
* Revert "feat: catch and log exceptions during migration"
This reverts commit d68733b7e5.
* feat: use log service to log migration errors
* remove infinite scroll, use virtual scroll instead
* use TableDataSource for search
* allow sorting by name
* replacing PlatformUtilsService.showToast with ToastService
* misc FIXMEs
* Guard Organization Info route - Owners only
* Guard TwoFactor route - Owners only and Organization must be able to use 2FA
* Update guards to use function syntax
---------
Co-authored-by: Addison Beck <hello@addisonbeck.com>
* [deps] Tools: Update electron to v31
* Bump version in electron-builder
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* Add empty state for invoices
* Make cards on create client dialog tabbable
* Add space in $ / month per member
* Mute text, remove (Monthly) and right align menu on clients table
* Made used seats account for all users and fixed column sort for used/remaining
* Resize pricing cards
* Rename assignedSeats to occupiedSeats
* fix: handle undefined value in migration 66
* fix: the if-statement was typo
* feat: duplicate error behavior in fake storage service
* feat: fix all migrations that were setting undefined values
* feat: add test for disabled fingrint in migration 66
* fix: default single user state saving undefined value to state
* revert: awaiting floating promise
gonna fix this in a separate PR
* Revert "feat: fix all migrations that were setting undefined values"
This reverts commit 034713256c.
* feat: automatically convert save to remove
* Revert "fix: default single user state saving undefined value to state"
This reverts commit 6c36da6ba5.
* initial add of card details section
* add card number
* update card brand when the card number changes
* add year and month fields
* add security code field
* hide number and security code by default
* add `id` for all form fields
* update select options to match existing options
* make year input numerical
* only display card details for card ciphers
* use style to set input height
* handle numerical values for year
* update heading when a brand is available
* remove unused ref
* use cardview types for the form
* fix numerical input type
* disable card details when in partial-edit mode
* remove hardcoded height
* update types for formBuilder
* Document the `org-permissions` guard in code
* Restructure the `org-permissions` guard to be Angular 17+ compliant
* Update the `org-permissions` guard to use `ToastService`
* Simplify callback function sigantures
* Remove unused test object
* Fix updated route from merge
* Document that `is-paid-org` guard in code
* Remove unused `MessagingService` dependency
* Make assertions about the way the is-paid-org guard should behave
* Restructure the `is-paid-org` guard to be Angular 17+ compliant
* Random commit to get the build job moving
* Undo previous commit
* Document the `org-redirect` guard in code
* Make assertions about the way the `org-redirect` guard should behave
* Restructure the `org-redirect` guard to be Angular 17+ compliant
* Convert data parameter to function parameter
* Convert a data parameter to a function parameter that was missed
* Pass redirect function to default organization route
* Introduce `verificationType`
* Update template to use `verificationType`
* Implement a path for `verificationType = 'custom'`
* Delete `clientSideOnlyVerification`
* Update `EnrollMasterPasswordResetComponent` to include a server-side hash check
* Better describe the custom scenerio through comments
* Add an example of the custom verficiation scenerio
* Move execution of verification function into try/catch
* Migrate existing uses of `clientSideOnlyVerification`
* Use generic type option instead of casting
* Change "given" to "determined" in a comment
* Replace PlatformUtilsService with ToastService
* Remove unneeded templates
* Implement table filtering function
* Move member-only methods from base class to subclass
* Move utility functions inside new MemberTableDataSource
* Rename PeopleComponent to MembersComponent
* [PM-9342] Inline menu does not show on username field for a form that has a password field with an invalid autocomplete value
* [PM-9342] Incorporating logic to handle multiple autocomplete values within a captured set of page details
* [PM-9342] Incorporating logic to handle multiple autocomplete values within a captured set of page details
* [PM-9342] Changing logic for how we identify new password fields to reflect a more assertive qualification
* [PM-9342] Adding feedback from code review
* Move vault-timeout-input to @bitwarden/auth/angular
Move vault-timeout-input.component.ts to @bitwarden/auth/angular/vault-timeout-input
Expose via barrel file
Fix imports on clients
* Add dependencies to package.json
Not necessary right now, but good practice for once we move to building each package independently
* Make VaultTimeoutInputComponent a standalone component
* Update selector to present team ownership
* Use new standalone on web
Move vault-timeout-input.component.html to @bitwarden/auth/angular/vault-timeout-input/
Delete old vault-timeout-input.component on web
Register new component on loose-components-module
Update used selector in preferences.component
* Remove unneeded export of VaultTimeoutInputComponent
---------
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* [PM-8486] Introduce VaultPopupAutofill service
* [PM-8486] Remove moved autofill functionality from VaultPopupItem service
* [PM-8486] Add autofill functionality to button and menu options
* [PM-8486] Hide Autofill and Save option for Cards/Identities
* [PM-8486] Reduce nesting in closePopup
* [PM-8486] Breakup doAutofillAndSave method
* [PM-8486] Start subscription in autofill service constructor
* [PM-8486] Cleanup missed calls to removed methods
* add v2 attachments page
* add add attachment fields
* add file upload UI
* move cipher-attachments to a new component
* load cipher and add initial submit
* add list of existing attachments
* fix incorrect toast usage
* integrate with bit submit states
* add new max file translation without the period
* refactor attachments v2 component
* remove default list styles
* add tests for attachments components
* use `CipherId` type
* pass submit button reference to the underlying form
* remove bitFormButton
* [PM-7897] Attachments Part 2 (#9755)
* make `isNew` param optional
* emit success output after upload
* navigate the user to the edit screen after an upload
* allow for the deletion of an attachment
* add download attachment component to attachments view
* implement base attachment link
* add premium redirect
* show specific error message for free organizations
* make open-attachments a button so it is keyboard accessible
* fix lint error
* use bitItem
* using bitAction rather than standalone loading/deleting value
* remove extra title, unneeded because of the appA11yTitle usage
* use `replaceUrl` to avoid the back button going to the attachments page
* use bit-item for consistency
* show error when a user tries to open an attachment that is a part of a free org
* add `CipherId` type for failed builds
* Initial checking of collect many
* should update to better handle parameters
* cleaning up event collection params
* Adding documentation
* Removing commented out code saved for testing
* Adding pr changes and using the account service for event collection user id
* browser main.background event collection service needed the account service
* Update the build job to use `bit` artifacts for stores
* Update the CLI's license in `package.json` for the NPM store
* Add license configuration to `snapcraft.yaml`
* migrating two factor duo component
* migrating two factor duo component
* two factor duo component migration
* two factor duo component migration
* removed null check from two-factor-setup
* cleanup duo changes
* remove ikey and skey references
* clean up
---------
Co-authored-by: Jake Fink <jfink@bitwarden.com>
* Add export-web.component
Introduce new export-web component
Delete old component
export.module - With export-web being standalone there's no need for a importModule
Change routing to load new component
* Prepare export.component to receive a orgId via the hosting-component
* Remove unused onSaved as it's replaced by onSuccessfulExport
* Refactor org-vault-export.component
Introduce new org-vault-export.component.html as the old component relied on the markup from password manager
Refactor org-vault-export.component
Retrieve organizationId from Route and pass it into the shared export.component
Ensure when exporting from AC to include all data from the selected org
org-vault-export.module - With the new component being standalone there's no need for a importModule
Change routing to load new org-vault-export component
* PM-8641 - Add success toast to base-export component
This ensures a success toast is shown on all clients consistently
Add missing entries into clients messages.json
---------
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* PM-2059 Update Two Factor Webauth Dialog
* PM-2059 Added event emitter for enabled status
* PM-2059 Addressed review comments
* convert to arrow function
* PM-2059 Latest comments addressed
* PM-2059 Updated disable method by adding a condition to capture simple dialog in base component
---------
Co-authored-by: rr-bw <102181210+rr-bw@users.noreply.github.com>
* [deps] Platform: Update argon2 to v0.40.1
* Update inclusion in context isolation
* Ensure node-gyp available for mac builds
Mac runners seem to have progressed above python 3.12, which removed `distutils`. We need to ensure it's installed for node-gyp compilations.
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
* [deps] Tools: Update electron to v30.1.2
* Bump version in electron-builder
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* utilizing locale service in duo
* refactor launchDuoUri method
* Add cookie information back in ext. and desktop to support backwards compatibility
* Update duo-redirect.ts
fixing comment
* finish key rotation distribution and fix legacy user
* add ticket to TODO
* PR feedback: docs and renaming
* fix webauthn tests
* add test for send service
* add await to test
* Removed - button on passkeys and uris when user has view only access, disabled cog button and made input fields on uris readonly when user has view only access
(cherry picked from commit 077edd77c1)
* switched to use viewonly to hide remove button
(cherry picked from commit dbd854494f)
* Migrate all tools owned toasts to use CL ToastService instead of PlatformUtilsService
* Fix test that was missing a mock
* Fix double checking file and file-content selection
---------
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* Added new report card and FeatureFlag for MemberAccessReport
* Add new "isEnterpriseOrgGuard"
* Add member access icon
* Show upgrade organization dialog for enterprise on member access report click
* verify member access featureflag on enterprise org guard
* add comment with TODO information for follow up task
* Improved readability, removed path to wrong component and refactored buildReports to use the productType
* added TODO to remove the feature flag on cleanup
* changing ProductType to ProductTierType on isEnterpriseOrgGuard
* turn on enableCipherKeyEncryption flag
* turn enableCipherKeyEncryption flag on in desktop config
---------
Co-authored-by: bnagawiecki <107435978+bnagawiecki@users.noreply.github.com>
* [deps] Tools: Update electron to v30.1.1
* Bump version in electron-builder
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
* setup for InputPasswordComponent and basic story
* add all input fields
* add translated error messages
* update validation
* add password-callout
* update hint text
* use PolicyService in component
* setup SetPasswordComponent
* remove div
* add default button text
* add mocks for InputPassword storybook
* simplify ngOnInit
* change param and use PolicyApiService
* check for breaches and validate against policy
* user toastService
* use useValue for mocks
* hash before emitting
* validation cleanup and use PreloadedEnglishI18nModule
* add ngOnDestroy
* create validateFormInputsDoNotMatch fn
* update validateFormInputsComparison and add deprecation jsdocs
* rename validator fn
* fix bugs in validation fn
* cleanup and re-introduce services/logic
* toggle password inputs together
* update hint help text
* remove SetPassword test
* remove master key creation / hashing
* add translations to browser/desktop
* mock basic password-strength functionality
* add check for controls
* hash before emitting
* type the EventEmitter
* use DEFAULT_KDF_CONFIG
* emit master key
* clarify comment
* update password mininum help text to match org policy requirement
* [PM-8027] Inlin menu appears within input fields that do not relate to user login
* [PM-8027] Inlin menu appears within input fields that do not relate to user login
* [PM-8027] Inlin menu appears within input fields that do not relate to user login
* [PM-8027] Working through logic heuristics that will help us determine login form fields
* [PM-8027] Fixing jest test
* [PM-8027] Reworking inline menu to qualify and setup the listeners for each form field after page deatils have been collected
* [PM-8027] Cleaning up implementation details
* [PM-8027] Cleaning up implementation details
* [PM-8027] Cleaning up implementation details
* [PM-8027] Updating update of page details after mutation to act on an idle moment in the browser
* [PM-8027] Updating how we guard against excessive getPageDetails calls
* [PM-8027] Refining how we identify a username login form field
* [PM-8027] Refining how we identify a password login form field
* [PM-8027] Refining how we identify a username login form field
* [PM-8027] Fixing jest tests for the overlay
* [PM-8027] Fixing jest tests for the collectPageDetails method
* [PM-8027] Removing unnecessary code
* [PM-8027] Removing unnecessary code
* [PM-8027] Adding jest test to validate new behavior
* [PM-8027] Working through jest tests for the InlineMenuFieldQualificationService
* [PM-8027] Working through jest tests for the InlineMenuFieldQualificationService
* [PM-8027] Working through jest tests for the InlineMenuFieldQualificationService
* [PM-8027] Working through jest tests for the InlineMenuFieldQualificationService
* [PM-8027] Working through jest tests for the InlineMenuFieldQualificationService
* [PM-8027] Finalization of Jest test for the implementation
* [PM-8027] Fixing a typo
* [PM-8027] Incorporating a feature flag to allow us to fallback to the basic inline menu fielld qualification method if needed
* [PM-8027] Incorporating a feature flag to allow us to fallback to the basic inline menu fielld qualification method if needed
* [PM-8027] Fixing issue with username fields not qualifyng as a valid login field if a viewable password field is not present
* [PM-8027] Fixing an issue where a field that has no form and no visible password fields should be qualified if a single password field exists in the page
* [PM-8027] Fixing an issue where a field that has no form and no visible password fields should be qualified if a single password field exists in the page
* [PM-8869] Autofill features broken on Safari
* [PM-8869] Autofill features broken on Safari
* [PM-5189] Fixing an issue found within Safari
* [PM-8027] Reverting flag from a fallback flag to an enhancement feature flag
* [PM-8027] Fixing jest tests
* PM-8482 Change KDF Confirmation no longer has browser validation
* PM-8482 - ChangeKdfConfirmationComponent - use form invalid instead of manual form valid check
---------
Co-authored-by: Jared Snider <jsnider@bitwarden.com>
* PM-7324 - Register new registration start comp at signup route on web
* PM-7324 - Add registerSendVerificationEmail logic in API service layer.
* PM-7324 - Update registration start comp to actually send information to API and trigger email.
* PM-7324 - progress on opt in for marketing emails redesign.
* PM-7324 - Add feature flag and feature flag guard to sign up route.
* PM-7324 - RegistrationEnvSelector - emit initial value
* PM-7324 - Registration Start comp - wire up setReceiveMarketingEmailsByRegion logic.
* PM-7324 - Registration start html - use proper link for email pref management.
* PM-7324 - Translate text
* PM-7324 - Design pass
* PM-7324 - design pass v2
* PM-7324 - Update Tailwind config to add availability of anon layout to desktop and browser extension
* PM-7324 - Desktop - AppRoutingModule - Add new signup route protected by the email verification feature flag.
* PM-7324 - BrowserExtension - AppRoutingModule - Add signup route protected by feature flag
* PM-7324 - Feature flag all register page navigations to redirect users to the new signup page.
* PM-7324 - Update AnonLayoutWrapperComponent constructor logic to avoid passing undefined values into I18nService.t method
* PM-7324 - Accept org invite web comp - adjust register url and qParams
* PM-7324 - Add AnonLayoutWrapperData to desktop & browser since we don't need titleId.
* PM-7324 - Revert anon layout wrapper comp changes as they were made separately and merged to main.
* PM-7234 - Fix registration start component so the login route works for the browser extension.
* PM-7324 - Registration start story now building again + fix storybook warning around BrowserAnimationsModule
* PM-7324 - Registration Start - add missing tw-text-main to fix dark mode rendering.
* PM-7324 - Update storybook docs
* PM-7324 - Get stub of registration finish component so that the verify email has something to land on.
* PM-7324 - Registration start - receive marketing materials should never be required.
* PM-7324 - Add finish signup route + required translations to desktop & browser.
* PM-7324 - AnonLayoutWrapperComponent - Resolve issues where navigating to a sibling anonymous route wouldn't update the AnonLayoutWrapperData.
* PM-7324 - Remove unnecessary array
* PM-7324 - Per PR feedback, improve setReceiveMarketingEmailsByRegion
* PM-7324 - Per PR feedback, inject login routes via route data
* PM-7324 - Document methods in account api service
* PM-7324 - PR feedback - jsdoc tweaks
* [deps] Tools: Update electron to v30
* Bump version in electron-builder.json
* Update to electron 30.1.0
---------
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
Co-authored-by: Hinton <hinton@users.noreply.github.com>
* wait until a sync is complete to render the product switcher content
* refactor unneeded observables into their own variable
* do not show product switcher button until content is loaded
* use `ReplaySubject` to ensure that `syncCompleted$` last value is always used
* Refactor list organizations command to use organizationService.memberOrganizations$
* Deprecate OrganizationService.getAll method and update CLI get command to use the organizations observable
* [AC-2771] Do not make API request when restricted provider is not a member of the org
* [AC-2771] Fix console errors when switching organizations
* [AC-2772] Fix org vault for providers who are members
- Show vault filters
- Hide header search bar
- Show create new item button
* [AC-2763] Do not restrict providers if they are also a member of the organization
* [AC-2763] Reduce branching complexity
* [AC-2763] Remove explicit restrict provider access checks in Vault
We can safely fall back organization helpers for cipher access as it already accounts for provider users who are members.
* update admin console members page to use Component Library
components and tools, including virtual scroll and table filtering
* temporarily duplicate the base component to avoid impacting
other subclasses
* [PM-8639] Add data-testid attribute for test automation
* [PM-8669] Add autofill aria label
* [PM-8674] Show autofill menu options for card/identities when not in the autofill suggestion list
* [PM-8635] Hide menu items when copy cipher field directive is disabled
* [PM-8636] Disable copy menu dropdown when no items available to copy
* [CL-309] Add title override to bitBadge
* [PM-8669] Update menu-item directive disabled input
* [PM-7683] Fix race condition for remainingCiphers$
* [PM-7683] Use strict equality check
* PM-4954 Migrate SSO Component
* PM-4954 Updated anon layout changes
* PM-4954 Updated oss routing module
* PM-4954 Addressed review comments
* PM-4954 - SSO Comp - adjust to use form control accessor.
* PM-4954 - SsoComp - update form control accessor to use type safe approach.
* PM-4954 - Move canActivate up a level
* PM-4954 - Consolidate route under AnonLayoutWrapperComponent path after merging in main.
---------
Co-authored-by: Jared Snider <jsnider@bitwarden.com>
Co-authored-by: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
* tax info component migration
* tax info component migration
* tax info component migration
* PM-5024 Updated form controls in the component
---------
Co-authored-by: KiruthigaManivannan <kiruthiga.manivannan@kovanlabs.com>
* [PM-8518] Autofill scripts do not inject into sub-frames on install
* [PM-8518] Implementing jest tests for added BrowserApi methods
* [PM-8518] Adding generic typing to tabSendMessage call
* Working through a POC of a collectPageDetails observable
* Implementing collect page details observable
* [PM-8510] Implement collectPageDetails observable
* [PM-8510] Adding documentation to newly created collectPageDetailsFromTab method
* [PM-8510] Removing unnecessary file
* [PM-8510] Implementing Jest tests for the collectPageDetailsFromTab$ method
* [PM-8510] Implementing Jest tests for the collectPageDetailsFromTab$ method
* [PM-8510] Implementing Jest tests for the collectPageDetailsFromTab$ method
* [PM-8510] Implementing Jest tests for the collectPageDetailsFromTab$ method
* [PM-8510] Removing unnecessary property
* [PM-8510] Adding subscription reference to current tab component
* [PM-8510] Fixing jest tests
* two factor component migration
* two factor component migration
* two factor component migration
* two factor component migration
* two factor component migration
* On logging out the account service active account needs set to null
* Auth service logout back to old spot and account switch after cleaning the state
* Send current Org user Id on collection creation through CLI
* Run npm prettier
* Add organization services to CreateCommand creation on ServeCommand
* Refactor organization data models to include organizationUserId property
* Refactor create command to utilize the OrganizationUserId on the Organization object
* Add users to collection request in edit command
* fix: organization.data test update to correct deserialization, refs AC-2286
---------
Co-authored-by: Vincent Salucci <vincesalucci21@gmail.com>
* Move/replace submit and userVerification logic from web into the BaseExportComponent
Add "@bitwarden/auth" as dependency to the vault-export-ui package
New submit logic also checks for password-encrypted exports which will be need for future UI updates on browser and desktop
* Move/replace submit and userVerification logic from web into the BaseExportComponent
Add "@bitwarden/auth" as dependency to the vault-export-ui package
New submit logic also checks for password-encrypted exports which will be need for future UI updates on browser and desktop
* Create export-browser-v2 component
Copy existing `export-browser`-component
Add `popup-page` and -`header` and -`footer`
Add missing imports as page is marked as standalone
Route to new page when feature flag enabled
* Remove duplicate verifyUser methods
---------
Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
