Skip to content

Bugfix: Prevent route mismatching #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Prevent route mismatching #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/UrlRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@ class UrlRule extends BaseObject implements UrlRuleInterface
/**
* @var string The Regular Expressions Syntax used to parse the id of the main resource from url.
* For example, in the following final rule, $linkAttributePattern is default to that `\d+` to parse $brand_id value:
*
*
* GET,HEAD v1/brands/<brand_id:\d+>/items/<IDs:\d[\d,]*>
*
*
* While that works fine with digital IDs, in a system using a different format, like uuid for example,
* you may use $linkAttributePattern to define different patterns. Something like this maybe:
*
*
* [
* // Nested Rules Brand
* 'class' => 'tunecino\nestedrest\UrlRule',
Expand Down Expand Up @@ -204,6 +204,7 @@ public function parseRequest($manager, $request)
$link_attribute = isset($this->linkAttribute) ? $this->linkAttribute : $modelName . '_id';
$this->config['prefix'] = $resourceName . '/<' . $link_attribute . ':' . $this->linkAttributePattern . '>';

$allRelationsConfig = $this->config;
foreach ($this->relations as $key => $value) {
if (is_int($key)) {
$relation = $value;
Expand All @@ -224,10 +225,13 @@ public function parseRequest($manager, $request)
}

$modulePrefix = isset($this->modulePrefix) ? $this->modulePrefix . '/' : '';
$this->config['controller'][$urlName] = $modulePrefix . $controller;
$config = $this->config;
$config['controller'][$urlName] = $modulePrefix . $controller;
$allRelationsConfig['controller'][$urlName] = $modulePrefix . $controller;

$this->setRulesFactory($this->config);
$routeObj = $this->rulesFactory->parseRequest($manager, $request);
/** @var \yii\rest\UrlRule $urlRule */
$urlRule = Yii::createObject($config);
$routeObj = $urlRule->parseRequest($manager, $request);

if ($routeObj) {
$routeObj[1]['relativeClass'] = $this->modelClass;
Expand All @@ -237,6 +241,8 @@ public function parseRequest($manager, $request)
}
}

$this->setRulesFactory($allRelationsConfig);

return false;
}
}