Test

NigelBreslaw · Feb 10, 2024 · f97f98b · f97f98b
1 parent f850e2a
commit f97f98b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/deploy-gg-web.yml b/.github/workflows/deploy-gg-web.yml
@@ -23,7 +23,7 @@ jobs:
         - name: install dependencies
           run: pnpm install --frozen-lockfile
         - name: add .env file
-          run: echo ${{ secrets.CLIENT_SECRETS }} > .env
+          run: pwd && echo ${{ secrets.CLIENT_SECRETS }} > .env && cat .env
         - name: build
           run: pnpm expo export -p web 
         - name: deploy website

diff --git a/native_gg/App.tsx b/native_gg/App.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, Text, View } from "react-native";
 import { Image } from "expo-image";
 import { LinearGradient } from "expo-linear-gradient";
 import { useState } from "react";
-import Auth from "./src/AuthUI.tsx";
+import AuthUI from "./src/AuthUI.tsx";
 
 export default function App() {
   const [token, setToken] = useState("");
@@ -21,15 +21,13 @@ export default function App() {
         contentFit="contain"
         source="https://d33wubrfki0l68.cloudfront.net/554c3b0e09cf167f0281fda839a5433f2040b349/ecfc9/img/header_logo.svg"
       />
-      <Auth setToken={setToken} setMembershipID={setMembershipID} />
+      <AuthUI setToken={setToken} setMembershipID={setMembershipID} />
       <Text style={{ fontSize: 22, marginTop: 15, color: "#150f63" }}>
         Auth token: <Text style={{ fontWeight: "bold" }}>{token}</Text>
       </Text>
-      {membershipID && (
-        <Text style={{ fontSize: 22, marginTop: 15, color: "#150f63" }}>
-          Membership ID: <Text style={{ fontWeight: "bold" }}>{membershipID}</Text>
-        </Text>
-      )}
+      <Text style={{ fontSize: 22, marginTop: 15, color: "#150f63" }}>
+        Membership ID: <Text style={{ fontWeight: "bold" }}>{membershipID}</Text>
+      </Text>
       <StatusBar style="auto" />
     </View>
   );

diff --git a/native_gg/src/AuthUI.tsx b/native_gg/src/AuthUI.tsx
@@ -3,7 +3,7 @@ import * as WebBrowser from "expo-web-browser";
 import { useEffect } from "react";
 import { Button, Platform } from "react-native";
 import { randomUUID } from "expo-crypto";
-import { appID, redirectURL } from "./constants/env.ts";
+import { clientID, redirectURL } from "./constants/env.ts";
 import { getAuthToken } from "./Authentication.ts";
 
 type InitialAuthJWT = {
@@ -21,9 +21,9 @@ type AuthProps = {
 };
 
 const stateID = randomUUID();
-const authURL = `https://www.bungie.net/en/oauth/authorize?client_id=${appID}&response_type=code&reauth=true&state=${stateID}`;
+const authURL = `https://www.bungie.net/en/oauth/authorize?client_id=${clientID}&response_type=code&reauth=true&state=${stateID}`;
 
-export default function Auth(props: AuthProps) {
+export default function AuthUI(props: AuthProps) {
   const url = useURL();
 
   useEffect(() => {

diff --git a/native_gg/src/Authentication.ts b/native_gg/src/Authentication.ts
@@ -1,4 +1,4 @@
-import { apiKey, appID, clientID, clientSecret } from "./constants/env.ts";
+import { apiKey, clientID, clientSecret } from "./constants/env.ts";
 
 export function getAuthToken(bungieCode: string): Promise<JSON> {
   // {

diff --git a/native_gg/src/constants/env.ts b/native_gg/src/constants/env.ts
@@ -3,14 +3,12 @@ import { Platform } from "react-native";
 // @ts-ignore
 export const apiKey = process.env.EXPO_PUBLIC_API_KEY;
 // @ts-ignore
-export const clientID = process.env.EXPO_PUBLIC_CLIENT_ID;
+export const clientID = "46261"; //process.env.EXPO_PUBLIC_CLIENT_ID;
 // @ts-ignore
-export const clientSecret = process.env.EXPO_PUBLIC_CLIENT_SECRET;
+export const clientSecret = "qVT6lYzc-t00NiqSRJc8lwbqdXuDMAweEt5-QDF3SU0"; //process.env.EXPO_PUBLIC_CLIENT_SECRET;
 
 const isLocalWeb = process.env.NODE_ENV === "development" && Platform.OS === "web";
-const localWebAppID = "46261";
-const normalAppID = "46250";
+
 const localWebRedirectURL = "https://localhost:19006/auth";
 const normalRedirectURL = "https://guardianghost.com/auth";
 export const redirectURL = isLocalWeb ? localWebRedirectURL : normalRedirectURL;
-export const appID = isLocalWeb ? localWebAppID : normalAppID;