From 73a7575b5629751dc7223db276989fb98591db11 Mon Sep 17 00:00:00 2001
From: Micheline Wu <69046953+michelinewu@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:38:11 -0400
Subject: [PATCH] Fix audience controls and generate stream key logic. (#5148)

* Fix audience controls and generate stream key logic.

* fix(build): strict nulls

---------

Co-authored-by: Adrian Perez <adrian@adrianperez.org>
---
 .../platforms/TiktokEditStreamInfo.tsx        | 15 +++++++------
 app/services/platforms/tiktok.ts              | 21 +++++++++++++------
 app/services/platforms/tiktok/api.ts          |  9 +++++++-
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/app/components-react/windows/go-live/platforms/TiktokEditStreamInfo.tsx b/app/components-react/windows/go-live/platforms/TiktokEditStreamInfo.tsx
index cca2a4e24cfc..cfaf8c0b00b3 100644
--- a/app/components-react/windows/go-live/platforms/TiktokEditStreamInfo.tsx
+++ b/app/components-react/windows/go-live/platforms/TiktokEditStreamInfo.tsx
@@ -45,7 +45,7 @@ export function TikTokEditStreamInfo(p: IPlatformComponentParams<'tiktok'>) {
         requiredFields={<div key="empty-tiktok" />}
       />
       {approved && <GameSelector key="optional" platform={'tiktok'} {...bind.game} />}
-      {!controls.disable && (
+      {approved && !controls.disable && (
         <RadioInput
           key="audience-ctrl"
           options={controls.types}
@@ -151,11 +151,14 @@ function TikTokButtons(p: { denied: boolean }) {
 
   return (
     <>
-      {!p.denied && (
-        <Button id="tiktok-locate-key" onClick={openProducer} style={{ marginBottom: '10px' }}>
-          {$t('Locate my Stream Key')}
-        </Button>
-      )}
+      <Button
+        id="tiktok-locate-key"
+        onClick={openProducer}
+        style={{ marginBottom: '10px', width: '100%' }}
+      >
+        {$t('Locate my Stream Key')}
+      </Button>
+
       <Button
         id="tiktok-application"
         onClick={() => {
diff --git a/app/services/platforms/tiktok.ts b/app/services/platforms/tiktok.ts
index 068ef9689edb..2cb1a5fb6752 100644
--- a/app/services/platforms/tiktok.ts
+++ b/app/services/platforms/tiktok.ts
@@ -414,6 +414,13 @@ export class TikTokService
         this.setAudienceControls(status.audience_controls_info);
       }
 
+      if (status?.application_status) {
+        // show prompt to apply if user has never applied
+        if (status.application_status.status === 'never-applied') {
+          return EPlatformCallResult.TikTokStreamScopeMissing;
+        }
+      }
+
       if (status?.user) {
         const scope = this.convertScope(status.reason);
         this.SET_USERNAME(status.user.username);
@@ -525,11 +532,12 @@ export class TikTokService
 
     // track the first date the user registered as denied so that after 30 days
     // they are prompted to reapply
-    if (status === EPlatformCallResult.TikTokStreamScopeMissing && !this.state.dateDenied) {
-      this.SET_DENIED_DATE(new Date().toISOString());
-    } else {
-      this.SET_DENIED_DATE();
-    }
+    // TODO: fix denied date logic
+    // if (status === EPlatformCallResult.TikTokStreamScopeMissing && !this.state.dateDenied) {
+    //   this.SET_DENIED_DATE(new Date().toISOString());
+    // } else {
+    //   this.SET_DENIED_DATE();
+    // }
 
     if (status === EPlatformCallResult.TikTokScopeOutdated) {
       throwStreamError('TIKTOK_SCOPE_OUTDATED');
@@ -749,7 +757,8 @@ export class TikTokService
     // convert audience types to match the ListInput component options
     const types = audienceControlsInfo.types.map(type => ({
       value: type.key.toString(),
-      label: type.label,
+      // TODO: revisit as to why cast is needed here, `string|null` on type def
+      label: type.label as string,
     }));
     const audienceType = audienceControlsInfo.info_type.toString();
 
diff --git a/app/services/platforms/tiktok/api.ts b/app/services/platforms/tiktok/api.ts
index f3b5e0afac74..94b92f875e91 100644
--- a/app/services/platforms/tiktok/api.ts
+++ b/app/services/platforms/tiktok/api.ts
@@ -31,6 +31,7 @@ export enum ETikTokAudienceType {
 }
 
 export type TTikTokLiveScopeTypes = 'approved' | 'denied' | 'legacy' | 'relog';
+export type TTikTokApplicationStatus = 'approved' | 'rejected' | 'never-applied';
 
 export interface ITikTokLiveScopeResponse {
   platform: TPlatform | string;
@@ -39,6 +40,7 @@ export interface ITikTokLiveScopeResponse {
   user?: ITikTokUserData;
   info?: any[] | null[] | undefined[] | ITikTokGame[] | ITikTokGamesData | any;
   audience_controls_info: ITikTokAudienceControlsInfo;
+  application_status: ITikTokApplicationStatus;
 }
 
 export interface ITikTokGamesData extends ITikTokLiveScopeResponse {
@@ -63,7 +65,12 @@ export interface ITikTokAudienceControlsInfo {
 
 export interface ITikTokAudienceControlType {
   key: ETikTokAudienceType;
-  label: string;
+  label: string | null;
+}
+
+export interface ITikTokApplicationStatus {
+  status: string;
+  timestamp: string | null;
 }
 
 export interface ITikTokUserData {