2.207 yay

Author: FireMario211

CMakeLists.txt

@@ -15,6 +15,8 @@ file(GLOB SOURCES
 	src/ui/popups/*.cpp
 	src/ui/admin/*.cpp
 	src/ui/auth/*.cpp
+
+    src/gdauth/*.cpp # until fig ACCEPTS MY PR, for some reason hes inactive...
 )
 
 # Set up the mod binary
@@ -28,7 +30,7 @@ endif()
 
 add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
 
-#CPMAddPackage("gh:RoootTheFox/dashauth#main")
-#target_link_libraries(${PROJECT_NAME} DashAuth)
+CPMAddPackage("gh:FireMario211/dashauth#main")
+target_link_libraries(${PROJECT_NAME} DashAuth)
 
 setup_geode_mod(${PROJECT_NAME})

about.md

@@ -16,7 +16,7 @@ Thank you to <cj>Midair</c> for the mod idea, <cy>Alphalaneous</c> for the extra
 - To upload, click on the <cy>My Objects</c> tab, and make sure that the object you want to upload is in your <co>custom objects</c> (C). Otherwise, you won't be able to <cy>upload an object</c>!
 
 # Authentication Methods
-- <cp>DashAuth</c> is an authentication method that <cy>sends a message to a bot</c> to confirm the authenticity of your <cy>GD account</c>, similar to how mods like <cb>Globed</c> handles verifying your <cy>GD account</c>. Unfortunately, RobTop's servers <cr>IP banned my server</c>, meaning this method <cr>is not available</c>.
+- <cp>DashAuth</c> is an authentication method that <cy>sends a message to a bot</c> to confirm the authenticity of your <cy>GD account</c>, similar to how mods like <cb>Globed</c> handles verifying your <cy>GD account</c>. Thanks to <cp>rooot</c> for creating it!
 - <cg>GDAuth</c> is an authentication method made by <cg>fig</c> which <cy>sends your GJP</c> (session token for GD) to <cg>fig's server</c> to confirm the authenticity of your <cy>GD account</c>. You should only use this <cy>if you trust fig's server</c>, as this method is like sending your GD account to <cy>fig's server</c>.
 - <cy>Do Later</c> is what it says. This will close the menu and open up the <cy>Object Workshop</c>. Although do note that you <cy>will be limited</c> in what features you can use.
 

changelog.md

@@ -1,3 +1,6 @@
+# v1.4.1
+- Ported to Geode v4.0.0-beta.1 (2.207!)
+- Added DashAuth authentication option
 # v1.4.0
 - Allowed clicking on users profiles in comments (will only work for players that authenticated with Object Workshop before)
 - Added \n for descriptions and comments

mod.json

@@ -1,14 +1,14 @@
 {
-	"geode": "3.9.0",
+	"geode": "4.0.0-beta.1",
 	"gd": {
-		"win": "2.206",
-		"android": "2.206",
-		"mac": "2.206",
-		"ios": "2.206"
+		"win": "2.2074",
+		"android": "2.2074",
+		"mac": "2.2074",
+		"ios": "2.2074"
 	},
 	"id": "firee.object-workshop",
 	"name": "Object Workshop",
-	"version": "v1.4.0",
+	"version": "v1.4.1",
 	"developer": "Firee",
 	"description": "Download, upload, or find custom objects made by other creators!",
     "resources": {
@@ -51,15 +51,17 @@
             "max": 50000
         }
     },
-    "dependencies": [
+    "dependentold": [
         {
             "id": "fig.authentication",
-            "version": ">=v1.0.1",
-            "importance": "required"
-        },
+            "version": ">=v1.0.2",
+            "importance": "recommended"
+        }
+    ],
+    "dependencies": [
         {
             "id": "alphalaneous.editortab_api",
-            "version": ">=v1.0.0",
+            "version": ">=v1.0.6",
             "importance": "required"
         },
         {

server/src/controllers/user.ts

@@ -70,6 +70,17 @@ interface GDAuth {
     expires_after: Date;
 };
 
+interface DashAuth {
+    success: boolean,
+    message: string,
+    data: {
+        id: number,
+        username: string,
+        token: string,
+        token_expiration: Date
+    }
+};
+
 uRouter.get("/testverify", query('token').notEmpty().isUUID(4), async (req: Request, res: Response) => {
     const result = validationResult(req);
     if (!result.isEmpty()) return res.status(400).json({ errors: result.array() })
@@ -261,6 +272,55 @@ uRouter.post('/gdauth',
     }
 );
 
+uRouter.post('/dashauth',
+    body('token').notEmpty(),
+    async (req: Request, res: Response) => {
+        const result = validationResult(req);
+        if (!result.isEmpty()) return res.status(400).json({ errors: result.array() })
+        const token = req.body.token as string;
+        getCache().then(pool => {
+            axios.post("https://dashend.firee.dev/api/v1/verify", {token}).then(axiosRes => {
+            //axios.post("http://127.0.0.1:3001/api/v1/verify", {token}).then(axiosRes => {
+                const dashAuthData = axiosRes.data as DashAuth;
+                const data = dashAuthData.data;
+                if (!process.env.PRODUCTION) {
+                    console.log("[DashAuth]", data);
+                }
+                if (axiosRes.data == "-1") return res.status(403).json({error: "Invalid token."});
+                pool.query("INSERT INTO users (auth_method, account_id, name) VALUES ($1, $2, $3) ON CONFLICT (account_id) DO NOTHING RETURNING *;", ["dashauth", data.id, data.username]).then(async userResult => {
+                    let user = userResult.rows[0];
+                    if (!user) {
+                        const existingUserResult = await pool.query(
+                            `SELECT * FROM users WHERE account_id = $1;`,
+                            [data.id]
+                        );
+                        user = existingUserResult.rows[0];
+                    }
+                    if (!user) return res.status(500).json({ error: "Unable to retrieve or create user." });
+                    const authToken = generateAuthToken(user.account_id);
+                    const expiration = new Date(Date.now() + ((60 * 60 * 1000) * 24) * 14); // 2 weeks
+                    await pool.query(
+                        `INSERT INTO user_tokens (account_id, token, expiration)
+                         VALUES ($1, $2, $3);`,
+                        [user.account_id, authToken, expiration]
+                    );
+                    res.status(200).json({ token: authToken });
+                }).catch(err => {
+                    console.error(err);
+                    res.status(500).json({ error: "Something went wrong when trying to create a user." })
+                })
+
+            }).catch(e => {
+                console.error(e);
+                res.status(500).send({error: "Something went wrong when trying to communicate with DashEnd servers."})
+            })
+        }).catch(e => {
+            console.error(e);
+            res.sendStatus(500);
+        });
+    }
+);
+
 uRouter.post('/custom',
     body('token').notEmpty().isString(),
     body('accountID').notEmpty().isString(),

src/config.hpp

@@ -1,8 +1,13 @@
 #pragma once
 #define HOST_URL "https://ow.firee.dev"
 //#define HOST_URL "http://localhost:3000"
+#define DASHEND_URL "https://dashend.firee.dev/api/v1"
+//#define DASHEND_URL "http://localhost:3001/api/v1"
 #define USER_AGENT "ObjectWorkshop/1.4.0"
 
+#define DASHAUTH 1
+#define GDAUTH 1 
+
 #define RESULT_LIMIT 9
 #define MAX_ZOOM 10
 #define MIN_ZOOM 0.01

src/gdauth/authentication.cpp

@@ -0,0 +1,38 @@
+// TODO: Remove after fig accepts my pr or updates to v4!
+
+#include <Geode/Geode.hpp>
+#include <Geode/utils/web.hpp>
+
+#include "authentication.hpp"
+
+using namespace geode::prelude;
+using namespace authentication;
+
+void AuthenticationManager::getAuthenticationToken(std::function<void(std::string)> onSuccess, std::function<void(std::string)> onFailure) {
+    if (m_token != "-1") {
+        return onSuccess(m_token);
+    }
+
+    std::string url = "https://gd.figm.io/authentication/authenticate";
+    web::WebRequest req = web::WebRequest();
+
+    req.bodyString(fmt::format("accountid={}&gjp={}", GJAccountManager::get()->m_accountID, GJAccountManager::get()->m_GJP2));
+    auto task = req.post(url);
+
+    m_listener.bind([this, onSuccess, onFailure](web::WebTask::Event* e) {
+        if (web::WebResponse* value = e->getValue()) {
+            if (value->string().unwrapOr("-1") == "-1" || value->json().isErr()) {
+                return onFailure("Authentication Failed");
+            }
+
+            m_token = value->json().unwrap().get<std::string>("sessionID").unwrapOr("");
+            onSuccess(m_token);
+        } else if (web::WebProgress* progress = e->getProgress()) {
+            // The request is still in progress...
+        } else if (e->isCancelled()) {
+            onFailure("The request was cancelled");
+        }
+    });
+
+    m_listener.setFilter(task);
+}

src/gdauth/authentication.hpp

@@ -0,0 +1,24 @@
+// TODO: Remove after fig accepts my pr or updates to v4!
+
+#pragma once
+
+#include <Geode/Geode.hpp>
+#include <Geode/utils/web.hpp>
+
+using namespace geode::prelude;
+
+namespace authentication {
+    class AuthenticationManager {
+    private:
+        std::string m_token = "-1";
+        EventListener<web::WebTask> m_listener;
+
+    public:
+        static AuthenticationManager* get() {
+            static AuthenticationManager* instance = new AuthenticationManager;
+            return instance;
+        }
+
+        void getAuthenticationToken(std::function<void(std::string)> callback, std::function<void(std::string)> onFailure = [](std::string){});
+    };
+}