Skip to content
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

Jump to bottom

Allow to provide/inject URL parameters on OCS urls too #210

Merged
merged 2 commits into from
Mar 31, 2021
Merged

Allow to provide/inject URL parameters on OCS urls too #210

merged 2 commits into from
Mar 31, 2021

Conversation

nickvergessen
Copy link
Contributor

Fix #194
Fix #209

@nickvergessen nickvergessen added the bug Something isn't working label Mar 29, 2021
nickvergessen
nickvergessen commented Mar 29, 2021
View reviewed changes
lib/index.ts Outdated Show resolved Hide resolved
@nickvergessen nickvergessen force-pushed the feature/194/ocs-url-parameters branch from 8e89dac to cb7f760 Compare March 30, 2021 07:22
nickvergessen
nickvergessen commented Mar 30, 2021
View reviewed changes
lib/index.ts Outdated Show resolved Hide resolved
@nickvergessen nickvergessen requested a review from skjnldsv March 30, 2021 07:26
@nickvergessen nickvergessen added enhancement New feature or request and removed bug Something isn't working labels Mar 30, 2021
@nickvergessen nickvergessen force-pushed the feature/194/ocs-url-parameters branch from cb7f760 to 1381574 Compare March 30, 2021 09:54
@nickvergessen
Allow to provide/inject URL parameters on OCS urls too
1996e60 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen force-pushed the feature/194/ocs-url-parameters branch from 1381574 to 1996e60 Compare March 30, 2021 09:56
@nickvergessen nickvergessen marked this pull request as ready for review March 30, 2021 09:57
@nickvergessen
Improve documentation
7485bfc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
ChristophWurst
ChristophWurst requested changes Mar 30, 2021
View reviewed changes
lib/index.ts Show resolved Hide resolved
ChristophWurst
ChristophWurst reviewed Mar 31, 2021
View reviewed changes
lib/index.ts
ocsVersion: 2
}, options || {})

const version = (allOptions.ocsVersion === 1) ? 1 : 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in theory we can now just use allOptions.ocsVersion as it's documented to be a number. If anyone specifies otherwise it's their fault if the function returns an invalid URL

ChristophWurst
ChristophWurst approved these changes Mar 31, 2021
View reviewed changes
Copy link
Contributor

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@nickvergessen nickvergessen merged commit 4eddff4 into master Mar 31, 2021
@delete-merged-branch delete-merged-branch bot deleted the feature/194/ocs-url-parameters branch March 31, 2021 08:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

generateOcsUrl shouldn't add a trailing '/' to the url Allow passing args to generateXXX functions
2 participants
@nickvergessen @ChristophWurst