e9fa9d88c4
Made name more verbose
2021-11-18 14:07:00 -05:00
f066378c83
Removed old comments
2021-11-18 13:49:00 -05:00
18576f3700
Add sql files to Sql.sqlproj
2021-11-18 13:33:34 -05:00
a9f9d6b926
Remove unneeded css styles
2021-11-18 13:33:19 -05:00
fc170d89e4
Switch to using Guid in the method
2021-11-18 13:33:03 -05:00
5ed6eba572
Update copy and links
2021-11-18 11:02:04 -05:00
7ef8371014
Fix migration
2021-11-18 10:09:39 -05:00
de2a43e6ca
Switch naming convention
2021-11-18 09:30:24 -05:00
b46b378ebb
Switch naming convention
2021-11-18 09:30:10 -05:00
da80a16b9f
Remove reconfirmation template
2021-11-18 09:27:46 -05:00
bff256ec6b
Remove ending email
2021-11-18 09:26:42 -05:00
1a1ad081ec
Switch to handlebars ifs
2021-11-18 09:22:50 -05:00
55fe95e841
Merge branch 'feature/families-for-enterprise' of https://github.com/bitwarden/server into feature/families-for-enterprise
2021-11-18 08:53:51 -05:00
3f6574bb98
Fix unit tests
2021-11-18 08:53:49 -05:00
c783ee9e74
Remove unused variable
2021-11-18 08:51:00 -05:00
297f8071da
Fix unit tests
2021-11-18 08:43:55 -05:00
1c9908afc8
Merge branch 'master' into feature/families-for-enterprise
2021-11-18 08:32:28 -05:00
0b8cd5c22a
Skip test
2021-11-18 08:07:31 -05:00
2dc29e51d1
Fix bug preventing user from leaving org ( #1721 )
2021-11-18 21:15:22 +10:00
b0760b2134
Finish emails
2021-11-17 22:06:49 -05:00
9f96e4ce90
Disable EA Takeover if grantor uses Key Connector ( #1718 )
2021-11-18 07:47:43 +10:00
faa8abb3dc
Updated SETUP.md to direct user with correct file name. ( #1719 )
2021-11-17 07:54:38 -07:00
f866b25e43
Key Connector feature toggle ( #1716 )
2021-11-17 11:46:35 +01:00
0a9d35c43f
Fix stripe subscription update
2021-11-16 17:26:45 -05:00
3a22f91ff5
Enable key connector selfhost ( #1707 )
...
* initial commit
* Add code for Key Connector feature
* Add help URL to config
* Fix folders for key-connector service
* Fix paths for key-connector
* fixing the env file builder when disabling the key connector
* swapping a variable name
Co-authored-by: Vince Grassia <593223+vgrassia@users.noreply.github.com >
2021-11-16 09:52:02 -08:00
cdb622d4aa
Add ApiUseKeyConnector flag to token response ( #1710 )
2021-11-16 06:54:28 +10:00
4f20911875
Add newline
2021-11-15 15:08:36 -05:00
50398fe0f8
Skip local test
2021-11-15 14:54:06 -05:00
6dab6d3428
Fix tests
2021-11-15 14:47:23 -05:00
afa53fcccd
Update emails
2021-11-15 14:34:12 -05:00
c660f8bf00
Fix Docker Notary ( #1717 )
2021-11-15 13:53:53 -05:00
27351762de
Upload Docker images to AWS ECR Nonprod Repositories ( #1713 )
2021-11-15 13:23:51 -05:00
e3143271d7
[Key Connector] Prevent user from leaving org ( #1715 )
...
* Block user from leaving org using Key Connector
* Add tests
2021-11-15 19:46:13 +10:00
c2975b003d
[Key Connector] Fix policy checks and other pre-reqs ( #1711 )
...
* Require SSO Policy to enable Key Connector
* Require that SSO is enabled to use Key Connector
* Fix error messages
"Key Connector" instead of "KeyConnector"
* Refactor dependent policy checks to handle expansion
* Block disabling Sso Policy if using Key Connector
* Update tests for policies required by Key Connector
* Fix tests
* Add test for Key Connector to require Sso Policy
* Add test: Sso config must be enabled to use Key Connector
2021-11-15 19:25:10 +10:00
85225790d6
Fix build error
2021-11-12 22:40:04 -05:00
252b558fe1
Merge branch 'master' into feature/families-for-enterprise
2021-11-12 22:33:58 -05:00
dba01a2c4e
Merge branch 'feature/families-for-enterprise' of https://github.com/bitwarden/server into feature/families-for-enterprise
2021-11-12 20:52:47 -05:00
9c41e149b9
Fix sproc
2021-11-12 20:49:00 -05:00
c70195c882
Test org sponsorship service
2021-11-12 20:49:00 -05:00
5e20c3ff2d
Fix organization delete sponsorship hooks
2021-11-12 20:49:00 -05:00
0fb44eb641
Add sponsorship validation to upcoming invoice webhook
2021-11-12 20:49:00 -05:00
1d34c276e7
Add sponsorship validation to upcoming invoice webhook
2021-11-12 20:49:00 -05:00
be6ab1883c
Add is sponsored item to subscription response
2021-11-12 20:49:00 -05:00
3d28ae1547
Fix sponsorship upgrade options
2021-11-12 20:49:00 -05:00
de5a0cb463
Fix double email send
2021-11-12 20:49:00 -05:00
32333048b4
Add resend sponsorship offer api endpoint
2021-11-12 20:49:00 -05:00
a605dc7286
Use organization and auth to find organization sponsorship
2021-11-12 20:49:00 -05:00
9ec8bbb8bb
Use upgrade path to change sponsorship
...
Sponsorships need to be annual to match the GB add-on charge rate
2021-11-12 20:49:00 -05:00
a2467ea6ea
Add product type to organization details
2021-11-12 20:49:00 -05:00
76c5ddb611
Populate user in current context
2021-11-12 20:49:00 -05:00