1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Commit Graph

3407 Commits

Author SHA1 Message Date
Thomas Rittson
3360d40592
[EC-243] Grant premium status when member accepts org invite (#2043) 2022-06-17 06:30:50 +10:00
Chad Scharf
b2a0aa2860
EC-262 - implement org user deactivated flag and behavior server (#2050)
* SM-47 - Add Disabled status to enum + schema

* SM-47 - Enable and disable sprocs and repositories

* SM-47 - Organization service enble/disable user

* SM-47 - Fix lint errors

* SM-47 - add disable/enable endpoints to API

* SM-47 - Add bulk operations for enable/disable

* SM-47 - Fix linting errors, one of these days I'll do this first

* SM-47 - Codesense fix DRY warnings

* EC-262 - Code review changes, async cleanup

* EC-262 - Fix build issues, async refs

* EC-262 - Update controller param types

* EC-262 - Ensure mutable state is correct

* EC-262 - rename disabled to deactivated
2022-06-16 15:59:57 -04:00
Gbubemi Smith
8e79c20dce
[SG-72] Sync changed email address with stripe (#2042)
* sync changed email address with strip

* sync changed email address with strip

* fixed formatting

* throw exception if not successful

* Added revert if stripe sync fails

* Added revert if stripe sync fails

* Added revert if stripe sync fails

* created stripe sync service

* fixed lint issue

* reverted to use stripe exception message

* added null checks to customer id and email address

* added braces

* removed empty email
2022-06-16 17:45:26 +01:00
Thomas Rittson
b39a43210d
[EC-235] Reapply permissions fix for Admin cipher endpoint (#2061)
* Reapply fix from PR 2036, accidentally clobbered by PR 2022
2022-06-15 12:47:36 +10:00
Oscar Hinton
8e110b5c41
Remove (mark with an X) from PR template (#2059) 2022-06-14 17:45:57 +02:00
Thomas Rittson
4bedf140cc
Remove labeler action (#2054) 2022-06-14 10:23:50 +10:00
Robyn MacCallum
d626174f7e
Fix null collectionIds after live-syncing a cipher (#2057) 2022-06-13 13:50:44 -04:00
Justin Baur
46b4207ab6
[PS-899] Fix unawaited Task (#2055)
* Fix unawaited task and switch to Guid parameters

* Remove whitespace

* Formatting

* Fix unwanted Assert
2022-06-13 11:18:53 -04:00
Federico Maccaroni
e3699156de
[PS-589] Fix DeviceUnknownVerification User_Update proc (#2041)
* PS-589 Fix 2022-05-24_00_DeviceUnknownVerification User_Update proc to remove the NULL and set the default value

* PS-589 updated stored procedures on Sql project to have UnknownDeviceVerificationEnabled with default 1 instead of NULL
2022-06-13 16:42:24 +02:00
Thomas Rittson
76e0790ff8
Add docker-compose profile for openldap (#2052) 2022-06-13 17:34:50 +10:00
github-actions[bot]
9ed4314d8d
Bumped version to 2022.5.1 (#2049)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-06-10 11:37:55 -07:00
Thomas Rittson
498aabfd2c
Fix file path (#2048) 2022-06-10 08:10:49 -05:00
Thomas Rittson
83b530a5bd
[PIQ-127] Add Github Actions to help manage issues and PRs (#1981)
* Update glob matching pattern for labeler

Ref: https://github.com/actions/labeler/issues/28#issuecomment-552362351
2022-06-10 13:33:48 +10:00
Matt Gibson
9ff82ab176
Use the correct policy enum type (#2045)
Explicit conversion from non-generics to generics doesn't seem to work
here, so I moved to using the read methods already on base Policy.
2022-06-09 18:57:56 -05:00
Dan Poltawski
65ac9a527f
Fix bitwarden typo in API URI (#2044) 2022-06-09 12:21:55 -04:00
Thomas Rittson
f5622dd956
Update README and CONTRIBUTING to point to contributing.bitwarden.com (#2028) 2022-06-09 12:00:58 +02:00
Matt Gibson
ef403b4362
[PS-616] [PS-795] Fix/auto enroll master password reset without user verification (#2038)
* Fix parameter name to match entity

* Deserialize policy data in object

* Add policy with config type to fixtures

* Return policy with deserialized config

* Use CoreHelper serializers

* Add master password reset on accept request

* Simplify policy data parsing

* Linter
2022-06-08 08:44:28 -05:00
Drank Sinatra
194b76c13d
Add Spanish version of healthcare.gov (#2040)
The site for USA government health insurance has a separate base domain in Spanish.
2022-06-07 21:39:18 +02:00
Gbubemi Smith
64edad8f49
[PS-165] Missing copy verification code (#2022)
* Made changes to organization details endpoint

* Fixed formatting

* Added script to utils directory
2022-06-07 16:52:07 +01:00
Chad Scharf
60a167f2b7
Update swashbuckle for swaggerUI (#2039) 2022-06-07 10:11:18 -04:00
thericle
496c9a5d50
protonmail.com domain has been replaced by proton.me (#2034)
* protonmail.com domain has been replaced by proton.me

Protonvpn.com is still in use so there is still a need for equivalent domains for Proton.

* Update StaticStore.cs
2022-06-06 21:06:58 -04:00
Thomas Rittson
f602df2eb9
[EC-235] Give Admins (and above) access to all items (#2036) 2022-06-07 10:33:39 +10:00
Federico Maccaroni
b070e9a387
[PS-589] Fix emergency contact takeover device verification and endpoints for its settings (#2016)
* Added UnknownDeviceVerificationEnabled on User that is turned off when emergency contact takes over the account. Also added endpoints to get and update 2fa device verification settings. And Updated migrations & tests

* Applied dotnet format

* Fixed method rename call on TwoFactorController

* PS-589 Format fixes

* PS-589 changed UnknownDeviceVerificationEnabled to be non-nullable
2022-06-06 14:52:50 -03:00
Matt Gibson
16c6b23a27
PR template info as code (#2032)
Template items here aren't really tasks as interpreted by github, this
allows us to have the same MD experience without hinting to Github that
there are 2/8 tasks done, which was annoying.
2022-06-03 10:39:22 -05:00
Carlos J. Muentes
14302efa2c
CSA-2 - Require user interaction for SSO redirect (#1948)
* CSA-2 - adding validation before redirecting for SSO login

* Updating server to use generated and signed JWT for SSO redirect

* Removing erroneous file

* Removing erroneous file

* Updating for PR feedback, adding domain_hint to Login and fixing invalid domain_hint name reference

* Some code styling changes from PR feedback

* Removing unnecessary JSON serialization

* Couple small changes from PR feedback

* Fixing linting errors

* Update formatting in AccountController.cs

* Remove unused dependency

* Add token lifetime to settings

* Use tokenable directly

* Return defined models

* Revert sso proj file changes

* Check expiration validity when validating org

* Show error message with expired token

* Formatting fixes

* Add SsoTokenLifetime to Sso settings

* Fix build errors

* Fix sql warnings

Co-authored-by: Carlos J. Muentes <cmuentes@bitwarden.com>
Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com>
Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
2022-06-01 12:23:52 -05:00
Thomas Avery
c27645265c
Fix Master Password Hint Email template (#2019) 2022-06-01 11:05:08 -05:00
Micaiah Martin
99de655190
Patch release workflow (#2027) 2022-05-31 19:08:56 -06:00
Joseph Flinn
fb5452bd10
Fixing the Release Version Check action path (#2026) 2022-05-31 17:49:02 -07:00
Joseph Flinn
a0c049dbce
Updating the version check to the new Github action (#2024)
* Updating the grep version check to be more strict on the new version convention

* updating the way we check the version with the new github release

* Fixed the release-type

* switching master branch name for commit
2022-05-31 16:11:21 -07:00
github-actions[bot]
131e6cb44e
Bumped version to 2022.05.0 (#2025)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-05-31 15:41:09 -07:00
Daniel James Smith
610be2cdcc
[EC-144] Fix stripe revert logic (#2014)
* Revert scaling by previous value

* Throw is Stripe subscription revert fails

* Remove unused property

* Add null check to accommodate for not existing storage-gb-xxx subscription item

* Use long? instead of Nullable<long>

* Remove redundant try/catch

* Ensure collectionMethod is changed back, even when revertSub fails

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
2022-05-31 22:55:09 +02:00
Addison Beck
39ba68e66b
[fix] Correct a typo in the event name of a stripe webhook (#2023) 2022-05-31 18:08:34 +02:00
Addison Beck
052f760fbb
[fix] Cancel unpaid subscriptions (#2017)
* [refactor] Create a static class for documenting handled stripe webhooks

* [fix] Cancel unpaid subscriptions after 4 failed payments
2022-05-31 10:55:56 -04:00
Kyle Spearrin
810b653915
log captcha response info (#2018)
* log captcha response info

* wrap in isBot condition
2022-05-26 14:33:02 -04:00
Thomas Rittson
a788478af3
Add docker image and config for local SSO IdP (#2001) 2022-05-26 06:23:58 +10:00
Thomas Avery
11b6e5d21d
Fix for displaying email address in email template (#2015) 2022-05-25 11:42:34 -05:00
Justin Baur
f235938c41
Change OrgUser Delete Behavior (#2010)
* Fix OrgUserDelete sprocs

* Update Sqlproj
2022-05-23 15:50:54 -04:00
Thomas Avery
0c925f92c9
Fix port number for vs profile Api-SelfHost (#2011) 2022-05-23 14:22:04 -05:00
Thomas Avery
dded4e7780
Fix initial database creation in run_migrations.sh (#2009) 2022-05-23 11:35:39 -05:00
Justin Baur
719abc7e61
[BEEEP] Integration tests (#1945)
* Add api integration tests

* Add some stuff

* Make program mockable

* Work on IntegrationTests for Identity

* Formatting

* Update packages.lock.json

* Update more packages.lock.json

* Update all packages.lock.json

* Fix InMemory configuration

* Actually fix test configuration

* Fix tests for CI

* Fix event service

* Force EF EventRepository

* Add client_credentials test

* Remove Api.IntegrationTest

* Remove Api Program changes

* Cleanup

* Add more Auth-Email tests

* Run formatting

* Address some PR feedback

* Move integration stuff to it's own common project

* Ran linter

* Add shared project to test solution

* Remove sln changes

* Clean usings

* Add more coverage

* Address PR feedback
2022-05-20 15:24:59 -04:00
Thomas Rittson
98546a65ea
Add uid.env to key-connector compose config (#2005) 2022-05-20 11:31:36 +10:00
Carlos J. Muentes
452472deab
CSA-1 - adding master password authentication when enrolling in passw… (#1940)
* CSA-2 - adding master password authentication when enrolling in password reset

* Getting user by principal rather than ID

* Removing unnecessary userId call

* Use secret verification for re-auth api requests

Co-authored-by: Matt Gibson <mgibson@bitwarden.com>
2022-05-19 14:55:42 -05:00
Matt Gibson
60e36a8f0f
Add InstallationId to event responses (#2007) 2022-05-19 09:58:47 -05:00
Federico Maccaroni
e314537713
PS-661 Fix Captcha Bypass Token Validation (#2004) 2022-05-19 10:15:49 -03:00
Vince Grassia
a266772ec3
Update QA Deploy Workflow (#2003) 2022-05-18 08:43:36 -04:00
Matt Gibson
47b1e5317c
Store migrations in a migrations db (#1992)
* Store migrations in a migrations db

Added the -p flag to run_migrations for pipeline to run from
environment variables

Created meta-migrations script to pre-populate migrations_vault_dev
tables with run migrations for those already using the last_migrations
file

* Update dev/helpers/mssql/migrate_migrations.sh

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>

* Update dev/helpers/mssql/run_migrations.sh

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>

* Remove last_migration file creation

Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com>
2022-05-16 12:16:34 -05:00
Justin Baur
53241f16e0
Add Additional Logging to Self-hosted installs for F4E (#1999)
* Add logging to SH logs

* Fix tests
2022-05-16 09:57:00 -04:00
Justin Baur
6b484e29a7
Switch to sending org name in cloud invite (#2002) 2022-05-16 09:50:33 -04:00
Federico Maccaroni
2e2d3075d1
EC-198 Added feature flag for 2FA Email for new device login (#1993)
* EC-198 added global setting flag for 2FA email on new device login feature

* EC-198 Removed is development environment check on 2FA email new device login given that we can now rely on the global settings feature flag

* EC-198 Improved IGlobalSettings and UserService code for testing
2022-05-13 10:48:48 -03:00
Justin Baur
bbb55ef8de
Limit migrations to only once (#1996) 2022-05-12 10:11:47 -04:00