Skip to content

Commit

Permalink
Merge branch 'master' into fix/B2BTEAM-1689-add-with-session-metric
Browse files Browse the repository at this point in the history
  • Loading branch information
enzomerca authored Aug 19, 2024
2 parents 98671a3 + ef9eeb7 commit bb99c39
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 17 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Session audit metrics

## [1.44.0] - 2024-08-14

### Changed
- Changed the token validation directive of some operations

## [1.43.5] - 2024-08-08

### Fixed
- Storefront considers the active organizations when setting the user's profile

## [1.43.4] - 2024-08-07

### Changed
- Changed the token validation directive of some operations

## [1.43.3] - 2024-07-31

### Changed
Expand Down
14 changes: 7 additions & 7 deletions graphql/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type Query {
@cacheControl(scope: PRIVATE, maxAge: SHORT)
@withSender

getUser(id: ID!): User @cacheControl(scope: PRIVATE) @checkUserAccess
getUser(id: ID!): User @cacheControl(scope: PRIVATE) @validateStoreUserAccess
getB2BUser(id: ID!): User @cacheControl(scope: PRIVATE)

checkCustomerSchema: Boolean @cacheControl(scope: PRIVATE) @withSender
Expand All @@ -43,7 +43,7 @@ type Query {
@deprecated(
reason: "This query is deprecated, use listUsersPaginated query instead."
)
@checkUserAccess
@validateStoreUserAccess

listUsersPaginated(
organizationId: ID
Expand All @@ -56,7 +56,7 @@ type Query {
sortedBy: String
): UserPagination
@cacheControl(scope: PRIVATE, maxAge: SHORT)
@checkUserAccess
@validateStoreUserAccess

checkImpersonation: UserImpersonation
@settings(settingsType: "workspace")
Expand All @@ -81,7 +81,7 @@ type Query {

getOrganizationsByEmail(email: String!): [Organization]
@cacheControl(scope: PRIVATE)
@checkUserAccess
@validateStoreUserAccess
}

type Mutation {
Expand Down Expand Up @@ -124,7 +124,7 @@ type Mutation {
canImpersonate: Boolean = false
email: String
name: String
): MutationResponse @checkAdminAccess @cacheControl(scope: PRIVATE)
): MutationResponse @validateAdminUserAccess @cacheControl(scope: PRIVATE)

addUser(
id: ID
Expand All @@ -135,7 +135,7 @@ type Mutation {
canImpersonate: Boolean = false
name: String!
email: String!
): MutationResponse @checkAdminAccess @cacheControl(scope: PRIVATE)
): MutationResponse @validateAdminUserAccess @cacheControl(scope: PRIVATE)

addCostCenterToUser(costId: ID!, userId: ID!): MutationResponse
@validateStoreUserAccess
Expand All @@ -153,7 +153,7 @@ type Mutation {
@cacheControl(scope: PRIVATE)

impersonateUser(userId: ID): MutationResponse
@checkUserAccess
@validateStoreUserAccess
@cacheControl(scope: PRIVATE)

deleteUser(id: ID!, userId: ID, email: String!): MutationResponse
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "storefront-permissions",
"vendor": "vtex",
"version": "1.43.3",
"version": "1.44.0",
"title": "Storefront Permissions",
"description": "Manage User's permissions on apps that relates to this app",
"mustUpdateAt": "2022-08-28",
Expand Down
6 changes: 3 additions & 3 deletions node/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "vtex.checkout-ui-custom",
"version": "1.43.3",
"version": "1.44.0",
"dependencies": {
"@vtex/api": "6.46.1",
"@vtex/api": "6.47.0",
"atob": "^2.1.2",
"co-body": "^6.0.0",
"cookie": "^0.3.1",
Expand All @@ -21,7 +21,7 @@
"@types/jsonwebtoken": "^8.5.0",
"@types/node": "^12.0.0",
"@types/ramda": "types/npm-ramda#dist",
"@vtex/api": "6.46.1",
"@vtex/api": "6.47.0",
"@vtex/prettier-config": "^0.3.1",
"tslint": "^5.12.0",
"tslint-config-prettier": "^1.18.0",
Expand Down
2 changes: 1 addition & 1 deletion node/resolvers/Routes/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const QUERIES = {
}
}`,
getOrganizationsByEmail: `query Organizations($email: String!) {
getOrganizationsByEmail(email: $email) @context(provider: "vtex.b2b-organizations-graphql") {
getOrganizationsByEmail(email: $email) {
id
organizationStatus
costId
Expand Down
10 changes: 5 additions & 5 deletions node/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@
"@types/mime" "^1"
"@types/node" "*"

"@vtex/api@6.46.1":
version "6.46.1"
resolved "https://registry.yarnpkg.com/@vtex/api/-/api-6.46.1.tgz#55a8755ae48f5400e7f1ed1921cd547950bb7a2a"
integrity sha512-geoxVvyWoQpOQ70Zmx3M8SBkRoGOS/bp9Gy26M+iCue63jofVSwmFz1zf66EaHA1PKOJNRgQPFwY+oeDE1U2lQ==
"@vtex/api@6.47.0":
version "6.47.0"
resolved "https://registry.yarnpkg.com/@vtex/api/-/api-6.47.0.tgz#6910455d593d8bb76f1f4f2b7660023853fda35e"
integrity sha512-t9gt7Q89EMbSj3rLhho+49Fv+/lQgiy8EPVRgtmmXFp1J4v8hIAZF7GPjCPie111KVs4eG0gfZFpmhA5dafKNA==
dependencies:
"@types/koa" "^2.11.0"
"@types/koa-compose" "^3.2.3"
Expand Down Expand Up @@ -1428,7 +1428,7 @@ sprintf-js@~1.0.2:
resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=

stats-lite@vtex/node-stats-lite#dist:
"stats-lite@github:vtex/node-stats-lite#dist":
version "2.2.0"
resolved "https://codeload.github.com/vtex/node-stats-lite/tar.gz/1b0d39cc41ef7aaecfd541191f877887a2044797"
dependencies:
Expand Down

0 comments on commit bb99c39

Please sign in to comment.