Merge pull request #334 from TogetherCrew/upv1

User Permission V1
TogetherCrew · Apr 4, 2024 · 68f517f · 68f517f
2 parents bb8d653 + 60ff54e
commit 68f517f
Show file tree

Hide file tree

Showing 44 changed files with 1,015 additions and 311 deletions.
diff --git a/__tests__/fixtures/community.fixture.ts b/__tests__/fixtures/community.fixture.ts
@@ -1,28 +1,60 @@
 import { Types } from 'mongoose';
-import { Community } from '@togethercrew.dev/db';
+import { Community, ICommunityRoles } from '@togethercrew.dev/db';
 
 interface CommunityFixture {
   _id: Types.ObjectId;
   name: string;
   avatarURL?: string;
   users?: Types.ObjectId[];
   platforms?: Types.ObjectId[];
+  roles?: ICommunityRoles[];
 }
 
 export const communityOne: CommunityFixture = {
   _id: new Types.ObjectId(),
   name: 'Community Alpha',
   avatarURL: 'path/to/avatar1.png',
+  roles: [
+    {
+      roleType: 'admin',
+      source: {
+        platform: 'discord',
+        identifierType: 'member',
+        identifierValues: ['987654321'],
+        platformId: new Types.ObjectId(),
+      },
+    },
+    {
+      roleType: 'view',
+      source: {
+        platform: 'discord',
+        identifierType: 'member',
+        identifierValues: ['987654321'],
+        platformId: new Types.ObjectId(),
+      },
+    },
+    {
+      roleType: 'admin',
+      source: {
+        platform: 'discord',
+        identifierType: 'role',
+        identifierValues: ['652345789987654321'],
+        platformId: new Types.ObjectId(),
+      },
+    },
+  ],
 };
 
 export const communityTwo: CommunityFixture = {
   _id: new Types.ObjectId(),
   name: 'Community Beta',
+  roles: [],
 };
 
 export const communityThree: CommunityFixture = {
   _id: new Types.ObjectId(),
   name: 'Community Teta',
+  roles: [],
 };
 
 export const insertCommunities = async function <Type>(communities: Array<Type>) {

diff --git a/__tests__/fixtures/platform.fixture.ts b/__tests__/fixtures/platform.fixture.ts
@@ -34,6 +34,7 @@ export const platformThree: PlatformFixture = {
   metadata: {
     id: '681946187490000802',
   },
+  disconnectedAt: null,
 };
 
 export const platformFour: PlatformFixture = {

diff --git a/__tests__/fixtures/token.fixture.ts b/__tests__/fixtures/token.fixture.ts
@@ -2,7 +2,7 @@ import moment from 'moment';
 import config from '../../src/config';
 import { tokenTypes } from '../../src/config/tokens';
 import { tokenService } from '../../src/services';
-import { userOne, userTwo } from './user.fixture';
+import { userOne, userTwo, userThree } from './user.fixture';
 
 const accessTokenExpires = moment().add(config.jwt.accessExpirationMinutes, 'minutes');
 export const userOneAccessToken = tokenService.generateToken(
@@ -15,3 +15,9 @@ export const userTwoAccessToken = tokenService.generateToken(
   accessTokenExpires,
   tokenTypes.ACCESS,
 );
+
+export const userThreeAccessToken = tokenService.generateToken(
+  { ...userThree, id: userThree._id },
+  accessTokenExpires,
+  tokenTypes.ACCESS,
+);
diff --git a/__tests__/fixtures/user.fixture.ts b/__tests__/fixtures/user.fixture.ts
@@ -11,18 +11,18 @@ interface UserFixture {
 
 export const userOne: UserFixture = {
   _id: new Types.ObjectId(),
-  discordId: crypto.randomBytes(20).toString('hex'),
+  discordId: '123456789',
   email: '[email protected]',
 };
 
 export const userTwo: UserFixture = {
   _id: new Types.ObjectId(),
-  discordId: crypto.randomBytes(20).toString('hex'),
+  discordId: '987654321',
 };
 
 export const userThree: UserFixture = {
   _id: new Types.ObjectId(),
-  discordId: crypto.randomBytes(20).toString('hex'),
+  discordId: '555555555',
 };
 
 export const insertUsers = async function <Type>(users: Array<Type>) {

diff --git a/__tests__/integration/announcement.test.ts b/__tests__/integration/announcement.test.ts
@@ -17,11 +17,10 @@
 // import { DatabaseManager } from '@togethercrew.dev/db';
 // import { insertPlatforms, platformOne } from '../fixtures/platform.fixture';
 // import { discordGuildMember1, discordGuildMember2, insertGuildMembers } from '../fixtures/discord/guildMember.fixture';
-// import platform from '../../src/middlewares/platform';
 
 // setupTestDB();
 
-// describe('Community routes', () => {
+// describe('Announcement routes', () => {
 //   const announcementOne = generatePublicDiscordAnnouncement(communityOne._id, platformOne._id, [
 //     discordChannel4.channelId,
 //     discordChannel3.channelId,
@@ -40,10 +39,6 @@
 //     connection = await DatabaseManager.getInstance().getTenantDb(platformOne.metadata?.id);
 //   });
 
-//   afterAll(async () => {
-//     await connection.close();
-//   });
-
 //   beforeEach(async () => {
 //     cleanUpTenantDatabases();
 //     userOne.communities = [communityOne._id, communityTwo._id];