Skip to content

Simplify user feature logic #4178

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

Merged
pcapriotti merged 3 commits into from
Aug 7, 2024
Merged

Simplify user feature logic #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99f269a
Remove redundant team lookups for user features
pcapriotti Jul 24, 2024
cba526e
Remove pointless CPS
pcapriotti Jul 24, 2024
7c5ee3c
Add CHANGELOG entry
pcapriotti Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5-internal/user-features
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Refactor user feature logic
10 changes: 3 additions & 7 deletions services/galley/src/Galley/API/Public/Bot.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import Galley.App
import Galley.Effects
import Galley.Effects qualified as E
import Galley.Options
import Imports hiding (head)
import Polysemy
import Polysemy.Input
import Wire.API.Error
Expand All @@ -50,14 +49,11 @@ getBotConversation ::
Member TeamFeatureStore r,
Member (ErrorS 'AccessDenied) r,
Member (ErrorS 'ConvNotFound) r,
Member (ErrorS OperationDenied) r,
Member (ErrorS 'NotATeamMember) r,
Member (ErrorS 'TeamNotFound) r,
Member TeamStore r
) =>
BotId ->
ConvId ->
Sem r BotConvView
getBotConversation bid cnv =
Features.guardSecondFactorDisabled (botUserId bid) cnv $
Query.getBotConversation bid cnv
getBotConversation bid cnv = do
Features.guardSecondFactorDisabled (botUserId bid) cnv
Query.getBotConversation bid cnv
27 changes: 14 additions & 13 deletions services/galley/src/Galley/API/Public/Feature.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ module Galley.API.Public.Feature where

import Galley.API.Teams
import Galley.API.Teams.Features
import Galley.API.Teams.Features.Get
import Galley.App
import Imports
import Wire.API.Federation.API
Expand Down Expand Up @@ -72,16 +73,16 @@ featureAPI =
<@> mkNamedAPI @'("get", LimitedEventFanoutConfig) (getFeatureStatus . DoAuth)
<@> mkNamedAPI @"get-all-feature-configs-for-user" getAllFeatureConfigsForUser
<@> mkNamedAPI @"get-all-feature-configs-for-team" getAllFeatureConfigsForTeam
<@> mkNamedAPI @'("get-config", LegalholdConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", SSOConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", SearchVisibilityAvailableConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", ValidateSAMLEmailsConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", DigitalSignaturesConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", AppLockConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", FileSharingConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", ClassifiedDomainsConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", ConferenceCallingConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", SelfDeletingMessagesConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", GuestLinksConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", SndFactorPasswordChallengeConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", MLSConfig) getFeatureStatusForUser
<@> mkNamedAPI @'("get-config", LegalholdConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", SSOConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", SearchVisibilityAvailableConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", ValidateSAMLEmailsConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", DigitalSignaturesConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", AppLockConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", FileSharingConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", ClassifiedDomainsConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", ConferenceCallingConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", SelfDeletingMessagesConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", GuestLinksConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", SndFactorPasswordChallengeConfig) getSingleFeatureConfigForUser
<@> mkNamedAPI @'("get-config", MLSConfig) getSingleFeatureConfigForUser
1 change: 0 additions & 1 deletion services/galley/src/Galley/API/Teams/Features.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module Galley.API.Teams.Features
setFeatureStatus,
setFeatureStatusInternal,
patchFeatureStatusInternal,
getFeatureStatusForUser,
getAllFeatureConfigsForTeam,
getAllFeatureConfigsForUser,
updateLockStatus,
Expand Down
Loading