Skip to content
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

Jump to bottom

Fix authclient dao #1336

Merged
merged 6 commits into from
Oct 20, 2021
Merged

Fix authclient dao #1336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e324d82
Fix update method
heggert Oct 20, 2021
f6faffe
Provide auth client test
heggert Oct 20, 2021
aa62719
Bump service version
heggert Oct 20, 2021
4b2d646
Add test
heggert Oct 20, 2021
894ca82
Test base schema updates
heggert Oct 20, 2021
26a8ea6
Fix route
heggert Oct 20, 2021
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
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion services/secret-service/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "secret-service",
"version": "2.7.1",
"version": "2.8.0",
"description": "Service to manage Keys/Tokens of external services",
"main": "index.js",
"author": "Basaas GmbH",
Expand Down
22 changes: 4 additions & 18 deletions services/secret-service/src/dao/auth-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ const Logger = require('@basaas/node-logger');
const { Event, EventBusManager, events } = require('@openintegrationhub/event-bus');
const AuthClient = require('../model/AuthClient');

const conf = require('./../conf');
const conf = require('../conf');

const log = Logger.getLogger(`${conf.log.namespace}/authClientDao`);
const auditLog = Logger.getAuditLogger(`${conf.log.namespace}/authClientDao`);

module.exports = {

Expand Down Expand Up @@ -40,13 +39,10 @@ module.exports = {
return await AuthClient.full.findOne(query).lean();
},

async update({ id, data, partialUpdate = false }) {
const updateOperation = partialUpdate ? { $set: data } : data;


const result = await AuthClient.full.findOneAndUpdate({
async update({ id, data }) {
const result = await AuthClient[data.type].findOneAndUpdate({
_id: id,
}, updateOperation, {
}, data, {
new: true,
}).lean();

Expand Down Expand Up @@ -109,14 +105,4 @@ module.exports = {
}
}
},

// async delete({ id }) {
// await AuthClient.full.deleteOne({ _id: id });
// log.info('deleted.client', { id });
// },

// async deleteAll(query) {
// await AuthClient.full.deleteMany(query);
// auditLog.info('authClient.deleteAll', { data: { ...query } });
// },
};
66 changes: 66 additions & 0 deletions services/secret-service/src/dao/auth-client.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
const {
OA2_AUTHORIZATION_CODE,
} = require('../constant').AUTH_TYPE;
const AuthClientDAO = require('./auth-client');
const Server = require('../server');
const conf = require('../conf');

let port;
let server;
let authClient;

describe('AuthClientDAO', () => {
beforeAll(async () => {
conf.crypto.isDisabled = false;
port = 5115;
server = new Server({
mongoDbConnection: global.__MONGO_URI__.replace('changeme', 'auth-client-dao'),
port,
});
await server.start();
});

afterAll(async () => {
await server.stop();
});

test('create auth client', async () => {
const data = {
type: OA2_AUTHORIZATION_CODE,
name: 'oAuth2',
clientId: 'string',
clientSecret: 'string',
redirectUri: '/dev/null',
endpoints: {
auth: 'http://',
token: 'http://',
userinfo: 'http://',
},
mappings: {
externalId: {
source: 'id_token',
key: 'sub',
},
},
};

authClient = await AuthClientDAO.create(data);

expect(authClient.type).toEqual(OA2_AUTHORIZATION_CODE);
});

test('update auth client', async () => {
const update = {
name: 'foobar',
type: OA2_AUTHORIZATION_CODE,
clientId: 'string2',
clientSecret: 'string2',
};

authClient = await AuthClientDAO.update({ id: authClient._id, data: update });

expect(authClient.clientId).toEqual('string2');
expect(authClient.clientSecret).toEqual('string2');
expect(authClient.name).toEqual('foobar');
});
});
8 changes: 6 additions & 2 deletions services/secret-service/src/dao/secret.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const Logger = require('@basaas/node-logger');
const moment = require('moment');
const mongoose = require('mongoose');
const pull = require('lodash/pull');
const { Event, EventBusManager, events } = require('@openintegrationhub/event-bus');
const crypto = require('../util/crypto');
Expand Down Expand Up @@ -236,12 +237,15 @@ module.exports = {
id,
authClientId,
) {
if (typeof authClientId === 'string') {
authClientId = mongoose.Types.ObjectId(authClientId);
}

return await Secret.full.find({
'value.authClientId': authClientId,
'owners.id': id,
},
'name type value.authClientId value.scope value.expires value.externalId owners currentError',
);
'name type value.authClientId value.scope value.expires value.externalId owners currentError');
},

async findByExternalId(externalId, authClientId) {
Expand Down
70 changes: 70 additions & 0 deletions services/secret-service/src/dao/secret.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ const { ENCRYPT, DECRYPT } = require('../constant').CRYPTO.METHODS;
const {
SIMPLE, OA2_AUTHORIZATION_CODE, MIXED, SESSION_AUTH,
} = require('../constant').AUTH_TYPE;

const {
ENTITY_TYPE,
} = require('../constant');
const AuthClientDAO = require('./auth-client');
const SecretDAO = require('./secret');
const Server = require('../server');
const conf = require('../conf');
const tokens = require('../test/tokens');

let port;
let server;
Expand Down Expand Up @@ -461,4 +466,69 @@ describe('SecretDAO', () => {
}, key),
).resolves.not.toThrow();
});

test('findByAuthClientId with ownerId', async () => {
const key = 'sshhhh';
const accessToken = 'my access_token';
const refreshToken = 'my refresh_token';
const secretData = {
name: 'secret',
type: OA2_AUTHORIZATION_CODE,
owners: [
{
id: tokens.userToken1.value.sub,
type: ENTITY_TYPE.USER,
},
{
id: tokens.userToken1.value.tenant,
type: ENTITY_TYPE.TENANT,
},
],
value: {
authClientId: authClient._id,
accessToken,
refreshToken,
scope: 'asd',
externalId: 'asd',
expires: '2019-01-28T14:01:21.808Z',
},
};

await SecretDAO.create({
...secretData,
name: 'secret1',
}, key);

await SecretDAO.create({
...secretData,
name: 'secret2',
}, key);

await SecretDAO.create({
...secretData,
name: 'secret3',
owners: [
{
id: tokens.userToken2.value.sub,
type: ENTITY_TYPE.USER,
},
{
id: tokens.userToken2.value.tenant,
type: ENTITY_TYPE.TENANT,
},
],
}, key);

let secrets = await SecretDAO.findByAuthClient(tokens.userToken1.value.sub, authClient._id);
expect(secrets.length).toEqual(2);

secrets = await SecretDAO.findByAuthClient(tokens.userToken1.value.tenant, authClient._id);
expect(secrets.length).toEqual(2);

secrets = await SecretDAO.findByAuthClient(tokens.userToken2.value.sub, authClient._id);
expect(secrets.length).toEqual(1);

secrets = await SecretDAO.findByAuthClient(tokens.userToken2.value.tenant, authClient._id);
expect(secrets.length).toEqual(1);
});
});
5 changes: 2 additions & 3 deletions services/secret-service/src/route/auth-clients/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,10 @@ class AuthClientRouter {
});

this.router.get('/:id/secrets', /* userIsOwnerOfAuthClient, */ async (req, res, next) => {
const authClient = await AuthClientDAO.findOne({ _id: req.params.id });
try {
const secrets = findByAuthClient(
const secrets = await findByAuthClient(
req.user.sub,
authClient._id,
req.params.id,
);
res.send({
data: secrets,
Expand Down
76 changes: 76 additions & 0 deletions services/secret-service/src/route/auth-clients/index.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ const conf = require('../../conf');
const { ENTITY_TYPE } = require('../../constant');
const Server = require('../../server');
const token = require('../../test/tokens');
const AuthClientDAO = require('../../dao/auth-client');
const SecretDAO = require('../../dao/secret');
const tokens = require('../../test/tokens');

const {
OA1_TWO_LEGGED, OA2_AUTHORIZATION_CODE, SESSION_AUTH,
} = require('../../constant').AUTH_TYPE;
Expand Down Expand Up @@ -337,4 +341,76 @@ describe('auth-clients', () => {

expect(meta.total).toBe(0);
});

test('Get all secrets by auth client', async () => {
const key = 'sshhhh';
const accessToken = 'my access_token';
const refreshToken = 'my refresh_token';

const data = {
type: OA2_AUTHORIZATION_CODE,
name: 'oAuth2',
clientId: 'string',
clientSecret: 'string',
redirectUri: '/dev/null',
endpoints: {
auth: 'http://',
token: 'http://',
userinfo: 'http://',
},
mappings: {
externalId: {
source: 'id_token',
key: 'sub',
},
},
};

const authClient = await AuthClientDAO.create(data);

const secretData = {
name: 'secret',
type: OA2_AUTHORIZATION_CODE,
owners: [
{
id: tokens.userToken1.value.sub,
type: ENTITY_TYPE.USER,
},
{
id: tokens.userToken1.value.tenant,
type: ENTITY_TYPE.TENANT,
},
],
value: {
authClientId: authClient._id,
accessToken,
refreshToken,
scope: 'asd',
externalId: 'asd',
expires: '2019-01-28T14:01:21.808Z',
},
};

await SecretDAO.create({
...secretData,
name: 'secret1',
}, key);

await SecretDAO.create({
...secretData,
name: 'secret2',
}, key);

let secrets = (await request.get(`/auth-clients/${authClient._id}/secrets`)
.set(...global.userAuth1)
.expect(200)).body.data;

expect(secrets.length).toEqual(2);

secrets = (await request.get(`/auth-clients/${authClient._id}/secrets`)
.set(...global.userAuth2)
.expect(200)).body.data;

expect(secrets.length).toEqual(0);
});
});