Skip to content

Commit 29e7d62

Browse files
authored
Merge branch 'main' into update-send-openapi-to-work-for-sdk
2 parents 5ab0aa1 + 52d9a9c commit 29e7d62

63 files changed

Lines changed: 23082 additions & 17 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/Api/AdminConsole/Models/Response/BaseProfileOrganizationResponseModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ protected BaseProfileOrganizationResponseModel(
5252
UseDisableSMAdsForUsers = organizationDetails.UseDisableSMAdsForUsers;
5353
UsePasswordManager = organizationDetails.UsePasswordManager;
5454
UseMyItems = organizationDetails.UseMyItems;
55+
UseInviteLinks = organizationDetails.UseInviteLinks;
5556
SelfHost = organizationDetails.SelfHost;
5657
Seats = organizationDetails.Seats;
5758
MaxCollections = organizationDetails.MaxCollections;
@@ -106,6 +107,7 @@ protected BaseProfileOrganizationResponseModel(
106107
public bool UseDisableSMAdsForUsers { get; set; }
107108
public bool UsePhishingBlocker { get; set; }
108109
public bool UseMyItems { get; set; }
110+
public bool UseInviteLinks { get; set; }
109111
public bool SelfHost { get; set; }
110112
public int? Seats { get; set; }
111113
public short? MaxCollections { get; set; }

src/Api/AdminConsole/Models/Response/Organizations/OrganizationResponseModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public OrganizationResponseModel(
7777
UseDisableSmAdsForUsers = organization.UseDisableSmAdsForUsers;
7878
UsePhishingBlocker = organization.UsePhishingBlocker;
7979
UseMyItems = organization.UseMyItems;
80+
UseInviteLinks = organization.UseInviteLinks;
8081
}
8182

8283
public Guid Id { get; set; }
@@ -129,6 +130,7 @@ public OrganizationResponseModel(
129130
public bool UseDisableSmAdsForUsers { get; set; }
130131
public bool UsePhishingBlocker { get; set; }
131132
public bool UseMyItems { get; set; }
133+
public bool UseInviteLinks { get; set; }
132134
}
133135

134136
public class OrganizationSubscriptionResponseModel : OrganizationResponseModel

src/Api/Models/Response/PlanResponseModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public PlanResponseModel(Plan plan, string obj = "plan")
3939
HasResetPassword = plan.HasResetPassword;
4040
UsersGetPremium = plan.UsersGetPremium;
4141
HasMyItems = plan.HasMyItems;
42+
HasInviteLinks = plan.HasInviteLinks;
4243
UpgradeSortOrder = plan.UpgradeSortOrder;
4344
DisplaySortOrder = plan.DisplaySortOrder;
4445
LegacyYear = plan.LegacyYear;
@@ -80,6 +81,7 @@ public PlanResponseModel(Organization organization, string obj = "plan") : base(
8081
public bool HasResetPassword { get; set; }
8182
public bool UsersGetPremium { get; set; }
8283
public bool HasMyItems { get; set; }
84+
public bool HasInviteLinks { get; set; }
8385

8486
public int UpgradeSortOrder { get; set; }
8587
public int DisplaySortOrder { get; set; }

src/Core/AdminConsole/Entities/Organization.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,12 @@ public class Organization : ITableObject<Guid>, IStorableSubscriber, IRevisable
150150
/// </summary>
151151
public bool UseMyItems { get; set; }
152152

153+
/// <summary>
154+
/// If set to true, the organization can generate invite links to invite users to the organization.
155+
/// This is an Enterprise-only feature.
156+
/// </summary>
157+
public bool UseInviteLinks { get; set; }
158+
153159
/// <summary>
154160
/// When set to <see langword="true"/>, the organization is excluded from automated billing
155161
/// lifecycle operations such as subscription cancellation and disabling for non-payment.
@@ -337,6 +343,7 @@ public void UpdateFromLicense(OrganizationLicense license, IFeatureService featu
337343
UseApi = license.UseApi;
338344
UsePolicies = license.UsePolicies;
339345
UseMyItems = license.UseMyItems;
346+
UseInviteLinks = license.UseInviteLinks;
340347
UseSso = license.UseSso;
341348
UseKeyConnector = license.UseKeyConnector;
342349
UseScim = license.UseScim;

src/Core/AdminConsole/Models/Data/IProfileOrganizationDetails.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,5 @@ public interface IProfileOrganizationDetails
5757

5858
bool UsePhishingBlocker { get; set; }
5959
bool UseMyItems { get; set; }
60+
bool UseInviteLinks { get; set; }
6061
}

src/Core/AdminConsole/Models/Data/Organizations/OrganizationUsers/OrganizationUserOrganizationDetails.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,5 @@ public class OrganizationUserOrganizationDetails : IProfileOrganizationDetails
7373
public bool UseDisableSMAdsForUsers { get; set; }
7474
public bool UsePhishingBlocker { get; set; }
7575
public bool UseMyItems { get; set; }
76+
public bool UseInviteLinks { get; set; }
7677
}

src/Core/AdminConsole/Models/Data/Organizations/SelfHostedOrganizationDetails.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public Organization ToOrganization()
160160
UseOrganizationDomains = UseOrganizationDomains,
161161
UseAutomaticUserConfirmation = UseAutomaticUserConfirmation,
162162
UseMyItems = UseMyItems,
163+
UseInviteLinks = UseInviteLinks,
163164
};
164165
}
165166
}

src/Core/AdminConsole/Models/Data/Provider/ProviderUserOrganizationDetails.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,5 @@ public class ProviderUserOrganizationDetails : IProfileOrganizationDetails
5959
public bool UseDisableSMAdsForUsers { get; set; }
6060
public bool UsePhishingBlocker { get; set; }
6161
public bool UseMyItems { get; set; }
62+
public bool UseInviteLinks { get; set; }
6263
}

src/Core/AdminConsole/OrganizationFeatures/OrganizationAbility/OrganizationAbility.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public OrganizationAbility(Organization organization)
3232
UseDisableSmAdsForUsers = organization.UseDisableSmAdsForUsers;
3333
UsePhishingBlocker = organization.UsePhishingBlocker;
3434
UseMyItems = organization.UseMyItems;
35+
UseInviteLinks = organization.UseInviteLinks;
3536
}
3637

3738
public Guid Id { get; set; }
@@ -57,4 +58,5 @@ public OrganizationAbility(Organization organization)
5758
public bool UseDisableSmAdsForUsers { get; set; }
5859
public bool UsePhishingBlocker { get; set; }
5960
public bool UseMyItems { get; set; }
61+
public bool UseInviteLinks { get; set; }
6062
}

src/Core/AdminConsole/OrganizationFeatures/Organizations/CloudOrganizationSignUpCommand.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public async Task<SignUpOrganizationResponse> SignUpOrganizationAsync(Organizati
7979
MaxStorageGb = (short)(plan.PasswordManager.BaseStorageGb + signup.AdditionalStorageGb),
8080
UsePolicies = plan.HasPolicies,
8181
UseMyItems = plan.HasMyItems,
82+
UseInviteLinks = plan.HasInviteLinks,
8283
UseSso = plan.HasSso,
8384
UseGroups = plan.HasGroups,
8485
UseEvents = plan.HasEvents,

0 commit comments

Comments
 (0)