rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: enable vaults on free internal team user accounts (#2617)

Browse Source
This commit is contained in:
Karol Sójko
2023-11-03 11:23:42 +01:00
committed by GitHub
parent 202a132482
commit 0902580b79
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@@ -26,6 +26,7 @@
"build:snjs": "yarn workspaces foreach -p --topological-dev --verbose -R --from @standardnotes/snjs run build", "build:snjs": "yarn workspaces foreach -p --topological-dev --verbose -R --from @standardnotes/snjs run build",
"build:services": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/services run build", "build:services": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/services run build",
"build:api": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/api run build", "build:api": "yarn workspaces foreach -pt --topological-dev --verbose -R --from @standardnotes/api run build",
"start:web": "yarn workspace @standardnotes/web start",
"e2e": "lerna run start:test-server --scope=@standardnotes/snjs", "e2e": "lerna run start:test-server --scope=@standardnotes/snjs",
"e2e:test": "yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html", "e2e:test": "yarn dlx mocha-headless-chrome --timeout 3600000 -f http://localhost:9001/mocha/test.html",
"reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install", "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install",

4
packages/services/src/Domain/Feature/FeaturesClientInterface.ts
View File

@@ -3,7 +3,7 @@ import { ComponentInterface, DecryptedItemInterface } from '@standardnotes/model
import { FeatureStatus } from './FeatureStatus' import { FeatureStatus } from './FeatureStatus'
import { SetOfflineFeaturesFunctionResponse } from './SetOfflineFeaturesFunctionResponse' import { SetOfflineFeaturesFunctionResponse } from './SetOfflineFeaturesFunctionResponse'
import { NativeFeatureIdentifier } from '@standardnotes/features' import { NativeFeatureIdentifier } from '@standardnotes/features'
import { Uuid } from '@standardnotes/domain-core' import { RoleName, Uuid } from '@standardnotes/domain-core'
export interface FeaturesClientInterface { export interface FeaturesClientInterface {
getFeatureStatus( getFeatureStatus(
@@ -11,7 +11,7 @@ export interface FeaturesClientInterface {
options?: { inContextOfItem?: DecryptedItemInterface }, options?: { inContextOfItem?: DecryptedItemInterface },
): FeatureStatus ): FeatureStatus
hasMinimumRole(role: string): boolean hasMinimumRole(role: string): boolean
hasRole(roleName: RoleName): boolean
hasFirstPartyOfflineSubscription(): boolean hasFirstPartyOfflineSubscription(): boolean
setOfflineFeaturesCode(code: string): Promise<SetOfflineFeaturesFunctionResponse> setOfflineFeaturesCode(code: string): Promise<SetOfflineFeaturesFunctionResponse>
hasOfflineRepo(): boolean hasOfflineRepo(): boolean

4
packages/snjs/lib/Services/Features/FeaturesService.ts
View File

@@ -412,6 +412,10 @@ export class FeaturesService
return Object.values(RoleName.NAMES).filter((role) => roles.includes(role)) return Object.values(RoleName.NAMES).filter((role) => roles.includes(role))
} }
hasRole(roleName: RoleName): boolean {
return this.onlineRoles.includes(roleName.value) || this.offlineRoles.includes(roleName.value)
}
public hasMinimumRole(role: string): boolean { public hasMinimumRole(role: string): boolean {
const sortedAllRoles = Object.values(RoleName.NAMES) const sortedAllRoles = Object.values(RoleName.NAMES)

6
packages/web/src/javascripts/Controllers/FeaturesController.ts
View File

@@ -133,7 +133,11 @@ export class FeaturesController extends AbstractViewController implements Intern
isVaultsEnabled(): boolean { isVaultsEnabled(): boolean {
const enabled = this.features.isExperimentalFeatureEnabled(NativeFeatureIdentifier.TYPES.Vaults) const enabled = this.features.isExperimentalFeatureEnabled(NativeFeatureIdentifier.TYPES.Vaults)
return featureTrunkVaultsEnabled() || enabled || this.features.hasMinimumRole(RoleName.NAMES.InternalTeamUser) return (
featureTrunkVaultsEnabled() ||
enabled ||
this.features.hasRole(RoleName.create(RoleName.NAMES.InternalTeamUser).getValue())
)
} }
isEntitledToSharedVaults(): boolean { isEntitledToSharedVaults(): boolean {