Changeset 3106088

Timestamp:

06/22/2024 08:00:25 PM (6 weeks ago)

Author:

jamieblomerus

Message:

Uploaded 1.3 to trunk (so it can get translated before release)

Location:

mobile-bankid-integration/trunk

Files:

• includes/admin/class-admin.php (modified) (2 diffs)
• includes/class-activation.php (modified) (1 diff)
• includes/class-core.php (modified) (3 diffs)
• includes/class-session.php (modified) (3 diffs)
• includes/integrations/woocommerce.php (modified) (3 diffs)
• includes/privacy (added)
• includes/privacy/class-data-export.php (added)
• includes/privacy/class-privacy-policy.php (added)
• includes/settings/class-usersettings.php (modified) (9 diffs)
• includes/settings/views/setup-finish.php (modified) (1 diff)
• includes/wp-login/class-api.php (modified) (5 diffs)
• includes/wp-login/class-login.php (modified) (1 diff)
• mobile-bankid-integration.php (modified) (3 diffs)
• readme.txt (modified) (4 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_psr4.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (2 diffs)
• vendor/composer/autoload_static.php (modified) (3 diffs)
• vendor/composer/installed.json (modified) (3 diffs)
• vendor/composer/installed.php (modified) (3 diffs)
• vendor/psr/http-factory/composer.json (modified) (2 diffs)
• vendor/psr/http-factory/src/UploadedFileFactoryInterface.php (modified) (2 diffs)

mobile-bankid-integration/trunk/includes/admin/class-admin.php

@@ -33 +33 @@
         self::add_tab( __( 'Integrations', 'mobile-bankid-integration' ), 'integrations', array( $this, 'page_integrations' ) );
         self::add_tab( __( 'Contribute', 'mobile-bankid-integration' ), 'contribute', array( $this, 'page_contribute' ) );
+
+
+
+
+
+
+
+
     }
 
@@ -421 +429 @@
                 color: rgb(201, 97, 152);
             }
-
+        </style>
             <?php
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

mobile-bankid-integration/trunk/includes/class-activation.php

@@ -65 +65 @@
      */
     private function checkrequirements() {
-        // Check if running on Windows.
-        if ( strtoupper( substr( PHP_OS, 0, 3 ) ) === 'WIN' ) {
-            wp_die( esc_html__( 'Due to bugs and limitations in the plugins dependencies, this plugin does not work on Windows. Please try again on a Linux server.', 'mobile-bankid-integration' ) );
-        }
         // Check if PHP version is 7.4 or higher.
         if ( version_compare( PHP_VERSION, '7.4.0' ) < 0 ) {

mobile-bankid-integration/trunk/includes/class-core.php

@@ -48 +48 @@
         if ( get_option( 'mobile_bankid_integration_env' ) && get_option( 'mobile_bankid_integration_certificate' ) && get_option( 'mobile_bankid_integration_password' ) ) {
             $this->create_bankid_service();
+
+
+
+
+
+
             do_action( 'mobile_bankid_integration_init' );
         }
@@ -161 +167 @@
 
     /**
-     * Get user ID from personal number.
-     *
-     * @param string $personal_number Personal number (12 digits, no hyphen).
+     * Get user ID from personal number.
+     *
+     * @param string $personal_number Personal number (12 digits, no hyphen).
      * @return int|false
      */
     public function getUserIdFromPersonalNumber( $personal_number ) {
-        // Get user by personal number from User Meta.
+        // Get user by personal number from User Meta.
         $user_query = new \WP_User_Query(
             array(
@@ -182 +188 @@
 
     /**
-     * Set personal number for user.
+     * Set personal number for user.
      *
      * @param int    $user_id User ID.
-     * @param string $personal_number Personal number (12 digits, no hyphen).
+     * @param string $personal_number Personal number (12 digits, no hyphen).
      * @return void
      */
     public function setPersonalNumberForUser( $user_id, $personal_number ) {
-        // Check if user already has a personal number.
+        // Check if user already has a personal number.
         if ( $this->getUserIdFromPersonalNumber( $personal_number ) !== false ) {
             return;

mobile-bankid-integration/trunk/includes/class-session.php

@@ -25 +25 @@
 
     /**
-     * The personal number.
+     * The personal number.
      *
      * @var string
@@ -49 +49 @@
      *
      * @param int         $user_id The user ID.
-     * @param string|null $personal_number The personal number.
+     * @param string|null $personal_number The personal number.
      * @param int|null    $time_created The time the session was created.
      * @return void|\WP_Error
@@ -67 +67 @@
         }
         if ( ! $personal_number ) {
-            $this->error = new \WP_Error( 'no_personal_number', __( 'No personal number found.', 'mobile-bankid-integration' ) );
+            $this->error = new \WP_Error( 'no_personal_number', __( 'No personal number found.', 'mobile-bankid-integration' ) );
         }
         $this->user_id         = $user_id;

mobile-bankid-integration/trunk/includes/integrations/woocommerce.php

@@ -98 +98 @@
      */
     public function __construct() {
-        if ( get_option( 'mobile_bankid_integration_woocommerce_login' ) === 'yes' && ( get_option( 'mobile_bankid_integration_certificate' ) && get_option( 'mobile_bankid_integration_password' ) && get_option( 'mobile_bankid_integration_endpoint' ) ) ) {
+        if ( get_option( 'mobile_bankid_integration_woocommerce_login' ) === 'yes' && ( get_option( 'mobile_bankid_integration_certificate' ) && get_option( 'mobile_bankid_integration_password' ) && get_option( 'mobile_bankid_integration_en' ) ) ) {
             add_action(
                 'woocommerce_login_form_end',
@@ -119 +119 @@
      */
     public function __construct() {
+
+
+
+
         if ( get_option( 'mobile_bankid_integration_woocommerce_checkout_require_bankid' ) !== 'yes' ) {
             return;
@@ -173 +177 @@
     public function age_check(): bool {
         $age = get_option( 'mobile_bankid_integration_woocommerce_age_check', 0 );
+
+
+
+
+
+
+
+
+
         if ( $age <= 0 ) {
             return true;

mobile-bankid-integration/trunk/includes/settings/class-usersettings.php

@@ -23 +23 @@
 
     /**
-     * Show personal number field.
+     * Show personal number field.
      *
      * @param object $user User object.
@@ -33 +33 @@
         <table class="form-table">
         <tr>
-        <th><label for="personal_number"><?php esc_html_e( 'Personal number (12 digits, no hyphen)', 'mobile-bankid-integration' ); ?></label></th>
+        <th><label for="personal_number"><?php esc_html_e( 'Personal number (12 digits, no hyphen)', 'mobile-bankid-integration' ); ?></label></th>
         <td>
         <input type="text" name="personal_number" id="personal_number" 
@@ -40 +40 @@
             echo 'disabled'; }
         ?>
-        value="<?php echo esc_attr( get_user_meta( $user->ID, 'mobile_bankid_integration_personal_number', true ) ); ?>" placeholder="<?php /* translators: Placeholder personal number. */ esc_attr_e( 'YYYYMMDDXXXX', 'mobile-bankid-integration' ); ?>" class="regular-text" />
+        value="<?php echo esc_attr( get_user_meta( $user->ID, 'mobile_bankid_integration_personal_number', true ) ); ?>" placeholder="<?php /* translators: Placeholder personal number. */ esc_attr_e( 'YYYYMMDDXXXX', 'mobile-bankid-integration' ); ?>" class="regular-text" />
         </td>
         </tr>
@@ -48 +48 @@
 
     /**
-     * Save personal number field.
+     * Save personal number field.
      *
      * @param int $user_id User ID.
@@ -58 +58 @@
 
         if ( current_user_can( 'edit_users' ) ) {
-            // Check if personal number is valid and save it if it is.
+            // Check if personal number is valid and save it if it is.
             if ( preg_match( '/^[0-9]{12}$/', $personal_number ) && Personnummer::valid( $personal_number ) ) {
-                // Check if user with this personal number already exists.
+                // Check if user with this personal number already exists.
                 $check = get_users(
                     array(
@@ -76 +76 @@
                 update_user_meta( $user_id, 'mobile_bankid_integration_personal_number', $personal_number );
             } elseif ( strlen( $personal_number ) === 0 ) {
-                delete_user_meta( $user_id, 'personal_number' );
+                delete_user_meta( $user_id, 'personal_number' );
             } else {
                 add_action( 'user_profile_update_errors', array( $this, 'personal_number_update_error_invalid' ), 10, 3 );
@@ -85 +85 @@
 
     /**
-     * Add error message if personal number already exists.
+     * Add error message if personal number already exists.
      *
      * @param object $errors WP_Error object.
@@ -93 +93 @@
      */
     public function personal_number_update_error_already_exists( $errors, $update, $user ) {
-        $errors->add( 'personal_number', esc_html__( 'User with this personal number already exists.', 'mobile-bankid-integration' ) );
+        $errors->add( 'personal_number', esc_html__( 'User with this personal number already exists.', 'mobile-bankid-integration' ) );
     }
 
     /**
-     * Add error message if personal number is invalid.
+     * Add error message if personal number is invalid.
      *
      * @param object $errors WP_Error object.
@@ -105 +105 @@
      */
     public function personal_number_update_error_invalid( $errors, $update, $user ) {
-        $errors->add( 'personal_number', esc_html__( 'Personal number is not valid.', 'mobile-bankid-integration' ) );
+        $errors->add( 'personal_number', esc_html__( 'Personal number is not valid.', 'mobile-bankid-integration' ) );
     }
 }

mobile-bankid-integration/trunk/includes/settings/views/setup-finish.php

@@ -4 +4 @@
 
 <h1><?php esc_html_e( 'Setup is complete', 'mobile-bankid-integration' ); ?></h1>
-<p><?php esc_html_e( 'Mobile BankID Integration is now setup and ready to use. You can now login to your WordPress site using BankID as soon as you have added your personal number to your account.', 'mobile-bankid-integration' ); ?></p>
+<p><?php esc_html_e( 'Mobile BankID Integration is now setup and ready to use. You can now login to your WordPress site using BankID as soon as you have added your personal number to your account.', 'mobile-bankid-integration' ); ?></p>
 
 <a href="<?php echo esc_url( admin_url( 'admin.php?page=mobile-bankid-integration' ) ); ?>" class="button button-primary"><?php esc_html_e( 'Go to settings', 'mobile-bankid-integration' ); ?></a>

mobile-bankid-integration/trunk/includes/wp-login/class-api.php

@@ -128 +128 @@
      * Sign in user from BankID or create user if it does not exist and registration is enabled.
      *
-     * @param string $personal_number Personal number of user.
+     * @param string $personal_number Personal number of user.
      * @param string $fname First name as returned from BankID API.
      * @param string $lname Last name as returned from BankID API.
@@ -134 +134 @@
      */
     private function sign_in_as_user_from_bankid( $personal_number, $fname, $lname ) {
-        // Get user by personal number from DB.
+        // Get user by personal number from DB.
         $user_id = Core::$instance->getUserIdFromPersonalNumber( $personal_number );
 
@@ -156 +156 @@
             );
 
-            // Set user personal number.
+            // Set user personal number.
             Core::$instance->setPersonalNumberForUser( $user_id, $personal_number );
         } else {
@@ -166 +166 @@
         Core::$instance->createAuthCookie( $user_id );
         do_action( 'wp_login', $personal_number, $user );
+
+
+
+
+
+
+
+
         return $user;
     }
@@ -180 +188 @@
             $user_exists = username_exists( 'user_' . $rnd_str );
         } while ( $user_exists > 0 );
-        return 'user_' . $rnd_str;
+
+        $username = 'user_' . $rnd_str;
+
+        /**
+         * Filter the username generated for new users.
+         *
+         * @param string $username Username.
+         * @since 1.3
+         */
+        $username = apply_filters( 'mobile_bankid_integration_new_user_username', $username );
+
+        return $username;
     }
 }

mobile-bankid-integration/trunk/includes/wp-login/class-login.php

@@ -15 +15 @@
      */
     public function __construct() {
-        if ( get_option( 'mobile_bankid_integration_wplogin' ) === 'as_alternative' && ( get_option( 'mobile_bankid_integration_certificate' ) && get_option( 'mobile_bankid_integration_password' ) && get_option( 'mobile_bankid_integration_endpoint' ) ) ) {
+        if ( get_option( 'mobile_bankid_integration_wplogin' ) === 'as_alternative' && ( get_option( 'mobile_bankid_integration_certificate' ) && get_option( 'mobile_bankid_integration_password' ) && get_option( 'mobile_bankid_integration_en' ) ) ) {
             add_action( 'login_form', array( $this, 'login_button' ), 40 );
             add_action(

mobile-bankid-integration/trunk/mobile-bankid-integration.php

@@ -3 +3 @@
 Plugin Name: Mobile BankID Integration
 Description: A plugin that allows you to integrate Mobile BankID with your WordPress site.
-Version: 1.2
+Version: 1.
 Author: Jamie Blomerus
 Author URI: https://github.com/jamieblomerus
@@ -14 +14 @@
 
 // Define constants.
-define( 'MOBILE_BANKID_INTEGRATION_VERSION', '1.2' );
+define( 'MOBILE_BANKID_INTEGRATION_VERSION', '1.' );
 define( 'MOBILE_BANKID_INTEGRATION_PLUGIN_FILE', __FILE__ );
 define( 'MOBILE_BANKID_INTEGRATION_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -59 +59 @@
             require_once MOBILE_BANKID_INTEGRATION_PLUGIN_DIR . 'includes/admin/class-admin.php';
             require_once MOBILE_BANKID_INTEGRATION_PLUGIN_DIR . 'includes/integrations/load.php';
+
+
         }
 

mobile-bankid-integration/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 5.2
 Tested up to: 6.5
-Stable tag: 1.2
+Stable tag: 1.
 Requires PHP: 7.2
 License: GPLv3 or later
@@ -33 +33 @@
 = Can I help translate it to my language? =
 
-Contribute to the translation of this plugin at Translating WordPress.
+Contribute to the translation of this plugin at .
 
 = I do miss one feature =
@@ -40 +40 @@
 
 = How do I buy the BankID service? =
-To buy the BankID service and receive a FP certificate, you need to contact your bank. For more information, please visit this [guide](https://www.bankid.com/en/foretag/anslut-foeretag).
+To buy the BankID service and receive a P certificate, you need to contact your bank. For more information, please visit this [guide](https://www.bankid.com/en/foretag/anslut-foeretag).
 
-= I want to test the plugin, but I don't have a Mobile BankID or FP certificate =
+= I want to test the plugin, but I don't have a Mobile BankID or P certificate =
 
 If you are only testing the service out, you can during the setup choose to run the plugin against the testing environment and use a [test BankID](https://www.bankid.com/en/utvecklare/test/skaffa-testbankid/test-bankid-get).
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
 
 = 1.2 =
@@ -75 +84 @@
 == Upgrade Notice ==
 
+
+
+
 = 1.2 =
 Major update. Requires total reinstallation of the plugin.

mobile-bankid-integration/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit841ba1d7db30a331995bbf9dcd7573e3::getLoader();
+return ComposerAutoloaderInit::getLoader();

mobile-bankid-integration/trunk/vendor/composer/autoload_psr4.php

@@ -9 +9 @@
     'chillerlan\\Settings\\' => array($vendorDir . '/chillerlan/php-settings-container/src'),
     'chillerlan\\QRCode\\' => array($vendorDir . '/chillerlan/php-qrcode/src'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Personnummer\\' => array($vendorDir . '/personnummer/personnummer/src'),

mobile-bankid-integration/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit841ba1d7db30a331995bbf9dcd7573e3
+class ComposerAutoloaderInit
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit841ba1d7db30a331995bbf9dcd7573e3', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit841ba1d7db30a331995bbf9dcd7573e3', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {

mobile-bankid-integration/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3
+class ComposerStaticInit
 {
     public static $files = array (
@@ -48 +48 @@
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-factory/src',
-            1 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-/src',
+            1 => __DIR__ . '/..' . '/psr/http-/src',
         ),
         'Psr\\Http\\Client\\' => 
@@ -217 +217 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit841ba1d7db30a331995bbf9dcd7573e3::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit::$classMap;
 
         }, null, ClassLoader::class);

mobile-bankid-integration/trunk/vendor/composer/installed.json

@@ -662 +662 @@
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
-            "version_normalized": "1.0.2.0",
+            "version": "1.",
+            "version_normalized": "1..0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0.0",
+                "reference": ""
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/",
+                "reference": "",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.",
                 "psr/http-message": "^1.0 || ^2.0"
             },
-            "time": "2023-04-10T20:10:41+00:00",
+            "time": "202+00:00",
             "type": "library",
             "extra": {
@@ -702 +702 @@
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
@@ -714 +714 @@
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
             "install-path": "../psr/http-factory"

mobile-bankid-integration/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '7aedfae704fa281f38077e40019261b06e1964e7',
+        'reference' => '',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '7aedfae704fa281f38077e40019261b06e1964e7',
+            'reference' => '',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
@@ -99 +99 @@
         ),
         'psr/http-factory' => array(
-            'pretty_version' => '1.0.2',
-            'version' => '1.0.2.0',
-            'reference' => 'e616d01114759c4c489f93b099585439f795fe35',
+            'pretty_version' => '1.',
+            'version' => '1..0',
+            'reference' => '',
             'type' => 'library',
             'install_path' => __DIR__ . '/../psr/http-factory',

mobile-bankid-integration/trunk/vendor/psr/http-factory/composer.json

@@ -1 +1 @@
 {
     "name": "psr/http-factory",
-    "description": "Common interfaces for PSR-7 HTTP message factories",
+    "description": "Common interfaces for PSR-7 HTTP message factories",
     "keywords": [
         "psr",
@@ -19 +19 @@
         }
     ],
+
+
+
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.",
         "psr/http-message": "^1.0 || ^2.0"
     },

mobile-bankid-integration/trunk/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php

@@ -16 +16 @@
      * @param StreamInterface $stream Underlying stream representing the
      *     uploaded file content.
-     * @param int $size in bytes
+     * @param int $size in bytes
      * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
+     * @param string $clientFilename Filename as provided by the client, if any.
+     * @param string $clientMediaType Media type as provided by the client, if any.
      *
      * @return UploadedFileInterface
@@ -27 +27 @@
     public function createUploadedFile(
         StreamInterface $stream,
-        int $size = null,
+        int $size = null,
         int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
+        string $clientFilename = null,
+        string $clientMediaType = null
     ): UploadedFileInterface;
 }