Skip to content

Commit

Permalink
Merge branch 'master' into fix/login-error
Browse files Browse the repository at this point in the history
  • Loading branch information
giurigaud authored Sep 25, 2024
2 parents 65da82c + 9f58720 commit 1829873
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 26 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Force setProfile to use a valid cost center
- Increase timeout to 60 seconds

## [1.44.7] - 2024-09-25

### Fixed
- Remove unnecessary b2b_users storage on vbase

## [1.44.6] - 2024-09-05

### Fixed
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.44.6",
"version": "1.44.7",
"title": "Storefront Permissions",
"description": "Manage User's permissions on apps that relates to this app",
"mustUpdateAt": "2022-08-28",
Expand Down
2 changes: 1 addition & 1 deletion node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vtex.checkout-ui-custom",
"version": "1.44.6",
"version": "1.44.7",
"dependencies": {
"@vtex/api": "6.47.0",
"atob": "^2.1.2",
Expand Down
30 changes: 6 additions & 24 deletions node/resolvers/Mutations/Users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const updateUserFields = async ({ masterdata, fields, id }: any) => {
return DocumentId
}

const createPermission = async ({ masterdata, vbase, params }: any) => {
const createPermission = async ({ masterdata, params }: any) => {
const {
roleId,
canImpersonate,
Expand All @@ -129,7 +129,7 @@ const createPermission = async ({ masterdata, vbase, params }: any) => {
id,
} = params

const { DocumentId } = await masterdata
await masterdata
.createOrUpdateEntireDocument({
dataEntity: config.name,
fields: {
Expand Down Expand Up @@ -157,25 +157,11 @@ const createPermission = async ({ masterdata, vbase, params }: any) => {

throw error
})

if (DocumentId) {
await vbase.saveJSON('b2b_users', email, {
canImpersonate,
clId,
costId,
email,
id: DocumentId,
name,
orgId,
roleId,
userId,
})
}
}

export const addUser = async (_: any, params: any, ctx: Context) => {
const {
clients: { masterdata, lm, vbase },
clients: { masterdata, lm },
vtex: { logger },
} = ctx

Expand Down Expand Up @@ -221,7 +207,6 @@ export const addUser = async (_: any, params: any, ctx: Context) => {
...params,
clId: cId,
},
vbase,
})

return { status: 'success', message: '', id: cId }
Expand All @@ -237,7 +222,7 @@ export const addUser = async (_: any, params: any, ctx: Context) => {

export const updateUser = async (_: any, params: any, ctx: Context) => {
const {
clients: { masterdata, lm, vbase },
clients: { masterdata, lm },
vtex: { logger },
} = ctx

Expand All @@ -251,7 +236,6 @@ export const updateUser = async (_: any, params: any, ctx: Context) => {
lm,
masterdata,
params,
vbase,
})

return { status: 'success', message: '', id: params.clId }
Expand Down Expand Up @@ -323,15 +307,13 @@ export const deleteUserProfile = async (_: any, params: any, ctx: Context) => {

export const deleteUser = async (_: any, params: any, ctx: Context) => {
const {
clients: { masterdata, vbase },
clients: { masterdata },
vtex: { logger },
} = ctx

const { id, email } = params
const { id } = params

try {
await vbase.deleteFile('b2b_users', email).catch(() => null)

await masterdata.deleteDocument({
dataEntity: config.name,
id,
Expand Down

0 comments on commit 1829873

Please sign in to comment.