edits

Author: norareidy

source/includes/authentication.php

@@ -2,6 +2,24 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
+// start-default-client
+$uriOptions = [
+    'username' => '<username>',
+    'password' => '<password>',
+    'authSource' => '<authentication database>',
+];
+
+$client = new MongoDB\Client(
+    'mongodb://<hostname>:<port>',
+    $uriOptions,
+);
+// end-default-client
+
+// start-default-uri
+$uri = 'mongodb://<username>:<password>@<hostname>:<port>/?authSource=admin';
+$client = new MongoDB\Client($uri);
+// end-default-uri
+
 // start-scram-sha-256-client
 $uriOptions = [
     'username' => '<username>',

source/security/authentication/scram.txt

@@ -56,14 +56,36 @@ To authenticate with this mechanism, set the following connection options:
 - ``authSource``: The MongoDB database to authenticate against. By default, the
   {+php-library+} authenticates against the database in the connection
   URI, if you include one. If you don't, it authenticates against the ``admin`` database.
-- ``authMechanism``: Set to ``'SCRAM-SHA-256'``. When connected to {+mdb-server+} v4.0,
-  setting ``authMechanism`` is optional.
 
 You can set these options in two ways: by passing an options array to the
 ``MongoDB\Client`` constructor or through parameters in your connection URI.
 Select the :guilabel:`MongoDB\\Client` or :guilabel:`Connection URI` tab to
 see the corresponding code:
 
+.. tabs::
+
+   .. tab:: MongoDB\\Client
+      :tabid: Client
+
+      .. literalinclude:: /includes/authentication.php
+         :language: php
+         :dedent:
+         :start-after: start-default-client
+         :end-before: end-default-client
+
+   .. tab:: Connection URI
+      :tabid: connectionstring
+
+      .. literalinclude:: /includes/authentication.php
+         :language: php
+         :dedent:
+         :start-after: start-default-uri
+         :end-before: end-default-uri
+
+You can also explicitly specify the ``SCRAM-SHA-256`` authentication mechanism
+by setting the ``authMechanism`` connection option to ``'SCRAM-SHA-256'``, as
+shown in the following example:
+
 .. tabs::
 
    .. tab:: MongoDB\\Client
@@ -89,18 +111,46 @@ see the corresponding code:
 SCRAM-SHA-1
 -----------
 
-SCRAM-SHA-1, as defined by `RFC 5802 <https://www.rfc-editor.org/rfc/rfc5802>`__,
-is the default authentication mechanism on MongoDB deployments
-running {+mdb-server+} v3.6.
+``SCRAM-SHA-1``, as defined by `RFC 5802 <https://www.rfc-editor.org/rfc/rfc5802>`__, 
+is a Salted Challenge Response Authentication Mechanism (SCRAM) that uses your
+username and password, encrypted with the ``SHA-1`` algorithm, to authenticate
+your user.
 
-.. note::
+To authenticate with this mechanism, set the following connection options:
 
-   {+php-library+} v1.20 drops support for {+mdb-server+} v3.6. When using v1.20+ of
-   the library, all supported server versions default to the SCRAM-SHA-256 authentication
-   mechanism.
+- ``username``: The username to authenticate. Percent-encode this value before including
+  it in a connection URI.
+- ``password``: The password to authenticate. Percent-encode this value before including
+  it in a connection URI.
+- ``authSource``: The MongoDB database to authenticate against. By default, the
+  {+php-library+} authenticates against the database in the connection
+  URI, if you include one. If you don't, it authenticates against the ``admin`` database.
+- ``authMechanism``: Set to ``'SCRAM-SHA-1'``.
+
+You can set these options in two ways: by passing an options array to the
+``MongoDB\Client`` constructor or through parameters in your connection URI.
+Select the :guilabel:`MongoDB\\Client` or :guilabel:`Connection URI` tab to
+see the corresponding code:
+
+.. tabs::
+
+   .. tab:: MongoDB\\Client
+      :tabid: Client
+
+      .. literalinclude:: /includes/authentication.php
+         :language: php
+         :dedent:
+         :start-after: start-scram-sha-1-client
+         :end-before: end-scram-sha-1-client
 
-To authenticate with this mechanism, use the same syntax as the :ref:`php-scram-sha-256`,
-but change the value of the ``authMechanism`` option to ``'SCRAM-SHA-1'``.
+   .. tab:: Connection URI
+      :tabid: connectionstring
+
+      .. literalinclude:: /includes/authentication.php
+         :language: php
+         :dedent:
+         :start-after: start-scram-sha-1-uri
+         :end-before: end-scram-sha-1-uri
 
 Additional Information
 ----------------------