fix: Game Data app + lc editing

fix: Use more Oauth2 Complaint FPFSS
FlashpointProject · Nov 16, 2023 · cdbfef6 · cdbfef6
1 parent 1b949a4
commit cdbfef6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/src/back/responses.ts b/src/back/responses.ts
@@ -868,6 +868,8 @@ export function registerRequestCallbacks(state: BackState, init: () => Promise<v
       const existingData = await GameDataManager.findOne(d.id);
       if (existingData) {
         existingData.title = d.title;
+        existingData.applicationPath = d.applicationPath;
+        existingData.launchCommand = d.launchCommand;
         existingData.parameters = d.parameters;
         return GameDataManager.save(existingData);
       }

diff --git a/src/renderer/fpfss.ts b/src/renderer/fpfss.ts
@@ -12,19 +12,28 @@ export async function fpfssLogin(dispatchMain: Dispatch<MainAction>, dialogResEv
   const fpfssBaseUrl = window.Shared.preferences.data.fpfssBaseUrl;
   // Get device auth token from FPFSS
   const tokenUrl = `${fpfssBaseUrl}/auth/token`;
-  const res = await axios.get(tokenUrl);
+  const data = {
+    'client_id': 'flashpoint-launcher',
+    'scope': 'identity game:read game:edit',
+  };
+  const formData = new URLSearchParams(data).toString();
+  const res = await axios.post(tokenUrl, formData, {
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    }
+  });
   const token = {
     'device_code': res.data['device_code'],
     'user_code': res.data['user_code'],
     'verification_uri': res.data['verification_uri'],
+    'verification_uri_complete': res.data['verification_uri_complete'],
     'expires_in': res.data['verification_uri'],
     'interval': res.data['interval']
   };
 
-  const verifyUrl = `${token.verification_uri}?code=${token.user_code}`;
   const pollUrl = `${fpfssBaseUrl}/auth/token?device_code=${token.device_code}`;
   const profileUrl = `${fpfssBaseUrl}/api/profile`;
-  await remote.shell.openExternal(verifyUrl);
+  await remote.shell.openExternal(token.verification_uri_complete);
 
   const dialog: DialogState = {
     largeMessage: true,
@@ -39,9 +48,18 @@ export async function fpfssLogin(dispatchMain: Dispatch<MainAction>, dialogResEv
 
   // Start loop until an end state occurs
   return new Promise<FpfssUser | null>((resolve, reject) => {
+    const pollData = {
+      'device_code': token.device_code,
+      'client_id': 'flashpoint-launcher'
+    };
+    const formData = new URLSearchParams(pollData).toString();
     const interval = setInterval(async () => {
       // Poll server for flow state
-      await axios.post(pollUrl)
+      await axios.post(pollUrl, formData, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        }
+      })
       .then(async (res) => {
         if (res.data['access_token']) {
           // Found token, fetch profile info