Prepare for SSP 2.0

simplesamlphp · Feb 16, 2020 · ca688a4 · ca688a4
1 parent cf9f9d0
commit ca688a4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -14,10 +14,10 @@
         }
     ],
     "require": {
-        "simplesamlphp/composer-module-installer": "~1.0"
+        "simplesamlphp/composer-module-installer": "~1.0",
+        "simplesamlphp/simplesamlphp": "dev-master"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp": "~1.17",
         "simplesamlphp/simplesamlphp-test-framework": "~0.1.0"
     }
 }

diff --git a/default-enable b/default-enable
diff --git a/www/attributes.php b/www/attributes.php
@@ -1,15 +1,19 @@
 <?php
 
+use Exception;
+use SimpleSAML\Auth;
+use SimpleSAML\Error;
+
 try {
     if (!isset($_GET['SourceID'])) {
-        throw new \SimpleSAML\Error\BadRequest('Missing SourceID parameter');
+        throw new Error\BadRequest('Missing SourceID parameter');
     }
     $sourceId = $_GET['SourceID'];
 
-    $as = new \SimpleSAML\Auth\Simple($sourceId);
+    $as = new Auth\Simple($sourceId);
 
     if (!$as->isAuthenticated()) {
-        throw new \SimpleSAML\Error\Exception('Not authenticated.');
+        throw new Error\Exception('Not authenticated.');
     }
 
     $attributes = $as->getAttributes();
@@ -22,7 +26,7 @@
             echo "\t$value\n";
         }
     }
-} catch (\Exception $e) {
+} catch (Exception $e) {
     header('HTTP/1.0 500 Internal Server Error');
     header('Content-Type: text/plain; charset=utf-8');
     echo "ERROR\n";

diff --git a/www/login.php b/www/login.php
@@ -1,18 +1,22 @@
 <?php
 
+use Exception;
+use SimpleSAML\Auth;
+use SimpleSAML\Error;
+
 try {
     if (!isset($_GET['SourceID'])) {
-        throw new \SimpleSAML\Error\BadRequest('Missing SourceID parameter');
+        throw new Error\BadRequest('Missing SourceID parameter');
     }
     $sourceId = $_GET['SourceID'];
 
-    $as = new \SimpleSAML\Auth\Simple($sourceId);
+    $as = new Auth\Simple($sourceId);
 
     $as->requireAuth();
 
     header('Content-Type: text/plain; charset=utf-8');
     echo "OK\n";
-} catch (\Exception $e) {
+} catch (Exception $e) {
     header('HTTP/1.0 500 Internal Server Error');
     header('Content-Type: text/plain; charset=utf-8');
     echo "ERROR\n";

diff --git a/www/logout.php b/www/logout.php
@@ -1,19 +1,23 @@
 <?php
 
+use Exception;
+use SimpleSAML\Auth;
+use SimpleSAML\Error;
+
 try {
     if (!isset($_GET['SourceID'])) {
-        throw new \SimpleSAML\Error\BadRequest('Missing SourceID parameter');
+        throw new Error\BadRequest('Missing SourceID parameter');
     }
     $sourceId = $_GET['SourceID'];
 
-    $as = new \SimpleSAML\Auth\Simple($sourceId);
+    $as = new Auth\Simple($sourceId);
 
     if ($as->isAuthenticated()) {
         $as->logout();
     }
     header('Content-Type: text/plain; charset=utf-8');
     echo "OK\n";
-} catch (\Exception $e) {
+} catch (Exception $e) {
     header('HTTP/1.0 500 Internal Server Error');
     header('Content-Type: text/plain; charset=utf-8');
     echo "ERROR\n";