Skip to content

refactor: get token for host #1072

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
Apr 30, 2024
Merged

refactor: get token for host #1072

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
27 changes: 5 additions & 22 deletions src/hooks/useNotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,7 @@ import {
} from '../utils/api/client';
import { determineFailureType } from '../utils/api/errors';
import Constants from '../utils/constants';
import {
getEnterpriseAccountToken,
getTokenForHost,
isEnterpriseHost,
isGitHubLoggedIn,
} from '../utils/helpers';
import { getTokenForHost, isGitHubLoggedIn } from '../utils/helpers';
import {
setTrayIconColor,
triggerNativeNotifications,
Expand Down Expand Up @@ -187,10 +182,7 @@ export const useNotifications = (): NotificationsState => {
async (accounts: AuthState, id: string, hostname: string) => {
setStatus('loading');

const isEnterprise = isEnterpriseHost(hostname);
const token = isEnterprise
? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts)
: accounts.token;
const token = getTokenForHost(hostname, accounts);

try {
await markNotificationThreadAsRead(id, hostname, token);
Expand All @@ -215,10 +207,7 @@ export const useNotifications = (): NotificationsState => {
async (accounts: AuthState, id: string, hostname: string) => {
setStatus('loading');

const isEnterprise = isEnterpriseHost(hostname);
const token = isEnterprise
? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts)
: accounts.token;
const token = getTokenForHost(hostname, accounts);

try {
await markNotificationThreadAsDone(id, hostname, token);
Expand All @@ -243,10 +232,7 @@ export const useNotifications = (): NotificationsState => {
async (accounts: AuthState, id: string, hostname: string) => {
setStatus('loading');

const isEnterprise = isEnterpriseHost(hostname);
const token = isEnterprise
? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts)
: accounts.token;
const token = getTokenForHost(hostname, accounts);

try {
await ignoreNotificationThreadSubscription(id, hostname, token);
Expand All @@ -263,10 +249,7 @@ export const useNotifications = (): NotificationsState => {
async (accounts: AuthState, repoSlug: string, hostname: string) => {
setStatus('loading');

const isEnterprise = isEnterpriseHost(hostname);
const token = isEnterprise
? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts)
: accounts.token;
const token = getTokenForHost(hostname, accounts);

try {
await markRepositoryNotificationsAsRead(repoSlug, hostname, token);
Expand Down
17 changes: 6 additions & 11 deletions src/utils/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AuthState, EnterpriseAccount } from '../types';
import type { AuthState } from '../types';
import type {
Discussion,
DiscussionComment,
Expand All @@ -17,18 +17,13 @@ export function isGitHubLoggedIn(accounts: AuthState): boolean {

export function getTokenForHost(hostname: string, accounts: AuthState): string {
const isEnterprise = isEnterpriseHost(hostname);
const token = isEnterprise
? getEnterpriseAccountToken(hostname, accounts.enterpriseAccounts)
: accounts.token;

return token;
}
if (isEnterprise) {
return accounts.enterpriseAccounts.find((obj) => obj.hostname === hostname)
.token;
}

export function getEnterpriseAccountToken(
hostname: string,
accounts: EnterpriseAccount[],
): string {
return accounts.find((obj) => obj.hostname === hostname).token;
return accounts.token;
}

export function isEnterpriseHost(hostname: string): boolean {
Expand Down