silverstripe / silverstripe-sharedraftcontent

src/Models/ShareToken.php

Indentation +35 added lines, -35 removed lines

@@ -14,39 +14,39 @@
  */
 class ShareToken extends DataObject
 {
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Token' => 'Varchar(16)',
-        'ValidForDays' => 'Int',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Page' => Page::class
-    );
-
-    /**
-     * @var string
-     */
-    private static $table_name = 'ShareToken';
-
-    /**
-     * Determines whether the token is still valid (from days since it was created).
-     *
-     * @return bool
-     */
-    public function isExpired()
-    {
-        $createdSeconds = strtotime($this->Created);
-
-        $validForSeconds = (int) $this->ValidForDays * 24 * 60 * 60;
-
-        $nowSeconds = DBDatetime::now()->getTimestamp();
-
-        return ($createdSeconds + $validForSeconds) <= $nowSeconds;
-    }
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Token' => 'Varchar(16)',
+		'ValidForDays' => 'Int',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Page' => Page::class
+	);
+
+	/**
+	 * @var string
+	 */
+	private static $table_name = 'ShareToken';
+
+	/**
+	 * Determines whether the token is still valid (from days since it was created).
+	 *
+	 * @return bool
+	 */
+	public function isExpired()
+	{
+		$createdSeconds = strtotime($this->Created);
+
+		$validForSeconds = (int) $this->ValidForDays * 24 * 60 * 60;
+
+		$nowSeconds = DBDatetime::now()->getTimestamp();
+
+		return ($createdSeconds + $validForSeconds) <= $nowSeconds;
+	}
 }

src/Tasks/RemoveExpiredShareTokensTask.php

Indentation +15 added lines, -15 removed lines

@@ -14,24 +14,24 @@
  */
 class RemoveExpiredShareTokens extends BuildTask
 {
-    private static $segment = 'RemoveExpiredShareTokens';
+	private static $segment = 'RemoveExpiredShareTokens';
 
-    protected $title = 'Remove expired share tokens';
+	protected $title = 'Remove expired share tokens';
 
-    protected $description = 'Remove all expired ShareTokens from the database';
+	protected $description = 'Remove all expired ShareTokens from the database';
 
-    public function run($request)
-    {
-        $shareTokens = ShareToken::get();
-        $removeCount = 0;
+	public function run($request)
+	{
+		$shareTokens = ShareToken::get();
+		$removeCount = 0;
 
-        foreach ($shareTokens as $token) {
-            if ($token->isExpired()) {
-                $token->delete();
-                $removeCount++;
-            }
-        }
+		foreach ($shareTokens as $token) {
+			if ($token->isExpired()) {
+				$token->delete();
+				$removeCount++;
+			}
+		}
 
-        echo "Removed $removeCount expired share tokens.\n";
-    }
+		echo "Removed $removeCount expired share tokens.\n";
+	}
 }

src/Extensions/ShareDraftContentControllerExtension.php

Indentation +30 added lines, -30 removed lines

@@ -7,37 +7,37 @@
 
 class ShareDraftContentControllerExtension extends Extension
 {
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'MakeShareDraftLink',
-    );
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'MakeShareDraftLink',
+	);
 
-    /**
-     * @return mixed
-     */
-    public function MakeShareDraftLink()
-    {
-        if ($member = Security::getCurrentUser()) {
-            if ($this->owner->hasMethod('CurrentPage') && $this->owner->CurrentPage()->canEdit($member)) {
-                return $this->owner->CurrentPage()->ShareTokenLink();
-            } elseif ($this->owner->hasMethod('canEdit') && $this->owner->canEdit($member)) {
-                return $this->owner->ShareTokenLink();
-            }
-        }
+	/**
+	 * @return mixed
+	 */
+	public function MakeShareDraftLink()
+	{
+		if ($member = Security::getCurrentUser()) {
+			if ($this->owner->hasMethod('CurrentPage') && $this->owner->CurrentPage()->canEdit($member)) {
+				return $this->owner->CurrentPage()->ShareTokenLink();
+			} elseif ($this->owner->hasMethod('canEdit') && $this->owner->canEdit($member)) {
+				return $this->owner->ShareTokenLink();
+			}
+		}
 
-        return Security::permissionFailure();
-    }
+		return Security::permissionFailure();
+	}
 
-    /**
-     * @return string
-     */
-    public function getShareDraftLinkAction()
-    {
-        if ($this->owner->config()->get('url_segment')) {
-            return $this->owner->Link('MakeShareDraftLink');
-        }
-        return '';
-    }
+	/**
+	 * @return string
+	 */
+	public function getShareDraftLinkAction()
+	{
+		if ($this->owner->config()->get('url_segment')) {
+			return $this->owner->Link('MakeShareDraftLink');
+		}
+		return '';
+	}
 }

src/Extensions/ShareDraftContentRequirementsExtension.php

Indentation +5 added lines, -5 removed lines

@@ -7,9 +7,9 @@
 
 class ShareDraftContentRequirementsExtension extends DataExtension
 {
-    public function init()
-    {
-        Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/share-component.css');
-        Requirements::javascript('silverstripe/sharedraftcontent: client/dist/js/main.js');
-    }
+	public function init()
+	{
+		Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/share-component.css');
+		Requirements::javascript('silverstripe/sharedraftcontent: client/dist/js/main.js');
+	}
 }

src/Controllers/ShareDraftController.php

Indentation +144 added lines, -144 removed lines

@@ -20,148 +20,148 @@
 
 class ShareDraftController extends Controller
 {
-    /**
-     * Controller for rendering draft pages.
-     *
-     * @config
-     *
-     * @var string
-     */
-    private static $controller = PageController::class;
-
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'preview'
-    );
-
-    /**
-     * @var array
-     */
-    private static $url_handlers = array(
-        '$Key/$Token' => 'preview'
-    );
-
-    /**
-     * @param HTTPRequest $request
-     *
-     * @return string|DBHTMLText
-     */
-    public function preview(HTTPRequest $request)
-    {
-        $key = $request->param('Key');
-        $token = $request->param('Token');
-        try {
-            $session = $this->getRequest()->getSession();
-        } catch (BadMethodCallException $e) {
-            // Create a new session
-            $session = $this->getRequest()
-                ->setSession(Injector::inst()->create(Session::class, []))
-                ->getSession();
-        }
-        /** @var ShareToken $shareToken */
-        $shareToken = ShareToken::get()->filter('Token', $token)->first();
-
-        if (!$shareToken) {
-            return $this->errorPage();
-        }
-
-        /** @var SiteTree|ShareDraftContentSiteTreeExtension $page */
-        $page = Versioned::get_by_stage(SiteTree::class, Versioned::DRAFT)
-            ->byID($shareToken->PageID);
-
-        $latest = Versioned::get_latest_version(SiteTree::class, $shareToken->PageID);
-
-        $controller = $this->getControllerFor($page);
-
-        if (!$shareToken->isExpired() && $page->generateKey($shareToken->Token) === $key) {
-            Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/top-bar.css');
-
-            // Temporarily un-secure the draft site and switch to draft
-            $oldSecured = $this->getIsDraftSecured($session);
-            $oldMode = Versioned::get_reading_mode();
-
-            // Process page inside an unsecured draft container
-            try {
-                $this->setIsDraftSecured($session, false);
-                Versioned::set_stage('Stage');
-
-                // Hack to get around ContentController::init() redirecting on home page
-                $_FILES = array(array());
-
-                // Create mock request; Simplify request to single top level request
-                $pageRequest = new HTTPRequest('GET', $page->URLSegment);
-                $pageRequest->match('$URLSegment//$Action/$ID/$OtherID', true);
-                $pageRequest->setSession($session);
-                $rendered = $controller->handleRequest($pageRequest);
-
-                // Render draft heading
-                $data = new ArrayData(array(
-                    'Page' => $page,
-                    'Latest' => $latest,
-                ));
-                $include = (string) $data->renderWith('Includes/TopBar');
-            } finally {
-                $this->setIsDraftSecured($session, $oldSecured);
-                Versioned::set_reading_mode($oldMode);
-            }
-
-            return str_replace('</body>', $include . '</body>', (string) $rendered->getBody());
-        } else {
-            return $this->errorPage();
-        }
-    }
-
-    /**
-     * @return DBHTMLText
-     */
-    protected function errorPage()
-    {
-        Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/error-page.css');
-        return $this->renderWith('ShareDraftContentError');
-    }
-
-    /**
-     * @param SiteTree $page
-     * @return ContentController
-     */
-    protected function getControllerFor($page)
-    {
-        return ModelAsController::controller_for($page);
-    }
-
-    /**
-     * Check if the draft site is secured
-     *
-     * @param Session $session
-     * @return bool True if the draft site is secured
-     */
-    protected function getIsDraftSecured(Session $session)
-    {
-        // Versioned >=1.2
-        if (method_exists(Versioned::class, 'get_draft_site_secured')) {
-            return Versioned::get_draft_site_secured();
-        }
-
-        // Fall back to session
-        return !$session->get('unsecuredDraftSite');
-    }
-
-    /**
-     * Set draft site security
-     *
-     * @param Session $session
-     * @param bool $secured True if draft site should be secured
-     */
-    protected function setIsDraftSecured(Session $session, $secured)
-    {
-        // Versioned >=1.2
-        if (method_exists(Versioned::class, 'set_draft_site_secured')) {
-            Versioned::set_draft_site_secured($secured);
-        }
-
-        // Set session variable anyway
-        $session->set('unsecuredDraftSite', !$secured);
-    }
+	/**
+	 * Controller for rendering draft pages.
+	 *
+	 * @config
+	 *
+	 * @var string
+	 */
+	private static $controller = PageController::class;
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'preview'
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $url_handlers = array(
+		'$Key/$Token' => 'preview'
+	);
+
+	/**
+	 * @param HTTPRequest $request
+	 *
+	 * @return string|DBHTMLText
+	 */
+	public function preview(HTTPRequest $request)
+	{
+		$key = $request->param('Key');
+		$token = $request->param('Token');
+		try {
+			$session = $this->getRequest()->getSession();
+		} catch (BadMethodCallException $e) {
+			// Create a new session
+			$session = $this->getRequest()
+				->setSession(Injector::inst()->create(Session::class, []))
+				->getSession();
+		}
+		/** @var ShareToken $shareToken */
+		$shareToken = ShareToken::get()->filter('Token', $token)->first();
+
+		if (!$shareToken) {
+			return $this->errorPage();
+		}
+
+		/** @var SiteTree|ShareDraftContentSiteTreeExtension $page */
+		$page = Versioned::get_by_stage(SiteTree::class, Versioned::DRAFT)
+			->byID($shareToken->PageID);
+
+		$latest = Versioned::get_latest_version(SiteTree::class, $shareToken->PageID);
+
+		$controller = $this->getControllerFor($page);
+
+		if (!$shareToken->isExpired() && $page->generateKey($shareToken->Token) === $key) {
+			Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/top-bar.css');
+
+			// Temporarily un-secure the draft site and switch to draft
+			$oldSecured = $this->getIsDraftSecured($session);
+			$oldMode = Versioned::get_reading_mode();
+
+			// Process page inside an unsecured draft container
+			try {
+				$this->setIsDraftSecured($session, false);
+				Versioned::set_stage('Stage');
+
+				// Hack to get around ContentController::init() redirecting on home page
+				$_FILES = array(array());
+
+				// Create mock request; Simplify request to single top level request
+				$pageRequest = new HTTPRequest('GET', $page->URLSegment);
+				$pageRequest->match('$URLSegment//$Action/$ID/$OtherID', true);
+				$pageRequest->setSession($session);
+				$rendered = $controller->handleRequest($pageRequest);
+
+				// Render draft heading
+				$data = new ArrayData(array(
+					'Page' => $page,
+					'Latest' => $latest,
+				));
+				$include = (string) $data->renderWith('Includes/TopBar');
+			} finally {
+				$this->setIsDraftSecured($session, $oldSecured);
+				Versioned::set_reading_mode($oldMode);
+			}
+
+			return str_replace('</body>', $include . '</body>', (string) $rendered->getBody());
+		} else {
+			return $this->errorPage();
+		}
+	}
+
+	/**
+	 * @return DBHTMLText
+	 */
+	protected function errorPage()
+	{
+		Requirements::css('silverstripe/sharedraftcontent: client/dist/styles/error-page.css');
+		return $this->renderWith('ShareDraftContentError');
+	}
+
+	/**
+	 * @param SiteTree $page
+	 * @return ContentController
+	 */
+	protected function getControllerFor($page)
+	{
+		return ModelAsController::controller_for($page);
+	}
+
+	/**
+	 * Check if the draft site is secured
+	 *
+	 * @param Session $session
+	 * @return bool True if the draft site is secured
+	 */
+	protected function getIsDraftSecured(Session $session)
+	{
+		// Versioned >=1.2
+		if (method_exists(Versioned::class, 'get_draft_site_secured')) {
+			return Versioned::get_draft_site_secured();
+		}
+
+		// Fall back to session
+		return !$session->get('unsecuredDraftSite');
+	}
+
+	/**
+	 * Set draft site security
+	 *
+	 * @param Session $session
+	 * @param bool $secured True if draft site should be secured
+	 */
+	protected function setIsDraftSecured(Session $session, $secured)
+	{
+		// Versioned >=1.2
+		if (method_exists(Versioned::class, 'set_draft_site_secured')) {
+			Versioned::set_draft_site_secured($secured);
+		}
+
+		// Set session variable anyway
+		$session->set('unsecuredDraftSite', !$secured);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
                 Versioned::set_reading_mode($oldMode);
             }
 
-            return str_replace('</body>', $include . '</body>', (string) $rendered->getBody());
+            return str_replace('</body>', $include.'</body>', (string) $rendered->getBody());
         } else {
             return $this->errorPage();
         }

src/Extensions/ShareDraftContentSiteTreeExtension.php

Indentation +111 added lines, -111 removed lines

@@ -18,115 +18,115 @@
  */
 class ShareDraftContentSiteTreeExtension extends DataExtension
 {
-    /**
-     * The number of days a shared link should be valid for, before expiring.
-     *
-     * @config
-     *
-     * @var int
-     */
-    private static $valid_for_days = 30;
-
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'ShareTokenSalt' => 'Varchar(16)',
-    );
-
-    /**
-     * @var array
-     */
-    private static $has_many = array(
-        'ShareTokens' => ShareToken::class,
-    );
-
-    /**
-     * @var array
-     */
-    private static $allowed_actions = array(
-        'MakeShareDraftLink'
-    );
-
-    /**
-     * @return string
-     */
-    public function ShareTokenLink()
-    {
-        $shareToken = $this->getNewShareToken();
-
-        return Controller::join_links(
-            Director::absoluteBaseURL(),
-            'preview',
-            $this->generateKey($shareToken->Token),
-            $shareToken->Token
-        );
-    }
-
-    /**
-     * @return ShareToken
-     */
-    protected function getNewShareToken()
-    {
-        if (!$this->owner->ShareTokenSalt) {
-            $this->owner->ShareTokenSalt = $this->getNewToken();
-            $this->owner->write();
-        }
-
-        $found = null;
-        $token = null;
-        $tries = 1;
-        $limit = 5;
-
-        while (!$found && ($tries++ < $limit)) {
-            $token = $this->getNewToken();
-
-            $found = ShareToken::get()->filter(array(
-                "Token" => $token,
-                "PageID" => $this->owner->ID,
-            ))->first();
-        }
-
-        $config = Config::forClass(__CLASS__);
-
-        $validForDays = $config->get('valid_for_days');
-
-        $token = ShareToken::create(array(
-            "Token" => $token,
-            "ValidForDays" => $validForDays,
-            "PageID" => $this->owner->ID,
-        ));
-
-        $token->write();
-
-        return $token;
-    }
-
-    /**
-     * @return string
-     */
-    protected function getNewToken()
-    {
-        $generator = new RandomGenerator();
-
-        return substr($generator->randomToken('sha256'), 0, 16);
-    }
-
-    /**
-     * @param string $salt
-     *
-     * @return string
-     */
-    public function generateKey($salt)
-    {
-        return hash_pbkdf2('sha256', $salt, $this->owner->ShareTokenSalt, 1000, 16);
-    }
-
-    /**
-     * @return string
-     */
-    public function getShareDraftLinkAction()
-    {
-        return $this->owner->Link('MakeShareDraftLink');
-    }
+	/**
+	 * The number of days a shared link should be valid for, before expiring.
+	 *
+	 * @config
+	 *
+	 * @var int
+	 */
+	private static $valid_for_days = 30;
+
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'ShareTokenSalt' => 'Varchar(16)',
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $has_many = array(
+		'ShareTokens' => ShareToken::class,
+	);
+
+	/**
+	 * @var array
+	 */
+	private static $allowed_actions = array(
+		'MakeShareDraftLink'
+	);
+
+	/**
+	 * @return string
+	 */
+	public function ShareTokenLink()
+	{
+		$shareToken = $this->getNewShareToken();
+
+		return Controller::join_links(
+			Director::absoluteBaseURL(),
+			'preview',
+			$this->generateKey($shareToken->Token),
+			$shareToken->Token
+		);
+	}
+
+	/**
+	 * @return ShareToken
+	 */
+	protected function getNewShareToken()
+	{
+		if (!$this->owner->ShareTokenSalt) {
+			$this->owner->ShareTokenSalt = $this->getNewToken();
+			$this->owner->write();
+		}
+
+		$found = null;
+		$token = null;
+		$tries = 1;
+		$limit = 5;
+
+		while (!$found && ($tries++ < $limit)) {
+			$token = $this->getNewToken();
+
+			$found = ShareToken::get()->filter(array(
+				"Token" => $token,
+				"PageID" => $this->owner->ID,
+			))->first();
+		}
+
+		$config = Config::forClass(__CLASS__);
+
+		$validForDays = $config->get('valid_for_days');
+
+		$token = ShareToken::create(array(
+			"Token" => $token,
+			"ValidForDays" => $validForDays,
+			"PageID" => $this->owner->ID,
+		));
+
+		$token->write();
+
+		return $token;
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getNewToken()
+	{
+		$generator = new RandomGenerator();
+
+		return substr($generator->randomToken('sha256'), 0, 16);
+	}
+
+	/**
+	 * @param string $salt
+	 *
+	 * @return string
+	 */
+	public function generateKey($salt)
+	{
+		return hash_pbkdf2('sha256', $salt, $this->owner->ShareTokenSalt, 1000, 16);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getShareDraftLinkAction()
+	{
+		return $this->owner->Link('MakeShareDraftLink');
+	}
 }

tests/ShareTokenTest.php

Indentation +18 added lines, -18 removed lines

@@ -8,27 +8,27 @@
 
 class ShareTokenTest extends FunctionalTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'ShareTokenTest.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'ShareTokenTest.yml';
 
-    public function testValidForDays()
-    {
-        DBDatetime::set_mock_now('2015-03-15 00:00:00');
+	public function testValidForDays()
+	{
+		DBDatetime::set_mock_now('2015-03-15 00:00:00');
 
-        /**
-         * @var ShareToken $validToken
-         */
-        $validToken = $this->objFromFixture(ShareToken::class, 'ValidToken');
+		/**
+		 * @var ShareToken $validToken
+		 */
+		$validToken = $this->objFromFixture(ShareToken::class, 'ValidToken');
 
-        $this->assertFalse($validToken->isExpired());
+		$this->assertFalse($validToken->isExpired());
 
-        /**
-         * @var ShareToken $invalidToken
-         */
-        $invalidToken = $this->objFromFixture(ShareToken::class, 'InvalidToken');
+		/**
+		 * @var ShareToken $invalidToken
+		 */
+		$invalidToken = $this->objFromFixture(ShareToken::class, 'InvalidToken');
 
-        $this->assertTrue($invalidToken->isExpired());
-    }
+		$this->assertTrue($invalidToken->isExpired());
+	}
 }

tests/ShareDraftContentSiteTreeExtensionTest.php

Indentation +57 added lines, -57 removed lines

@@ -10,85 +10,85 @@
 
 class ShareDraftContentSiteTreeExtensionTest extends FunctionalTest
 {
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'ShareDraftContentSiteTreeExtensionTest.yml';
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'ShareDraftContentSiteTreeExtensionTest.yml';
 
-    public function testShareTokenLink()
-    {
-        /**
-         * First we check if both pages generate new ShareTokenSalt values. Then we check that
-         * these values are not the same.
-         */
+	public function testShareTokenLink()
+	{
+		/**
+		 * First we check if both pages generate new ShareTokenSalt values. Then we check that
+		 * these values are not the same.
+		 */
 
-        /** @var Page|ShareDraftContentSiteTreeExtension $firstSharedPage */
-        $firstSharedPage = $this->objFromFixture(Page::class, 'FirstSharedPage');
+		/** @var Page|ShareDraftContentSiteTreeExtension $firstSharedPage */
+		$firstSharedPage = $this->objFromFixture(Page::class, 'FirstSharedPage');
 
-        $firstShareLink = $firstSharedPage->ShareTokenLink();
+		$firstShareLink = $firstSharedPage->ShareTokenLink();
 
-        $this->assertNotEmpty($firstSharedPage->ShareTokenSalt);
+		$this->assertNotEmpty($firstSharedPage->ShareTokenSalt);
 
-        /** @var Page|ShareDraftContentSiteTreeExtension $secondSharedPage */
-        $secondSharedPage = $this->objFromFixture(Page::class, 'SecondSharedPage');
+		/** @var Page|ShareDraftContentSiteTreeExtension $secondSharedPage */
+		$secondSharedPage = $this->objFromFixture(Page::class, 'SecondSharedPage');
 
-        $secondShareLink = $secondSharedPage->ShareTokenLink();
+		$secondShareLink = $secondSharedPage->ShareTokenLink();
 
-        $this->assertNotEmpty($secondSharedPage->ShareTokenSalt);
+		$this->assertNotEmpty($secondSharedPage->ShareTokenSalt);
 
-        $this->assertNotEquals($firstShareLink, $secondShareLink);
+		$this->assertNotEquals($firstShareLink, $secondShareLink);
 
-        // Ensure that salt between two pages causes key to differ for null token
-        $this->assertNotEquals(
-            $firstSharedPage->generateKey(null),
-            $secondSharedPage->generateKey(null)
-        );
+		// Ensure that salt between two pages causes key to differ for null token
+		$this->assertNotEquals(
+			$firstSharedPage->generateKey(null),
+			$secondSharedPage->generateKey(null)
+		);
 
-        /**
-         * Then we get the underlying token and send a preview request. With a valid key and token,
-         * this will return a draft page. With an invalid key or token, this will return an expired
-         * link page.
-         */
+		/**
+		 * Then we get the underlying token and send a preview request. With a valid key and token,
+		 * this will return a draft page. With an invalid key or token, this will return an expired
+		 * link page.
+		 */
 
-        $firstSharedPageToken = $firstSharedPage->ShareTokens()->first();
+		$firstSharedPageToken = $firstSharedPage->ShareTokens()->first();
 
-        $this->assertNotEmpty($firstSharedPageToken);
+		$this->assertNotEmpty($firstSharedPageToken);
 
-        // Ensure that salt between two pages causes key to differ for either token
-        $this->assertNotEquals(
-            $firstSharedPage->generateKey($firstSharedPageToken->Token),
-            $secondSharedPage->generateKey($firstSharedPageToken->Token)
-        );
+		// Ensure that salt between two pages causes key to differ for either token
+		$this->assertNotEquals(
+			$firstSharedPage->generateKey($firstSharedPageToken->Token),
+			$secondSharedPage->generateKey($firstSharedPageToken->Token)
+		);
 
-        $parts = explode('/', $firstShareLink);
+		$parts = explode('/', $firstShareLink);
 
-        $token = array_pop($parts);
-        $key = array_pop($parts);
+		$token = array_pop($parts);
+		$key = array_pop($parts);
 
-        $this->assertEquals($token, $firstSharedPageToken->Token);
+		$this->assertEquals($token, $firstSharedPageToken->Token);
 
-        $request = new HTTPRequest('GET', $firstShareLink);
+		$request = new HTTPRequest('GET', $firstShareLink);
 
-        $request->setRouteParams(array(
-            'Token' => $token,
-            'Key' => $key,
-        ));
+		$request->setRouteParams(array(
+			'Token' => $token,
+			'Key' => $key,
+		));
 
-        $controller = new ShareDraftController();
-        $response = $controller->preview($request);
+		$controller = new ShareDraftController();
+		$response = $controller->preview($request);
 
-        $this->assertContains('share-draft-content-message', $response);
+		$this->assertContains('share-draft-content-message', $response);
 
-        $request = new HTTPRequest('GET', $firstShareLink);
+		$request = new HTTPRequest('GET', $firstShareLink);
 
-        $request->setRouteParams(array(
-            'Token' => $token,
-            'Key' => '',
-        ));
+		$request->setRouteParams(array(
+			'Token' => $token,
+			'Key' => '',
+		));
 
-        $controller = new ShareDraftController();
-        $response = $controller->preview($request);
+		$controller = new ShareDraftController();
+		$response = $controller->preview($request);
 
-        $this->assertContains('share-draft-error-page', $response);
-    }
+		$this->assertContains('share-draft-error-page', $response);
+	}
 }