Fix auth

SevenTV · Oct 25, 2024 · 0d13971 · 0d13971
1 parent 64fe972
commit 0d13971
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/src/apollo/apollo.ts b/src/apollo/apollo.ts
@@ -4,13 +4,12 @@ import { ApolloClient, ApolloLink, InMemoryCache, createHttpLink } from "@apollo
 
 export const httpLink = createHttpLink({
 	uri: import.meta.env.VITE_APP_API_GQL,
-	credentials: "include",
 });
 
 const token = useConfig<string>("app.7tv.token");
 const authLink = new ApolloLink((op, next) => {
 	const jwt = decodeJWT(token.value);
-	if (!jwt || jwt.exp * 1000 < Date.now()) {
+	if (!jwt || jwt.exp * 1000 < Date.now() || !jwt.sub) {
 		token.value = "";
 		return next(op);
 	}

diff --git a/src/app/settings/SettingsMenu.vue b/src/app/settings/SettingsMenu.vue
@@ -106,7 +106,7 @@
 							<div
 								v-if="actor.token"
 								class="seventv-settings-sidebar-profile-logout seventv-settings-expanded"
-								@click="actor.logout()"
+								@click.stop="actor.logout"
 							>
 								<LogoutIcon />
 							</div>

diff --git a/src/common/Constant.ts b/src/common/Constant.ts
@@ -22,7 +22,7 @@ export const UNICODE_TAG_0_REGEX = new RegExp(UNICODE_TAG_0, "g");
 
 export const HOSTNAME_SUPPORTED_REGEXP = /([a-z0-9]+[.])*(youtube|kick)[.]com/;
 export const SEVENTV_EMOTE_LINK = new RegExp(
-	"https?:\\/\\/(?:www\\.)?7tv.app\\/emotes\\/(?<emoteID>[0-9a-f]{24})",
+	"https?:\\/\\/(?:www\\.)?7tv.app\\/emotes\\/(?<emoteID>[0-7][0-9A-HJKMNP-TV-Z]{25})",
 	"i",
 );
 export const SEVENTV_EMOTE_ID = new RegExp("[0-9a-f]{24}");

diff --git a/src/common/Roles.ts b/src/common/Roles.ts
@@ -1,4 +1,4 @@
 export enum SevenTVRoles {
-	ADMIN = "6102002eab1aa12bf648cfcd",
-	MODERATOR = "60724f65e93d828bf8858789",
+	ADMIN = "01FBQX1CXG000AP6N15FV4HKYD",
+	MODERATOR = "01F2Z8C8M8000EJFC2HFW8B1W9",
 }
diff --git a/src/composable/useActor.ts b/src/composable/useActor.ts
@@ -1,4 +1,4 @@
-import { InjectionKey, inject, provide, reactive, toRaw, watch } from "vue";
+import { InjectionKey, inject, nextTick, provide, reactive, toRaw, watch } from "vue";
 import { useConfig } from "@/composable/useSettings";
 import { userByConnectionQuery, userQuery } from "@/assets/gql/seventv.user.gql";
 import { SubscriptionResponse, useEgVault } from "@/app/store/egvault";
@@ -23,11 +23,7 @@ class ActorContext {
 	}
 
 	logout(): void {
-		fetch(import.meta.env.VITE_APP_API + "/auth/logout", {
-			method: "POST",
-			credentials: "include",
-		}).then(() => {
-			// So the user can re-authenticate if needed
+		nextTick(() => {
 			this.token = "";
 		});
 	}

diff --git a/src/composable/useSetMutation.ts b/src/composable/useSetMutation.ts
@@ -33,7 +33,7 @@ export function useSetMutation(setID?: string): SetMutation {
 			() => ctx.user,
 			(u) => {
 				if (!u) return;
-				setID = u.connections?.find((s) => s.platform === ctx.platform)?.emote_set?.id;
+				setID = u.connections?.find((s) => s.platform === ctx.platform)?.emote_set_id;
 			},
 			{ immediate: true },
 		);

diff --git a/src/site/twitch.tv/modules/custom-commands/Commands/Dashboard.vue b/src/site/twitch.tv/modules/custom-commands/Commands/Dashboard.vue
@@ -210,7 +210,7 @@ const actor = useActor();
 const perms = [SevenTVRoles.ADMIN, SevenTVRoles.MODERATOR] as string[];
 
 const commandEditAnySet: Twitch.ChatCommand = {
-	name: "letmemamageemoteset",
+	name: "letmemanageemoteset",
 	description: "<Mod> Lets you edit any 7TV emote set",
 	helpText: "",
 	permissionLevel: 0,

diff --git a/src/types/app.d.ts b/src/types/app.d.ts
@@ -54,12 +54,11 @@ declare namespace SevenTV {
 	}
 
 	interface JWT {
-		u: string;
-		v: number;
 		iss: string;
+		sub: string;
 		exp: number;
-		nbf: number;
 		iat: number;
+		jti: string;
 	}
 
 	interface EmoteSet {