Skip to content

Commit

Permalink
Sending uuid for ory claims
Browse files Browse the repository at this point in the history
  • Loading branch information
ghecquet committed Nov 19, 2019
1 parent f945f52 commit 570f03f
Show file tree
Hide file tree
Showing 12 changed files with 424 additions and 359 deletions.
Binary file not shown.
Binary file not shown.
Binary file modified frontend/front-srv/assets/gui.ajax/res/build/PydioForm.min.js.gz
Binary file not shown.
Binary file modified frontend/front-srv/assets/gui.ajax/res/build/PydioHOCs.min.js.gz
Binary file not shown.
687 changes: 374 additions & 313 deletions frontend/front-srv/assets/gui.ajax/res/build/PydioReactUI.js

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions frontend/front-srv/assets/gui.ajax/res/build/PydioReactUI.min.js

Large diffs are not rendered by default.

Binary file modified frontend/front-srv/assets/gui.ajax/res/build/PydioReactUI.min.js.gz
Binary file not shown.
Binary file not shown.
Binary file modified frontend/front-srv/assets/gui.ajax/res/build/bundle.min.js.gz
Binary file not shown.
Binary file modified frontend/front-srv/assets/gui.ajax/res/build/pydio.min.js.gz
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,21 @@ var OAuthLoginRouter = function OAuthLoginRouter(pydio) {
var loginChallenge = this.loginChallenge;

_pydioHttpApi2['default'].getRestClient().getOrUpdateJwt().then(function (jwt) {
var body = {
subject: pydio.user.id
};

fetch('/oidc-admin/oauth2/auth/requests/login/accept?' + _queryString2['default'].stringify({ login_challenge: loginChallenge }), {
method: 'PUT',
body: JSON.stringify(body),
headers: { 'Content-Type': 'application/json' }
}).then(function (response) {
return response.json();
}).then(function (response) {
// The response will contain a `redirect_to` key which contains the URL where the user's user agent must be redirected to next.
window.location.replace(response.redirect_to);
pydio.user.getIdmUser().then(function (u) {
var body = {
subject: u.Uuid
};

fetch('/oidc-admin/oauth2/auth/requests/login/accept?' + _queryString2['default'].stringify({ login_challenge: loginChallenge }), {
method: 'PUT',
body: JSON.stringify(body),
headers: { 'Content-Type': 'application/json' }
}).then(function (response) {
return response.json();
}).then(function (response) {
// The response will contain a `redirect_to` key which contains the URL where the user's user agent must be redirected to next.
window.location.replace(response.redirect_to);
});
});
});
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,23 @@ export const OAuthLoginRouter = (pydio) => {
const loginChallenge = this.loginChallenge;

PydioApi.getRestClient().getOrUpdateJwt().then((jwt) => {
const body = {
subject: pydio.user.id,
};

fetch('/oidc-admin/oauth2/auth/requests/login/accept?' + qs.stringify({ login_challenge: loginChallenge }), {
method: 'PUT',
body: JSON.stringify(body),
headers: { 'Content-Type': 'application/json' }
}).
then(function (response) {
return response.json()
}).
then(function (response) {
// The response will contain a `redirect_to` key which contains the URL where the user's user agent must be redirected to next.
window.location.replace(response.redirect_to);
pydio.user.getIdmUser().then(u => {
const body = {
subject: u.Uuid,
};

fetch('/oidc-admin/oauth2/auth/requests/login/accept?' + qs.stringify({ login_challenge: loginChallenge }), {
method: 'PUT',
body: JSON.stringify(body),
headers: { 'Content-Type': 'application/json' }
}).
then(function (response) {
return response.json()
}).
then(function (response) {
// The response will contain a `redirect_to` key which contains the URL where the user's user agent must be redirected to next.
window.location.replace(response.redirect_to);
})
})
})
}
Expand Down

0 comments on commit 570f03f

Please sign in to comment.