Re-pointing the twitch bot login to the twitch bot api

Author: ProgrammingByPermutation

src/src/app/common/components/twitch-login/twitch-login.component.ts

@@ -20,10 +20,9 @@ export class TwitchLoginComponent {
   @Input() redirectUrl: string | null = null;
 
   twitchLogin(): void {
-    const redirectUrl = `${environment.apiUrl}/${this.redirectUrl}`;
     window.location.href = `https://id.twitch.tv/oauth2/authorize?` +
       encodeURI(`client_id=${environment.twitchClientId}&` +
-        `redirect_uri=${redirectUrl}&` +
+        `redirect_uri=${this.redirectUrl}&` +
         `response_type=code&` +
         `scope=${environment.twitchScopes[this.twitchScopeIndex].join(' ')}`);
   }

src/src/app/view/login/login.component.html

@@ -16,7 +16,7 @@
          data-shape="rectangular"
          data-logo_alignment="left">
     </div>
-    <app-twitch-login [twitchScopeIndex]="0" redirectUrl="user/twitch-login" />
+    <app-twitch-login [twitchScopeIndex]="0" [redirectUrl]="environment.apiUrl + '/user/twitch-login'" />
   </div>
   <div class="centered-box_content-container" [hidden]="!checkingLogin">
     <app-loading-icon fontSize="24px" height="35px" width="35px">

src/src/app/view/login/login.component.ts

@@ -59,4 +59,6 @@ export class LoginComponent implements OnInit {
         }
       });
   }
+
+  protected readonly environment = environment;
 }

src/src/app/view/twitch/twitch-bot-index/twitch-bot-index.component.html

@@ -1,5 +1,5 @@
 <app-standard-banner/>
 
-<app-twitch-login [twitchScopeIndex]="1" redirectUrl="twitchbot/login"/>
+<app-twitch-login [twitchScopeIndex]="1" [redirectUrl]="environment.twitchBotApiUrl + '/login'"/>
 
 <app-twitch-bot-faq/>

src/src/app/view/twitch/twitch-bot-index/twitch-bot-index.component.ts

@@ -5,6 +5,7 @@ import {MatButton} from '@angular/material/button';
 import {StandardBannerComponent} from '../../../common/components/standard-banner/standard-banner.component';
 import {TwitchLoginComponent} from '../../../common/components/twitch-login/twitch-login.component';
 import {TwitchBotFaqComponent} from "../twitch-bot-faq/twitch-bot-faq.component";
+import {environment} from "../../../../environments/environment";
 
 @Component({
   selector: 'app-twitch-bot-index',
@@ -21,4 +22,5 @@ import {TwitchBotFaqComponent} from "../twitch-bot-faq/twitch-bot-faq.component"
   styleUrl: './twitch-bot-index.component.scss'
 })
 export class TwitchBotIndexComponent {
+  protected readonly environment = environment;
 }