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

Convert oauth2-server-config package to js #7017

Merged
merged 10 commits into from
May 31, 2017
Merged

Convert oauth2-server-config package to js #7017

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
398d2a7
wip
MartinSchoeler May 17, 2017
d9117c7
Convert oauth-server-config to js
MartinSchoeler May 18, 2017
a230e12
Merge remote-tracking branch 'origin/develop' into rocketchat-oauth-t…
MartinSchoeler May 18, 2017
546c663
fix reviews
MartinSchoeler May 29, 2017
3d8490f
Merge remote-tracking branch 'origin/develop' into rocketchat-oauth-t…
MartinSchoeler May 31, 2017
6533606
remove the coffee files
MartinSchoeler May 31, 2017
e0ea65c
Update oauthApp.js
ggazzo May 31, 2017
19fe2d9
Update oauthApps.js
ggazzo May 31, 2017
fc0a1ab
Update oauth2-client.js
ggazzo May 31, 2017
cc1fec3
remove the missing coffee files
MartinSchoeler May 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update oauth2-client.js 
fix an logic error
  • Loading branch information
@ggazzo
ggazzo authored May 31, 2017
commit fc0a1ab1f1c9f3ab4df5cf6e1a508d87fdc6eddc
10 changes: 4 additions & 6 deletions packages/rocketchat-oauth2-server-config/oauth/client/oauth2-client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,11 @@ Template.authorize.events({
});

Template.authorize.onRendered(function() {
this.autorun((c) => {
this.autorun(c => {
const user = Meteor.user();
if (user && user.oauth && user.oauth.authorizedClients) {
if (user.oauth.authorizedClients.indexOf(this.data.client_id() > -1)) {
c.stop();
$('button[type=submit]').click();
}
if (user && user.oauth && user.oauth.authorizedClients && user.oauth.authorizedClients.includes(this.data.client_id())) {
c.stop();
$('button[type=submit]').click();
}
});
});