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

make sure scopes are added to redirectURL #6416

Merged
merged 7 commits into from
Sep 22, 2020
Merged

make sure scopes are added to redirectURL #6416

Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c47719
make sure scopes are handled correctly if not an array but toArray me…
dalbrx-forcam Sep 18, 2020
95724fd
check for function instead of undefined
dalbrx-forcam Sep 18, 2020
49a7b90
check if scopes is undefined
dalbrx-forcam Sep 18, 2020
14c86ae
check if scopes is undefined
dalbrx-forcam Sep 18, 2020
82ab896
use double quotes to pass build
dalbrx-forcam Sep 18, 2020
78d57fc
use immutable, extended test
dalbrx-forcam Sep 22, 2020
43cd3cf
Merge branch 'master' into handle-scope-obj
tim-lai Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/core/oauth2-authorize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,17 @@ export default function authorize ( { auth, authActions, errActions, configs, au
}
query.push("redirect_uri=" + encodeURIComponent(redirectUrl))

if (Array.isArray(scopes) && 0 < scopes.length) {
let scopesArray = []
if (Array.isArray(scopes)) {
scopesArray = scopes
} else if (typeof scopes !== "undefined" && typeof scopes.toArray === "function") {
dalbrx-forcam marked this conversation as resolved.
Show resolved Hide resolved
scopesArray = scopes.toArray()
}

if (0 < scopesArray.length) {
dalbrx-forcam marked this conversation as resolved.
Show resolved Hide resolved
let scopeSeparator = authConfigs.scopeSeparator || " "

query.push("scope=" + encodeURIComponent(scopes.join(scopeSeparator)))
query.push("scope=" + encodeURIComponent(scopesArray.join(scopeSeparator)))
}

let state = btoa(new Date())
Expand Down