diff --git a/.github/workflows/satis-update.yml b/.github/workflows/satis-update.yml index 435bdb9..eb36715 100644 --- a/.github/workflows/satis-update.yml +++ b/.github/workflows/satis-update.yml @@ -25,8 +25,8 @@ jobs: uses: peter-evans/repository-dispatch@v1 with: token: ${{ secrets.WEBHOOK_TOKEN }} - repository: bluehost/satis - event-type: 'Trigger Satis Build' + repository: newfold-labs/satis + event-type: 'satis-build' client-payload: >- { "vendor": "${{ github.repository_owner }}", diff --git a/README.md b/README.md index 139095b..d356171 100644 --- a/README.md +++ b/README.md @@ -9,27 +9,16 @@ Single sign-on functionality for WordPress. ## Installation -### 1. Add the Bluehost Satis to your `composer.json`. +### 1. Add the Newfold Satis to your `composer.json`. ```bash - composer config repositories.bluehost composer https://bluehost.github.io/satis + composer config repositories.newfold composer https://newfold.github.io/satis ``` -### 2. Require the `newfold/wp-module-sso` package. +### 2. Require the `newfold-labs/wp-module-sso` package. ```bash - composer require newfold/wp-module-sso + composer require newfold-labs/wp-module-sso ``` -## Usage - -## More on NewFold WordPress Modules - -* What are modules? -* Creating/registering - modules -* Installing from our - Satis -* Local development notes -* Understanding the - module lifecycle +[More on NewFold WordPress Modules](https://github.com/newfold-labs/wp-module-loader) diff --git a/bootstrap.php b/bootstrap.php index 7f79ce6..b2d6a92 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -1,27 +1,26 @@ 'sso', - 'label' => __( 'SSO', 'endurance' ), - 'callback' => 'newfold_module_load_sso', - 'isActive' => true, - 'isHidden' => false, - ) + add_action( + 'plugins_loaded', + function () { + + register( + [ + 'name' => 'sso', + 'label' => __( 'SSO', 'endurance' ), + 'callback' => function () { + require __DIR__ . '/sso.php'; + }, + 'isActive' => true, + 'isHidden' => true, + ] + ); + + } ); -} -/** - * Load the SSO module. - */ -function newfold_module_load_sso() { - require dirname( __FILE__ ) . '/sso.php'; } diff --git a/composer.json b/composer.json index 94dd189..c22f662 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,15 @@ { - "name": "newfold/wp-module-sso", - "description": "Single sign-on functionality for WordPress.", + "name": "newfold-labs/wp-module-sso", + "description": "Single sign-on functionality for Newfold WordPress sites.", "license": "GPL-2.0-or-later", "repositories": [ + { + "type": "composer", + "url": "https://newfold-labs.github.io/satis/", + "only": [ + "newfold-labs/*" + ] + }, { "type": "composer", "url": "https://bluehost.github.io/satis/", @@ -22,7 +29,7 @@ ], "autoload": { "psr-4": { - "NewFold\\SSO\\": "includes" + "NewFoldLabs\\WP\\Module\\SSO\\": "includes" }, "files": [ "bootstrap.php" diff --git a/includes/SSO_AJAX_Handler.php b/includes/SSO_AJAX_Handler.php index 25ee872..efa7087 100644 --- a/includes/SSO_AJAX_Handler.php +++ b/includes/SSO_AJAX_Handler.php @@ -1,6 +1,6 @@