Merge pull request #1 from flipboxfactory/develop

Clean up of the login service.
flipboxfactory · Apr 10, 2018 · dc4813c · dc4813c
2 parents 524cffe + 2034807
commit dc4813c
Show file tree

Hide file tree

Showing 7 changed files with 199 additions and 201 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "flipboxfactory/saml-sp",
   "description": "SAML SSO Service Provider",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.7",
   "type": "craft-plugin",
   "keywords": [
     "cms",
@@ -16,7 +16,7 @@
   "minimum-stability":"beta",
   "require": {
     "craftcms/cms": "^3.0.0",
-    "flipboxfactory/saml-core": "^1.0.0-beta.6"
+    "flipboxfactory/saml-core": "^1.0.0-beta.8"
   },
   "require-dev": {
     "phpunit/phpunit": "^5.0",
@@ -41,8 +41,8 @@
   },
   "extra": {
     "name": "SAML SSO Service Provider",
-    "version":"1.0.0-beta.6",
-    "schemaVersion":"1.0.0-beta.6",
+    "version":"1.0.0-beta.7",
+    "schemaVersion":"1.0.0-beta.7",
     "handle": "saml-sp",
     "class": "flipbox\\saml\\sp\\Saml",
     "developer": "Flipbox Digital",

diff --git a/src/controllers/LoginController.php b/src/controllers/LoginController.php
@@ -87,7 +87,9 @@ public function actionIndex()
 
 
     /**
-     * @throws \flipbox\saml\core\exceptions\InvalidMetadata
+     * @throws InvalidMetadata
+     * @throws \yii\base\ExitException
+     * @throws \yii\base\InvalidConfigException
      */
     public function actionRequest()
     {
@@ -115,7 +117,7 @@ public function actionRequest()
 
         Factory::send($authnRequest, $idp);
 
-        exit;
+        Craft::$app->end();
     }
 
 }
diff --git a/src/controllers/LogoutController.php b/src/controllers/LogoutController.php
@@ -44,11 +44,12 @@ protected function getRemoteProvider(): ProviderInterface
      * @param SamlMessage $samlMessage
      * @param ProviderInterface $provider
      * @throws \flipbox\saml\core\exceptions\InvalidMetadata
+     * @throws \yii\base\ExitException
      */
     protected function send(SamlMessage $samlMessage, ProviderInterface $provider)
     {
         Factory::send($samlMessage, $provider);
-        exit;
+        \Craft::$app->end();
     }
 
     /**

diff --git a/src/events/RegisterAttributesTransformer.php b/src/events/RegisterAttributesTransformer.php
diff --git a/src/helpers/UserHelper.php b/src/helpers/UserHelper.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @copyright  Copyright (c) Flipbox Digital Limited
+ */
+
+namespace flipbox\saml\sp\helpers;
+
+use craft\elements\User as UserElement;
+
+/**
+ * Class UserHelper
+ * @package flipbox\saml\sp\helpers
+ */
+class UserHelper
+{
+    /**
+     * @param UserElement $user
+     * @throws \Throwable
+     */
+    public static function enableUser(UserElement $user)
+    {
+        if (static::isUserSuspended($user)) {
+            \Craft::$app->getUsers()->unsuspendUser($user);
+        }
+
+        if (static::isUserLocked($user)) {
+            \Craft::$app->getUsers()->unlockUser($user);
+        }
+
+        if (! $user->enabled) {
+            $user->enabled = true;
+        }
+
+        if ($user->archived) {
+            $user->archived = false;
+        }
+
+        if (! static::isUserActive($user)) {
+            \Craft::$app->getUsers()->activateUser($user);
+        }
+    }
+
+    /**
+     * @param UserElement $user
+     * @return bool
+     */
+    public static function isUserPending(UserElement $user)
+    {
+        return false === static::isUserActive($user) &&
+            $user->getStatus() === UserElement::STATUS_PENDING;
+    }
+
+    /**
+     * @param UserElement $user
+     * @return bool
+     */
+    public static function isUserArchived(UserElement $user)
+    {
+        return false === static::isUserActive($user) &&
+            $user->getStatus() === UserElement::STATUS_ARCHIVED;
+    }
+
+    /**
+     * @param UserElement $user
+     * @return bool
+     */
+    public static function isUserLocked(UserElement $user)
+    {
+        return false === static::isUserActive($user) &&
+            $user->getStatus() === UserElement::STATUS_LOCKED;
+    }
+
+    /**
+     * @param UserElement $user
+     * @return bool
+     */
+    public static function isUserSuspended(UserElement $user)
+    {
+        return false === static::isUserActive($user) &&
+            $user->getStatus() === UserElement::STATUS_SUSPENDED;
+    }
+
+    /**
+     * @param UserElement $user
+     * @return bool
+     */
+    public static function isUserActive(UserElement $user)
+    {
+        return $user->getStatus() === UserElement::STATUS_ACTIVE;
+    }
+
+}