Skip to content

Commit 731faa4

Browse files
author
amazon-meaisiah
committed
Tweak accounts some
1 parent 9a5ba4b commit 731faa4

File tree

4 files changed

+28
-34
lines changed

4 files changed

+28
-34
lines changed

‎dev-portal/src/services/accounts.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { apiGatewayClientWithCredentials as getApiGatewayClient } from 'services
33
const getAccountsWithFilter = async filter => {
44
const apiGatewayClient = await getApiGatewayClient()
55
const response = await apiGatewayClient.get(
6-
'/accounts',
6+
'/admin/accounts',
77
undefined,
88
undefined,
99
{ queryParams: { filter } },
@@ -24,12 +24,12 @@ export const fetchAdminAccounts = () => getAccountsWithFilter('admin')
2424
export const fetchPendingRequestAccounts = () => getAccountsWithFilter('pendingRequest')
2525
export const fetchPendingInviteAccounts = () => getAccountsWithFilter('pendingInvite')
2626

27-
export const deleteAccountByUserId = userId => fetch('delete', url`/accounts/${userId}`)
27+
export const deleteAccountByUserId = userId => fetch('delete', url`/admin/accounts/${userId}`)
2828
// TODO: verify if this is even correct - I suspect it should've posted to
29-
// `/accounts/:userId/denyRequest` instead.
30-
export const deleteInviteByUserId = userId => fetch('delete', url`/accounts/${userId}`)
31-
export const createInviteByEmail = email => fetch('post', '/accounts', { targetEmailAddress: email })
32-
export const resendInviteByEmail = email => fetch('put', '/accounts/resendInvite', { targetEmailAddress: email })
33-
export const promoteAccountByUserId = userId => fetch('put', url`/accounts/${userId}/promoteToAdmin`)
34-
export const approveAccountRequestByUserId = userId => fetch('put', url`/accounts/${userId}/approveRequest`)
35-
export const denyAccountRequestByUserId = userId => fetch('put', url`/accounts/${userId}/denyRequest`)
29+
// `/admin/accounts/:userId/denyRequest` instead.
30+
export const deleteInviteByUserId = userId => fetch('delete', url`/admin/accounts/${userId}`)
31+
export const createInviteByEmail = email => fetch('post', '/admin/accounts', { targetEmailAddress: email })
32+
export const resendInviteByEmail = email => fetch('put', '/admin/accounts/resendInvite', { targetEmailAddress: email })
33+
export const promoteAccountByUserId = userId => fetch('put', url`/admin/accounts/${userId}/promoteToAdmin`)
34+
export const approveAccountRequestByUserId = userId => fetch('put', url`/admin/accounts/${userId}/approveRequest`)
35+
export const denyAccountRequestByUserId = userId => fetch('put', url`/admin/accounts/${userId}/denyRequest`)

‎lambdas/backend/__tests__/routes/accounts.js renamed to ‎lambdas/backend/__tests__/routes/admin/accounts.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
const util = require('../../util')
1+
const util = require('../../../util')
22
const customersController = require('dev-portal-common/customers-controller')
3-
const { generateRequestContext, generateResponseContext } = require('../../../setup-jest')
3+
const { generateRequestContext, generateResponseContext } = require('../../../../setup-jest')
44

5-
const accounts = require('../../routes/accounts')
5+
const accounts = require('../../../routes/admin/accounts')
66

7-
describe('GET /accounts', () => {
7+
describe('GET /admin/accounts', () => {
88
const originalListPendingRequestAccounts = customersController.listPendingRequestAccounts
99
const originalListPendingInviteAccounts = customersController.listPendingInviteAccounts
1010
const originalListAdminAccounts = customersController.listAdminAccounts
@@ -162,7 +162,7 @@ describe('GET /accounts', () => {
162162
})
163163
})
164164

165-
describe('POST /accounts', () => {
165+
describe('POST /admin/accounts', () => {
166166
const originalCreateAccountInvite = customersController.createAccountInvite
167167

168168
afterEach(() => {
@@ -234,7 +234,7 @@ describe('POST /accounts', () => {
234234
})
235235
})
236236

237-
describe('DELETE /accounts/:userId', () => {
237+
describe('DELETE /admin/accounts/:userId', () => {
238238
const originalDeleteAccountByUserId = customersController.deleteAccountByUserId
239239

240240
afterEach(() => {

‎lambdas/backend/index.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,13 @@ app.put('/admin/catalog/:id/sdkGeneration', wrapError(require('./routes/admin/ca
5252
app.delete('/admin/catalog/:id/sdkGeneration', wrapError(require('./routes/admin/catalog/sdkGeneration').delete))
5353

5454
// Account management APIs
55-
// app.get('/accounts', handlers.getAccounts)
56-
app.get('/accounts', wrapError(require('./routes/accounts').get))
57-
// app.post('/accounts', handlers.createInvite)
58-
app.post('/accounts', wrapError(require('./routes/accounts').post))
59-
// app.put('/accounts/resendInvite', handlers.resendInvite)
60-
app.put('/accounts/resendInvite', wrapError(require('./routes/accounts/resendInvite').put))
61-
// app.put('/accounts/:userId/approveRequest', handlers.approveRequest)
62-
app.put('/accounts/:userId/approveRequest', wrapError(require('./routes/accounts/approveRequest').put))
63-
// app.put('/accounts/:userId/denyRequest', handlers.denyRequest)
64-
app.put('/accounts/:userId/denyRequest', wrapError(require('./routes/accounts/denyRequest').put))
65-
// app.put('/accounts/:userId/promoteToAdmin', handlers.promoteAccount)
66-
app.put('/accounts/:userId/promoteToAdmin', wrapError(require('./routes/accounts/promoteToAdmin').put))
67-
// app.delete('/accounts/:userId', handlers.deleteAccount)
68-
app.delete('/accounts/:userId', wrapError(require('./routes/accounts').delete))
55+
app.get('/admin/accounts', wrapError(require('./routes/admin/accounts').get))
56+
app.post('/admin/accounts', wrapError(require('./routes/admin/accounts').post))
57+
app.put('/admin/accounts/resendInvite', wrapError(require('./routes/accounts/resendInvite').put))
58+
app.put('/admin/accounts/:userId/approveRequest', wrapError(require('./routes/accounts/approveRequest').put))
59+
app.put('/admin/accounts/:userId/denyRequest', wrapError(require('./routes/accounts/denyRequest').put))
60+
app.put('/admin/accounts/:userId/promoteToAdmin', wrapError(require('./routes/accounts/promoteToAdmin').put))
61+
app.delete('/admin/accounts/:userId', wrapError(require('./routes/admin/accounts').delete))
6962

7063
const server = awsServerlessExpress.createServer(app)
7164

‎lambdas/backend/routes/accounts.js renamed to ‎lambdas/backend/routes/admin/accounts.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
'use strict'
22

33
const customersController = require('dev-portal-common/customers-controller')
4-
const util = require('../util')
4+
const util = require('../../util')
55

66
exports.get = async (req, res) => {
7-
console.log('GET /accounts')
7+
console.log('GET /admin/accounts')
88

99
let accounts
1010

1111
switch (req.query.filter) {
12-
case 'pendingRequest': accounts = await customersController.listPendingRequestAccounts(); break
12+
// Not implemented yet
13+
// case 'pendingRequest': accounts = await customersController.listPendingRequestAccounts(); break
1314
case 'pendingInvite': accounts = await customersController.listPendingInviteAccounts(); break
1415
case 'admin': accounts = await customersController.listAdminAccounts(); break
1516
case 'registered': accounts = await customersController.listRegisteredAccounts(); break
@@ -25,7 +26,7 @@ exports.get = async (req, res) => {
2526

2627
exports.post = async (req, res) => {
2728
const inviterUserId = util.getCognitoIdentityId(req)
28-
console.log(`POST /accounts for Cognito ID: ${inviterUserId}`)
29+
console.log(`POST /admin/accounts for Cognito ID: ${inviterUserId}`)
2930

3031
console.log(JSON.stringify(req.apiGateway.event, null, 2))
3132

@@ -44,7 +45,7 @@ exports.post = async (req, res) => {
4445
}
4546

4647
exports.delete = async (req, res) => {
47-
console.log('DELETE /accounts/:userId')
48+
console.log('DELETE /admin/accounts/:userId')
4849

4950
const userId = req.params.userId
5051
if (typeof userId !== 'string' || userId === '') {

0 commit comments

Comments
 (0)