1 files changed, 9 insertions, 3 deletions
diff --git a/oauth/index.php b/oauth/index.php
index 1ebf7b7..6c6447f 100755
--- a/oauth/index.php
+++ b/oauth/index.php
@@ -47,7 +47,13 @@ if (isset($result["access_token"])) {
     $result["name"] = $result["family_name"] . " " . $result["given_name"];
     $result["id"] = $result["sub"];
     file_put_contents("/mnt/familine/private/tokens/" . $token, json_encode($result));
-    setcookie("FL_SESSION_TOKEN", $token, 0, "/", "." . $_CONFIG["Global"]["cdn"], true, true);
-
-    header("Location: " . $_GET['r']);
+    setcookie("FL_SESSION_TOKEN", $token, 0, "/", "." . $_CONFIG["Global"]["domain"], true, true);
+
+    if (isset($_COOKIE["_auth_callback"])) {
+        header("Location: " . $_COOKIE['_auth_callback']);
+        die();
+    } else {
+        header("Location: https://app." . $_CONFIG["Global"]["domain"]);
+        die();
+    }
 }
 \ No newline at end of file