feat: lemmy

Author: nevo-david

apps/backend/src/api/api.module.ts

@@ -14,7 +14,6 @@ import { SettingsController } from '@gitroom/backend/api/routes/settings.control
 import { PostsController } from '@gitroom/backend/api/routes/posts.controller';
 import { MediaController } from '@gitroom/backend/api/routes/media.controller';
 import { UploadModule } from '@gitroom/nestjs-libraries/upload/upload.module';
-import { CommentsController } from '@gitroom/backend/api/routes/comments.controller';
 import { BillingController } from '@gitroom/backend/api/routes/billing.controller';
 import { NotificationsController } from '@gitroom/backend/api/routes/notifications.controller';
 import { MarketplaceController } from '@gitroom/backend/api/routes/marketplace.controller';
@@ -26,6 +25,7 @@ import { CopilotController } from '@gitroom/backend/api/routes/copilot.controlle
 import { AgenciesController } from '@gitroom/backend/api/routes/agencies.controller';
 import { PublicController } from '@gitroom/backend/api/routes/public.controller';
 import { RootController } from '@gitroom/backend/api/routes/root.controller';
+import { TrackService } from '@gitroom/nestjs-libraries/track/track.service';
 
 const authenticatedController = [
   UsersController,
@@ -34,7 +34,6 @@ const authenticatedController = [
   SettingsController,
   PostsController,
   MediaController,
-  CommentsController,
   BillingController,
   NotificationsController,
   MarketplaceController,
@@ -63,6 +62,7 @@ const authenticatedController = [
     PermissionsService,
     CodesService,
     IntegrationManager,
+    TrackService,
   ],
   get exports() {
     return [...this.imports, ...this.providers];

apps/backend/src/api/routes/analytics.controller.ts

@@ -15,17 +15,13 @@ import { StarsListDto } from '@gitroom/nestjs-libraries/dtos/analytics/stars.lis
 import { ApiTags } from '@nestjs/swagger';
 import { IntegrationService } from '@gitroom/nestjs-libraries/database/prisma/integrations/integration.service';
 import { IntegrationManager } from '@gitroom/nestjs-libraries/integrations/integration.manager';
-import { ioRedis } from '@gitroom/nestjs-libraries/redis/redis.service';
-import { RefreshToken } from '@gitroom/nestjs-libraries/integrations/social.abstract';
-import { timer } from '@gitroom/helpers/utils/timer';
 
 @ApiTags('Analytics')
 @Controller('/analytics')
 export class AnalyticsController {
   constructor(
     private _starsService: StarsService,
     private _integrationService: IntegrationService,
-    private _integrationManager: IntegrationManager
   ) {}
   @Get('/')
   async getStars(@GetOrgFromRequest() org: Organization) {

apps/backend/src/api/routes/auth.controller.ts

@@ -1,4 +1,13 @@
-import { Body, Controller, Get, Param, Post, Req, Res } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Ip,
+  Param,
+  Post,
+  Req,
+  Res,
+} from '@nestjs/common';
 import { Response, Request } from 'express';
 
 import { CreateOrgUserDto } from '@gitroom/nestjs-libraries/dtos/auth/create.org.user.dto';
@@ -9,6 +18,8 @@ import { ForgotPasswordDto } from '@gitroom/nestjs-libraries/dtos/auth/forgot.pa
 import { ApiTags } from '@nestjs/swagger';
 import { getCookieUrlFromDomain } from '@gitroom/helpers/subdomain/subdomain.management';
 import { EmailService } from '@gitroom/nestjs-libraries/services/email.service';
+import { RealIP } from 'nestjs-real-ip';
+import { UserAgent } from '@gitroom/nestjs-libraries/user/user.agent';
 
 @ApiTags('Auth')
 @Controller('/auth')
@@ -21,7 +32,9 @@ export class AuthController {
   async register(
     @Req() req: Request,
     @Body() body: CreateOrgUserDto,
-    @Res({ passthrough: true }) response: Response
+    @Res({ passthrough: true }) response: Response,
+    @RealIP() ip: string,
+    @UserAgent() userAgent: string
   ) {
     try {
       const getOrgFromCookie = this._authService.getOrgFromCookie(
@@ -31,10 +44,13 @@ export class AuthController {
       const { jwt, addedOrg } = await this._authService.routeAuth(
         body.provider,
         body,
+        ip,
+        userAgent,
         getOrgFromCookie
       );
 
-      const activationRequired = body.provider === 'LOCAL' && this._emailService.hasProvider();
+      const activationRequired =
+        body.provider === 'LOCAL' && this._emailService.hasProvider();
 
       if (activationRequired) {
         response.header('activate', 'true');
@@ -73,7 +89,9 @@ export class AuthController {
   async login(
     @Req() req: Request,
     @Body() body: LoginUserDto,
-    @Res({ passthrough: true }) response: Response
+    @Res({ passthrough: true }) response: Response,
+    @RealIP() ip: string,
+    @UserAgent() userAgent: string
   ) {
     try {
       const getOrgFromCookie = this._authService.getOrgFromCookie(
@@ -83,6 +101,8 @@ export class AuthController {
       const { jwt, addedOrg } = await this._authService.routeAuth(
         body.provider,
         body,
+        ip,
+        userAgent,
         getOrgFromCookie
       );
 

apps/backend/src/api/routes/billing.controller.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { Body, Controller, Get, Param, Post, Req } from '@nestjs/common';
 import { SubscriptionService } from '@gitroom/nestjs-libraries/database/prisma/subscriptions/subscription.service';
 import { StripeService } from '@gitroom/nestjs-libraries/services/stripe.service';
 import { GetOrgFromRequest } from '@gitroom/nestjs-libraries/user/org.from.request';
@@ -7,6 +7,7 @@ import { BillingSubscribeDto } from '@gitroom/nestjs-libraries/dtos/billing/bill
 import { ApiTags } from '@nestjs/swagger';
 import { GetUserFromRequest } from '@gitroom/nestjs-libraries/user/user.from.request';
 import { NotificationService } from '@gitroom/nestjs-libraries/database/prisma/notifications/notification.service';
+import { Request } from 'express';
 
 @ApiTags('Billing')
 @Controller('/billing')
@@ -23,19 +24,22 @@ export class BillingController {
     @Param('id') body: string
   ) {
     return {
-      exists: !!(await this._subscriptionService.checkSubscription(
+      status: await this._stripeService.checkSubscription(
         org.id,
         body
-      )),
+      ),
     };
   }
 
   @Post('/subscribe')
   subscribe(
     @GetOrgFromRequest() org: Organization,
-    @Body() body: BillingSubscribeDto
+    @GetUserFromRequest() user: User,
+    @Body() body: BillingSubscribeDto,
+    @Req() req: Request
   ) {
-    return this._stripeService.subscribe(org.id, body);
+    const uniqueId = req?.cookies?.track;
+    return this._stripeService.subscribe(uniqueId, org.id, user.id, body, org.allowTrial);
   }
 
   @Get('/portal')
@@ -57,12 +61,14 @@ export class BillingController {
   @Post('/cancel')
   async cancel(
     @GetOrgFromRequest() org: Organization,
+    @GetUserFromRequest() user: User,
     @Body() body: { feedback: string }
   ) {
     await this._notificationService.sendEmail(
       process.env.EMAIL_FROM_ADDRESS,
       'Subscription Cancelled',
-      `Organization ${org.name} has cancelled their subscription because: ${body.feedback}`
+      `Organization ${org.name} has cancelled their subscription because: ${body.feedback}`,
+      user.email
     );
 
     return this._stripeService.setToCancel(org.id);

apps/backend/src/api/routes/comments.controller.ts

@@ -1,5 +1,13 @@
 import {
-  Body, Controller, Delete, Get, Param, Post, Put, Query, UseFilters
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Post,
+  Put,
+  Query,
+  UseFilters,
 } from '@nestjs/common';
 import { ioRedis } from '@gitroom/nestjs-libraries/redis/redis.service';
 import { ConnectIntegrationDto } from '@gitroom/nestjs-libraries/dtos/integrations/connect.integration.dto';
@@ -42,6 +50,11 @@ export class IntegrationsController {
     return this._integrationManager.getAllIntegrations();
   }
 
+  @Get('/:identifier/internal-plugs')
+  getInternalPlugs(@Param('identifier') identifier: string) {
+    return this._integrationManager.getInternalPlugs(identifier);
+  }
+
   @Get('/customers')
   getCustomers(@GetOrgFromRequest() org: Organization) {
     return this._integrationService.customers(org.id);
@@ -66,11 +79,7 @@ export class IntegrationsController {
     @Param('id') id: string,
     @Body() body: { name: string }
   ) {
-    return this._integrationService.updateOnCustomerName(
-      org.id,
-      id,
-      body.name
-    );
+    return this._integrationService.updateOnCustomerName(org.id, id, body.name);
   }
 
   @Get('/list')
@@ -97,11 +106,24 @@ export class IntegrationsController {
           changeProfilePicture: !!findIntegration?.changeProfilePicture,
           changeNickName: !!findIntegration?.changeNickname,
           customer: p.customer,
+          additionalSettings: p.additionalSettings || '[]',
         };
       }),
     };
   }
 
+  @Post('/:id/settings')
+  async updateProviderSettings(
+    @GetOrgFromRequest() org: Organization,
+    @Param('id') id: string,
+    @Body('additionalSettings') body: string
+  ) {
+    if (typeof body !== 'string') {
+      throw new Error('Invalid body');
+    }
+
+    await this._integrationService.updateProviderSettings(org.id, id, body);
+  }
   @Post('/:id/nickname')
   async setNickname(
     @GetOrgFromRequest() org: Organization,
@@ -242,19 +264,22 @@ export class IntegrationsController {
           const load = await integrationProvider[body.name](
             getIntegration.token,
             body.data,
-            getIntegration.internalId
+            getIntegration.internalId,
+            getIntegration
           );
 
           return load;
         } catch (err) {
           if (err instanceof RefreshToken) {
-            const { accessToken, refreshToken, expiresIn } =
+            const { accessToken, refreshToken, expiresIn, additionalSettings } =
               await integrationProvider.refreshToken(
                 getIntegration.refreshToken
               );
 
             if (accessToken) {
               await this._integrationService.createOrUpdateIntegration(
+                additionalSettings,
+                !!integrationProvider.oneTimeToken,
                 getIntegration.organizationId,
                 getIntegration.name,
                 getIntegration.picture!,
@@ -336,6 +361,8 @@ export class IntegrationsController {
     }
 
     return this._integrationService.createOrUpdateIntegration(
+      undefined,
+      true,
       org.id,
       name,
       picture,
@@ -402,6 +429,7 @@ export class IntegrationsController {
       name,
       picture,
       username,
+      additionalSettings,
       // eslint-disable-next-line no-async-promise-executor
     } = await new Promise<AuthTokenDetails>(async (res) => {
       const auth = await integrationProvider.authenticate(
@@ -421,6 +449,7 @@ export class IntegrationsController {
           name: '',
           picture: '',
           username: '',
+          additionalSettings: [],
         });
       }
 
@@ -444,7 +473,7 @@ export class IntegrationsController {
       throw new NotEnoughScopes('Invalid API key');
     }
 
-    if (refresh && id !== refresh) {
+    if (refresh && String(id) !== String(refresh)) {
       throw new NotEnoughScopes(
         'Please refresh the channel that needs to be refreshed'
       );
@@ -459,6 +488,8 @@ export class IntegrationsController {
       }
     }
     return this._integrationService.createOrUpdateIntegration(
+      additionalSettings,
+      !!integrationProvider.oneTimeToken,
       org.id,
       validName.trim(),
       picture,