feat(permissions): make origin optional #1406
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pavelfeldman
force-pushed
the
fe_permissions
branch
2 times, most recently
from
643a166
to
cfaaeb0
Compare
dgozman
approved these changes
Mar 17, 2020
docs/api.md
Outdated
| #### browserContext.setPermissions(origin, permissions[]) | ||
| - `origin` <[string]> The [origin] to grant permissions to, e.g. "https://example.com". | ||
| - `permissions` <[Array]<[string]>> An array of permissions to grant. All permissions that are not listed here will be automatically denied. Permissions can be one of the following values: | ||
| #### browserContext.grantPermissions(permissions[], options) |
There was a problem hiding this comment.
Should be (permissions[, options])
docs/api.md
Outdated
| @@ -381,7 +381,7 @@ Clears all permission overrides for the browser context. | |||
|
|
|||
| ```js | |||
| const context = await browser.newContext(); | |||
| context.setPermissions('https://example.com', ['clipboard-read']); | |||
| context.grantPermissions(['clipboard-read']); | |||
There was a problem hiding this comment.
await context.grantPermissions(...)
| @@ -381,7 +381,7 @@ Clears all permission overrides for the browser context. | |||
|
|
|||
| ```js | |||
| const context = await browser.newContext(); | |||
| context.setPermissions('https://example.com', ['clipboard-read']); | |||
| context.grantPermissions(['clipboard-read']); | |||
| // do stuff .. | |||
| context.clearPermissions(); | |||
package.json
Outdated
| @@ -46,6 +46,7 @@ | |||
| "extract-zip": "^1.6.6", | |||
| "https-proxy-agent": "^3.0.0", | |||
| "jpeg-js": "^0.3.6", | |||
| "playwright": "^0.11.1-next.1583993157193", | |||
| } | ||
|
|
||
| async clearPermissions() { | ||
| this._permissions.clear(); |
There was a problem hiding this comment.
It is confusing that we don't call _doClearPermissions here.
There was a problem hiding this comment.
I thought the same way. Fixing.
src/chromium/crBrowser.ts
Outdated
| } | ||
|
|
||
| async clearPermissions() { | ||
| super.clearPermissions(); |
There was a problem hiding this comment.
Please await this, since it's an async function.
src/webkit/wkBrowser.ts
Outdated
| const entries = Object.entries(this._options.permissions || {}); | ||
| await Promise.all(entries.map(entry => this.setPermissions(entry[0], entry[1]))); | ||
| if (this._options.permissions) | ||
| this.grantPermissions(this._options.permissions); |
test/permissions.spec.js
Outdated
| expect(await getPermission(page, 'geolocation')).toBe('denied'); | ||
| }); | ||
| it('should fail when bad permission is given', async({page, server, context}) => { | ||
| await page.goto(server.EMPTY_PAGE); | ||
| let error = {}; | ||
| await context.setPermissions(server.EMPTY_PAGE, ['foo']).catch(e => error = e); | ||
| await context.grantPermissions(['foo']).catch(e => error = e, { origin: server.EMPTY_PAGE }); |
There was a problem hiding this comment.
This is some funky syntax 😄
| @@ -71,9 +103,9 @@ module.exports.describe = function({testRunner, expect, WEBKIT}) { | |||
| }); | |||
| }); | |||
| expect(await page.evaluate(() => window['events'])).toEqual(['prompt']); | |||
| await context.setPermissions(server.EMPTY_PAGE, []); | |||
| await context.grantPermissions([], { origin: server.EMPTY_PAGE }); | |||
There was a problem hiding this comment.
server.EMPTY_PAGE is not quite an origin. Do we support urls? I don't see where we convert url to an origin.
There was a problem hiding this comment.
I think it happens inside the browsers :/
pavelfeldman
force-pushed
the
fe_permissions
branch
2 times, most recently
from
2c22a09
to
0e77909
Compare
pavelfeldman
force-pushed
the
fe_permissions
branch
from
0e77909
to
6520cfc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.