Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/src/app/common/components/twitch-login/twitch-login.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(' ')}`);
}
Expand Down
2 changes: 1 addition & 1 deletion src/src/app/view/login/login.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 2 additions & 0 deletions src/src/app/view/login/login.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,6 @@ export class LoginComponent implements OnInit {
}
});
}

protected readonly environment = environment;
}
2 changes: 1 addition & 1 deletion src/src/app/view/twitch/twitch-bot-index/twitch-bot-index.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/>
2 changes: 2 additions & 0 deletions src/src/app/view/twitch/twitch-bot-index/twitch-bot-index.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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;
}