From ee81775dc8306a9e88d6c7573864f12269f78c01 Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 15:55:19 +0200 Subject: [PATCH 1/3] Adding SSO CAS to Wekan --- .meteor/packages | 1 + .meteor/versions | 1 + client/components/main/layouts.jade | 3 +++ client/components/main/layouts.js | 17 +++++++++++++++++ i18n/en.i18n.json | 1 + settings.json | 1 + 6 files changed, 24 insertions(+) create mode 100644 settings.json diff --git a/.meteor/packages b/.meteor/packages index 8f83280f3..e76e15fbd 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -85,3 +85,4 @@ browser-policy eluck:accounts-lockout rzymek:fullcalendar momentjs:moment@2.22.2 +atoy40:accounts-cas \ No newline at end of file diff --git a/.meteor/versions b/.meteor/versions index a173e7e44..9de09a74b 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -9,6 +9,7 @@ aldeed:simple-schema@1.5.3 alethes:pages@1.8.6 allow-deny@1.1.0 arillo:flow-router-helpers@0.5.2 +atoy40:accounts-cas@0.0.2 audit-argument-checks@1.0.7 autoupdate@1.3.12 babel-compiler@6.24.7 diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 4d76aabb6..911f23f42 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -17,6 +17,9 @@ template(name="userFormsLayout") img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") section.auth-dialog +Template.dynamic(template=content) + if isCas + .at-form + button#cas(class='at-btn submit' type='submit') {{casSignInLabel}} div.at-form-lang select.select-lang.js-userform-set-language each languages diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index f12718a71..ab47c8edf 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -39,6 +39,16 @@ Template.userFormsLayout.helpers({ const curLang = T9n.getLanguage() || 'en'; return t9nTag === curLang; }, + + isCas() { + return Meteor.settings.public && + Meteor.settings.public.cas && + Meteor.settings.public.cas.loginUrl + }, + + casSignInLabel() { + return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en'); + }, }); Template.userFormsLayout.events({ @@ -47,6 +57,13 @@ Template.userFormsLayout.events({ T9n.setLanguage(i18nTagToT9n(i18nTag)); evt.preventDefault(); }, + 'click button#cas'() { + Meteor.loginWithCas(function() { + if (FlowRouter.getRouteName() == 'atSignIn') { + FlowRouter.go('/'); + } + }); + }, }); Template.defaultLayout.events({ diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 51a9b4cc7..fa95f162a 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -131,6 +131,7 @@ "cardMorePopup-title": "More", "cards": "Cards", "cards-count": "Cards", + "casSignIn" : "Sign In with CAS", "change": "Change", "change-avatar": "Change Avatar", "change-password": "Change Password", diff --git a/settings.json b/settings.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/settings.json @@ -0,0 +1 @@ +{} \ No newline at end of file From 49a89b80cfec69d715e8b13db540d10c9fa97ffe Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 16:08:18 +0200 Subject: [PATCH 2/3] Fix QA --- client/components/main/layouts.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index ab47c8edf..943a94e70 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -43,7 +43,7 @@ Template.userFormsLayout.helpers({ isCas() { return Meteor.settings.public && Meteor.settings.public.cas && - Meteor.settings.public.cas.loginUrl + Meteor.settings.public.cas.loginUrl; }, casSignInLabel() { @@ -59,7 +59,7 @@ Template.userFormsLayout.events({ }, 'click button#cas'() { Meteor.loginWithCas(function() { - if (FlowRouter.getRouteName() == 'atSignIn') { + if (FlowRouter.getRouteName() ==== 'atSignIn') { FlowRouter.go('/'); } }); From 02f14d967f3f1cdd633131a31782297ef564a6d8 Mon Sep 17 00:00:00 2001 From: ppoulard Date: Tue, 3 Jul 2018 16:21:51 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20stupid=20error=20=F0=9F=92=A5?= =?UTF-8?q?=F0=9F=97=AF=F0=9F=92=A3=F0=9F=95=B3=F0=9F=92=A2=E2=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/main/layouts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 943a94e70..6d6e616db 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -59,7 +59,7 @@ Template.userFormsLayout.events({ }, 'click button#cas'() { Meteor.loginWithCas(function() { - if (FlowRouter.getRouteName() ==== 'atSignIn') { + if (FlowRouter.getRouteName() === 'atSignIn') { FlowRouter.go('/'); } });