added changes

descope · Jul 26, 2024 · 4e016ae · 4e016ae
1 parent 65b8253
commit 4e016ae
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/sample/callback.php b/sample/callback.php
@@ -22,8 +22,6 @@
     ]);
 
     if (isset($_POST["sessionToken"]) && $descopeSDK->verify($_POST["sessionToken"])) {
-        session_start()
-
         $_SESSION["user"] = json_decode($_POST["userDetails"], true);
         $_SESSION["sessionToken"] = $_POST["sessionToken"];
 

diff --git a/sample/dashboard.php b/sample/dashboard.php
@@ -2,7 +2,7 @@
 session_start();
 if (!isset($_SESSION["user"])) {
     session_destroy();
-    header('Location: login.php');
+    // header('Location: login.php');
     exit();
 }
 

diff --git a/sample/login.php b/sample/login.php
@@ -33,6 +33,7 @@ function sendFormData(sessionToken, userDetails) {
 
         async function getUserDetails() {
             const user = await sdk.me();
+            console.log(user);
             return user;
         }
         
@@ -41,7 +42,6 @@ function sendFormData(sessionToken, userDetails) {
 
         if (validRefreshToken) {
             console.log("Valid refresh token found. Logging in...");
-            sdk.refresh();
             const user = getUserDetails().then((user) => {
                 const sessionToken = sdk.getSessionToken();
                 sendFormData(sessionToken, user.data);

diff --git a/src/SDK/Configuration/SDKConfig.php b/src/SDK/Configuration/SDKConfig.php
@@ -22,6 +22,7 @@ public function __construct(array $config)
         $this->managementKey = $config['managementKey'] ?? '';
 
         EndpointsV2::setBaseUrl($config['projectId']);
+
         $this->jwkSets = $this->getJWKSets();
     }
 
@@ -31,9 +32,12 @@ public function __construct(array $config)
     private function getJWKSets()
     {
         try {
+            $url = EndpointsV2::getPublicKeyPath();
+
             // Fetch JWK public key from Descope API
-            $response = $this->api->doGet(EndpointsV2::getPublicKeyPath(), false);
-            return json_decode($response->getBody(), true);
+            $res = $this->client->request('GET', $url);
+            $jwkSets = json_decode($res->getBody(), true);
+            return $jwkSets;
         } catch (RequestException $re) {
             return $re;
         }

diff --git a/src/SDK/DescopeSDK.php b/src/SDK/DescopeSDK.php
@@ -22,8 +22,6 @@ class DescopeSDK
     public Management $management;
     public API $api;
 
-    public string $baseUrl;
-
     /**
      * Constructor for DescopeSDK class.
      *
@@ -38,7 +36,7 @@ public function __construct(array $config)
         EndpointsV1::setBaseUrl($config['projectId']);
         EndpointsV2::setBaseUrl($config['projectId']);
 
-        $this->config = new SDKConfig($config, $baseUrl);
+        $this->config = new SDKConfig($config);
 
         $this->api = new API($config['projectId'], $config['managementKey'] ?? '');
         // If OPTIONAL management key was provided in $config

diff --git a/src/SDK/Management/User.php b/src/SDK/Management/User.php
@@ -427,7 +427,6 @@ public function searchAll(
         }
 
         $jsonBody = json_encode($body);
-        print($jsonBody);
 
         try {
             $response = $this->api->doPost(