diff --git a/index.js b/index.js index c7a1f23..110e7f3 100644 --- a/index.js +++ b/index.js @@ -6,8 +6,7 @@ const { RtcTokenBuilder, RtcRole, RtmTokenBuilder, - RtmRole, -} = require('agora-access-token'); +} = require('agora-token'); // Load environment variables from .env file dotenv.config(); @@ -117,8 +116,6 @@ const generateRTMToken = (req, resp) => { if (!uid || uid === '') { return resp.status(400).json({ error: 'uid is required' }); } - // get role - let role = RtmRole.Rtm_User; // get the expire time let expireTime = req.query.expiry; if (!expireTime || expireTime === '') { @@ -130,12 +127,11 @@ const generateRTMToken = (req, resp) => { const currentTime = Math.floor(Date.now() / 1000); const privilegeExpireTime = currentTime + expireTime; // build the token - console.log(APP_ID, APP_CERTIFICATE, uid, role, privilegeExpireTime); + console.log(APP_ID, APP_CERTIFICATE, uid, privilegeExpireTime); const token = RtmTokenBuilder.buildToken( APP_ID, APP_CERTIFICATE, uid, - role, privilegeExpireTime ); // return the token @@ -195,7 +191,6 @@ const generateRTEToken = (req, resp) => { APP_ID, APP_CERTIFICATE, uid, - role, privilegeExpireTime ); // return the token diff --git a/index.test.js b/index.test.js index 433a70c..81c23bf 100644 --- a/index.test.js +++ b/index.test.js @@ -5,7 +5,7 @@ const { RtcRole, RtmTokenBuilder, RtmRole, -} = require('agora-access-token'); +} = require('agora-token'); // Mock environment variables process.env.APP_ID = 'test-app-id'; @@ -43,8 +43,8 @@ describe('Token Generation API', () => { it('should return error for missing channel', async () => { const response = await request(app).get('/rtc//publisher/uid/1234'); - expect(response.status).toBe(400); - expect(response.body).toEqual({ error: 'channel is required' }); + // '/rtc//publisher/uid/1234' does not match '/rtc/:channel/:role/:tokentype/:uid' + expect(response.status).toBe(404); }); // Test error handling for invalid role parameter @@ -75,8 +75,8 @@ describe('Token Generation API', () => { it('should return error for missing uid', async () => { const response = await request(app).get('/rtm/'); - expect(response.status).toBe(400); - expect(response.body).toEqual({ error: 'uid is required' }); + // '/rtm/' does not match '/rtm/:uid/' + expect(response.status).toBe(404); }); }); @@ -99,8 +99,7 @@ describe('Token Generation API', () => { it('should return error for missing channel', async () => { const response = await request(app).get('/rte//publisher/uid/1234'); - expect(response.status).toBe(400); - expect(response.body).toEqual({ error: 'channel is required' }); + expect(response.status).toBe(404); }); // Test error handling for invalid role parameter