summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-10-01 16:33:29 +0300
committerLauri Ojansivu <x@xet7.org>2018-10-01 16:33:29 +0300
commit5923585584f9cb8121476bf5e5d0abf7891e86f6 (patch)
tree6b5c8ee1bdbf60403902ac76abe95502d7b40e12
parent6b86b3b6e768b065d4a6e4779b18958ee932d9dc (diff)
downloadwekan-5923585584f9cb8121476bf5e5d0abf7891e86f6.tar.gz
wekan-5923585584f9cb8121476bf5e5d0abf7891e86f6.tar.bz2
wekan-5923585584f9cb8121476bf5e5d0abf7891e86f6.zip
- Remove CAS from Wekan stable, because it does not work correctly.
CAS developent continues at edge. Thanks to xet7 ! Related #1925
-rw-r--r--.meteor/packages1
-rw-r--r--.meteor/versions1
-rw-r--r--Dockerfile1
-rw-r--r--client/components/main/layouts.jade3
-rw-r--r--client/components/main/layouts.js17
-rw-r--r--snapcraft.yaml5
6 files changed, 0 insertions, 28 deletions
diff --git a/.meteor/packages b/.meteor/packages
index 2339c484..0bb90513 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -86,4 +86,3 @@ momentjs:moment@2.22.2
browser-policy-framing
mquandalle:moment
msavin:usercache
-wekan:accounts-cas
diff --git a/.meteor/versions b/.meteor/versions
index 184cba0e..fc7d64b0 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -174,5 +174,4 @@ useraccounts:unstyled@1.14.2
verron:autosize@3.0.8
webapp@1.4.0
webapp-hashing@1.0.9
-wekan:accounts-cas@0.1.0
zimme:active-route@2.3.2
diff --git a/Dockerfile b/Dockerfile
index 376389a2..1d0f20e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -148,7 +148,6 @@ RUN \
cd /home/wekan/app/packages && \
gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \
gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \
- gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas && \
sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
cd /home/wekan/.meteor && \
gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index b0024b33..bd9fac23 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -18,9 +18,6 @@ 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 6d6e616d..f12718a7 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -39,16 +39,6 @@ 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({
@@ -57,13 +47,6 @@ 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/snapcraft.yaml b/snapcraft.yaml
index e4276976..dbe738d0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -142,11 +142,6 @@ parts:
sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
cd ..
fi
- if [ ! -d "packages/meteor-accounts-cas" ]; then
- cd packages
- git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git meteor-accounts-cas
- cd ..
- fi
rm -rf package-lock.json .build
meteor add standard-minifier-js --allow-superuser
meteor npm install --allow-superuser