-
Notifications
You must be signed in to change notification settings - Fork 759
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.
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
Alias Username fetch on CheckCredential calls #2827
base: master
Are you sure you want to change the base?
Changes from 1 commit
11e9d2b
da56559
2f24db3
794acef
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -282,13 +282,15 @@ Cloud.prototype.checkCredentials = function (onSuccess, onError, response) { | |
if (user.username) { | ||
myself.username = user.username; | ||
myself.verified = user.verified; | ||
myself.previous_username_admin = user.previous_username_admin; | ||
} | ||
if (onSuccess) { | ||
onSuccess.call( | ||
null, | ||
user.username, | ||
user.role, | ||
response ? JSON.parse(response) : null | ||
response ? JSON.parse(response) : null, | ||
user.previous_username_admin | ||
); | ||
} | ||
}, | ||
|
@@ -327,6 +329,34 @@ Cloud.prototype.logout = function (onSuccess, onError) { | |
); | ||
}; | ||
|
||
Cloud.prototype.logoutAlias = function (onSuccess, onError) { | ||
var myself = this; | ||
this.getCurrentUser( | ||
function (user) { | ||
if (user.username && user.previous_username_admin) { | ||
myself.login( | ||
user.previous_username_admin, | ||
0, // password is irrelevant | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This should be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 0 was used during the alias login section of the website as well I can try null or ' ' and see what happens |
||
false, // ignored | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Doesn't this unset the users previous setting? If not can you add a more clear comment about why? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll make more clear in the comments that I saved the previous user setting of the alias and use that, so no matter what choice is ticked here it won't be used |
||
function (username, role, previous_username_admin, response) { | ||
alert( | ||
response.message, | ||
function () { | ||
onSuccess.call(); | ||
sessionStorage.previous_username_admin = previous_username_admin; | ||
sessionStorage.username = username; | ||
sessionStorage.role = role; | ||
} | ||
); | ||
}, | ||
onError | ||
); | ||
} | ||
}, | ||
onError | ||
); | ||
} | ||
|
||
Cloud.prototype.login = function ( | ||
username, | ||
password, | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's hard to tell where the on success callback is defined, but this doesn't feel like it should come after the response body. IMO it should come before -- though ideally we use keyword args here.