feat: Move api token authentication to .ee files
This commit is contained in:
27
packages/backend/src/helpers/authenticate-api-token.ee.js
Normal file
27
packages/backend/src/helpers/authenticate-api-token.ee.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import ApiToken from '../models/api-token.ee.js';
|
||||||
|
|
||||||
|
export const isApiTokenAuthenticated = async (request) => {
|
||||||
|
const token = request.headers['x-api-token'];
|
||||||
|
|
||||||
|
if (token == null) return false;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const apiToken = await ApiToken.query().findOne({
|
||||||
|
token,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (apiToken == null) return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const authenticateApiToken = async (request, response, next) => {
|
||||||
|
if (await isApiTokenAuthenticated(request)) {
|
||||||
|
next();
|
||||||
|
} else {
|
||||||
|
return response.status(401).end();
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { isApiTokenAuthenticated } from './authenticate-api-token.ee.js';
|
||||||
|
import { createApiToken } from '../../test/factories/api-token.js';
|
||||||
|
|
||||||
|
describe('isApiTokenAuthenticated', () => {
|
||||||
|
it('should return false if no token is provided', async () => {
|
||||||
|
const req = { headers: {} };
|
||||||
|
expect(await isApiTokenAuthenticated(req)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return false if token is invalid', async () => {
|
||||||
|
const req = { headers: { 'x-api-token': 'invalidToken' } };
|
||||||
|
expect(await isApiTokenAuthenticated(req)).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should return true if token is valid', async () => {
|
||||||
|
const apiToken = await createApiToken();
|
||||||
|
|
||||||
|
const req = { headers: { 'x-api-token': apiToken.token } };
|
||||||
|
expect(await isApiTokenAuthenticated(req)).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import User from '../models/user.js';
|
import User from '../models/user.js';
|
||||||
import AccessToken from '../models/access-token.js';
|
import AccessToken from '../models/access-token.js';
|
||||||
import ApiToken from '../models/api-token.ee.js';
|
|
||||||
|
|
||||||
export const isAuthenticated = async (req) => {
|
export const isAuthenticated = async (req) => {
|
||||||
const token = req.headers['authorization'];
|
const token = req.headers['authorization'];
|
||||||
@@ -47,29 +46,3 @@ export const authenticateUser = async (request, response, next) => {
|
|||||||
return response.status(401).end();
|
return response.status(401).end();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export const isApiTokenAuthenticated = async (request) => {
|
|
||||||
const token = request.headers['x-api-token'];
|
|
||||||
|
|
||||||
if (token == null) return false;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const apiToken = await ApiToken.query().findOne({
|
|
||||||
token,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (apiToken == null) return false;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (error) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const authenticateApiToken = async (request, response, next) => {
|
|
||||||
if (await isApiTokenAuthenticated(request)) {
|
|
||||||
next();
|
|
||||||
} else {
|
|
||||||
return response.status(401).end();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import { describe, it, expect } from 'vitest';
|
import { describe, it, expect } from 'vitest';
|
||||||
import { isAuthenticated, isApiTokenAuthenticated } from './authentication.js';
|
import { isAuthenticated } from './authentication.js';
|
||||||
import { createUser } from '../../test/factories/user.js';
|
import { createUser } from '../../test/factories/user.js';
|
||||||
import { createApiToken } from '../../test/factories/api-token.js';
|
|
||||||
import createAuthTokenByUserId from '../helpers/create-auth-token-by-user-id.js';
|
import createAuthTokenByUserId from '../helpers/create-auth-token-by-user-id.js';
|
||||||
|
|
||||||
describe('isAuthenticated', () => {
|
describe('isAuthenticated', () => {
|
||||||
@@ -32,22 +31,3 @@ describe('isAuthenticated', () => {
|
|||||||
expect(await isAuthenticated(req)).toBe(false);
|
expect(await isAuthenticated(req)).toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('isApiTokenAuthenticated', () => {
|
|
||||||
it('should return false if no token is provided', async () => {
|
|
||||||
const req = { headers: {} };
|
|
||||||
expect(await isApiTokenAuthenticated(req)).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return false if token is invalid', async () => {
|
|
||||||
const req = { headers: { 'x-api-token': 'invalidToken' } };
|
|
||||||
expect(await isApiTokenAuthenticated(req)).toBe(false);
|
|
||||||
});
|
|
||||||
|
|
||||||
it('should return true if token is valid', async () => {
|
|
||||||
const apiToken = await createApiToken();
|
|
||||||
|
|
||||||
const req = { headers: { 'x-api-token': apiToken.token } };
|
|
||||||
expect(await isApiTokenAuthenticated(req)).toBe(true);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|||||||
Reference in New Issue
Block a user