address review comments

zeeshanakram3 · zeeshanakram3 · commit 2aad4648c398 · 2022-10-20T00:32:17.000+05:00
diff --git a/packages/api/api-spec.json b/packages/api/api-spec.json
@@ -101,7 +101,7 @@
         ]
       }
     },
-    "/channels/yt-syncing/{joystreamChannelId}": {
+    "/channels/{joystreamChannelId}/ingest": {
       "put": {
         "operationId": "ChannelsController_updateChannel",
         "summary": "",
@@ -150,7 +150,7 @@
         "description": "Authenticated endpoint to suspend given channel/s from YPP program",
         "parameters": [
           {
-            "name": "ypp_owner_key",
+            "name": "authorization",
             "required": true,
             "in": "header",
             "schema": {
diff --git a/packages/api/src/channels/channels.controller.ts b/packages/api/src/channels/channels.controller.ts
@@ -12,6 +12,7 @@ import {
   Post,
   Put,
   UnauthorizedException,
+  UseGuards,
 } from '@nestjs/common'
 import { ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger'
 import { Channel, User } from '@youtube-sync/domain'
@@ -86,7 +87,7 @@ export class ChannelsController {
     }
   }
 
-  @Put('/yt-syncing/:joystreamChannelId')
+  @Put(':joystreamChannelId/ingest')
   @ApiBody({ type: UpdateChannelDto })
   @ApiResponse({ type: ChannelDto })
   @ApiOperation({
@@ -105,13 +106,15 @@ export class ChannelsController {
   @Put('/suspend')
   @ApiBody({ type: SuspendChannelDto, isArray: true })
   @ApiResponse({ type: ChannelDto, isArray: true })
+  @UseGuards()
   @ApiOperation({
     description: `Authenticated endpoint to suspend given channel/s from YPP program`,
   })
   async suspendChannels(
-    @Headers('ypp_owner_key') yppOwnerKey: string,
+    @Headers('authorization') authorizationHeader: string,
     @Body(new ParseArrayPipe({ items: SuspendChannelDto, whitelist: true })) channels: SuspendChannelDto[]
   ) {
+    const yppOwnerKey = authorizationHeader.split(' ')[1]
     if (yppOwnerKey !== process.env.YPP_OWNER_KEY) {
       throw new UnauthorizedException('Invalid YPP owner key')
     }
@@ -124,8 +127,8 @@ export class ChannelsController {
         if (isSuspended) {
           this.channelsService.update({ ...channel, isSuspended, shouldBeIngested: false })
         } else {
-          // if channel suspension is revoked then its YT ingestion/syncing should be resumed
-          this.channelsService.update({ ...channel, isSuspended, shouldBeIngested: true })
+          // if channel suspension is revoked then its YT ingestion/syncing should not be resumed
+          this.channelsService.update({ ...channel, isSuspended })
         }
       }
     } catch (error) {

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@`
`101`	`101`	`]`
`102`	`102`	`}`
`103`	`103`	`},`
`104`		`- "/channels/yt-syncing/{joystreamChannelId}": {`
	`104`	`+ "/channels/{joystreamChannelId}/ingest": {`
`105`	`105`	`"put": {`
`106`	`106`	`"operationId": "ChannelsController_updateChannel",`
`107`	`107`	`"summary": "",`
`@@ -150,7 +150,7 @@`
`150`	`150`	`"description": "Authenticated endpoint to suspend given channel/s from YPP program",`
`151`	`151`	`"parameters": [`
`152`	`152`	`{`
`153`		`- "name": "ypp_owner_key",`
	`153`	`+ "name": "authorization",`
`154`	`154`	`"required": true,`
`155`	`155`	`"in": "header",`
`156`	`156`	`"schema": {`