Tidy (#380)

NigelBreslaw · Feb 15, 2024 · af2d1f9 · af2d1f9
1 parent cb436c0
commit af2d1f9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/native_gg/src/account/Account.ts b/native_gg/src/account/Account.ts
@@ -1,6 +1,6 @@
 import * as v from "valibot";
 import { apiKey } from "../constants/env.ts";
-import { RefreshToken } from "../authentication/Types.ts";
+import { RefreshToken } from "../authentication/Utilities.ts";
 
 const PlatformSilverSchema = v.object({
   itemHash: v.number(),

diff --git a/native_gg/src/authentication/AuthService.ts b/native_gg/src/authentication/AuthService.ts
@@ -5,8 +5,7 @@ import * as WebBrowser from "expo-web-browser";
 import * as v from "valibot";
 import { clientID, redirectURL } from "../constants/env.ts";
 import { Store } from "../constants/storage.ts";
-import { RefreshToken, refreshTokenSchema } from "./Types.ts";
-import { getAccessToken, getRefreshToken } from "./Utilities.ts";
+import { RefreshToken, refreshTokenSchema, getAccessToken, getRefreshToken } from "./Utilities.ts";
 import {
   BungieUser,
   BungieUserSchema,

diff --git a/native_gg/src/authentication/Types.ts b/native_gg/src/authentication/Types.ts
diff --git a/native_gg/src/authentication/Utilities.ts b/native_gg/src/authentication/Utilities.ts
@@ -1,7 +1,18 @@
 import * as base64 from "base-64";
 import * as v from "valibot";
 import { apiKey, clientID, clientSecret } from "../constants/env.ts";
-import { RefreshToken, refreshTokenSchema } from "./Types.ts";
+
+export const refreshTokenSchema = v.object({
+  access_token: v.string(),
+  expires_in: v.number(),
+  membership_id: v.string(),
+  refresh_expires_in: v.number(),
+  refresh_token: v.string(),
+  time_stamp: v.optional(v.string([v.isoTimestamp()])),
+  token_type: v.string(),
+});
+
+export type RefreshToken = v.Output<typeof refreshTokenSchema>;
 
 export function getRefreshToken(bungieCode: string): Promise<JSON> {
   const headers = new Headers();