Merge pull request #114 from humanmade/issue-1265-remove-wordpress-ss…

…o-option Remove WordPress as an SSO option
humanmade · Dec 19, 2022 · b7eb3e7 · b7eb3e7
2 parents bc82438 + fe905ff
commit b7eb3e7
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 117 deletions.
diff --git a/composer.json b/composer.json
@@ -12,20 +12,17 @@
 	"autoload": {
 		"files": [
 			"inc/namespace.php",
-			"inc/saml/namespace.php",
-			"inc/wordpress/namespace.php"
+			"inc/saml/namespace.php"
 		]
 	},
 	"require": {
 		"php": ">=7.1",
-		"humanmade/wp-simple-saml": "~0.4.3",
-		"humanmade/delegated-oauth": "^1.0.5"
+		"humanmade/wp-simple-saml": "~0.4.3"
 	},
 	"extra": {
 		"altis": {
 			"install-overrides": [
-				"humanmade/wp-simple-saml",
-				"humanmade/delegated-oauth"
+				"humanmade/wp-simple-saml"
 			]
 		}
 	}

diff --git a/docs/README.md b/docs/README.md
@@ -11,7 +11,6 @@ Once the CMS has a user record in the database, the user's session is authorized
 Supported authorization providers are:
 
 * [SAML 2.0](./saml-2-0.md)
-* [WordPress](./wordpress.md)
 
 ## Hiding native login
 

diff --git a/docs/wordpress.md b/docs/wordpress.md
diff --git a/inc/namespace.php b/inc/namespace.php
@@ -21,9 +21,6 @@ function bootstrap() {
 	if ( $config['saml'] ) {
 		SAML\bootstrap();
 	}
-	if ( $config['wordpress'] ) {
-		WordPress\bootstrap();
-	}
 
 	add_action( 'login_form', __NAMESPACE__ . '\\output_sso_buttons' );
 }
@@ -35,7 +32,7 @@ function bootstrap() {
  */
 function is_sso_active() : bool {
 	$config = Altis\get_config()['modules']['sso'];
-	if ( $config['saml'] || $config['wordpress'] ) {
+	if ( $config['saml'] ) {
 		return true;
 	}
 	return false;
@@ -67,10 +64,6 @@ function output_sso_buttons() : void {
 		<?php if ( $config['saml'] ) : ?>
 			<?php SAML\render_login_link() ?>
 		<?php endif; ?>
-
-		<?php if ( $config['wordpress'] ) : ?>
-			<?php WordPress\render_login_link() ?>
-		<?php endif; ?>
 	</div>
 	<style>
 		#loginform {

diff --git a/inc/wordpress/namespace.php b/inc/wordpress/namespace.php
diff --git a/load.php b/load.php
@@ -13,7 +13,6 @@
 	$default_settings = [
 		'enabled' => true,
 		'saml' => false,
-		'wordpress' => false,
 		'hide_native' => false,
 	];
 	$options = [