2
0
Эх сурвалжийг харах

- Remove CAS from Wekan stable, because it does not work correctly.
CAS developent continues at edge.

Thanks to xet7 !

Related #1925

Lauri Ojansivu 6 жил өмнө
parent
commit
5923585584

+ 0 - 1
.meteor/packages

@@ -86,4 +86,3 @@ momentjs:moment@2.22.2
 browser-policy-framing
 browser-policy-framing
 mquandalle:moment
 mquandalle:moment
 msavin:usercache
 msavin:usercache
-wekan:accounts-cas

+ 0 - 1
.meteor/versions

@@ -174,5 +174,4 @@ useraccounts:unstyled@1.14.2
 verron:autosize@3.0.8
 verron:autosize@3.0.8
 webapp@1.4.0
 webapp@1.4.0
 webapp-hashing@1.0.9
 webapp-hashing@1.0.9
-wekan:accounts-cas@0.1.0
 zimme:active-route@2.3.2
 zimme:active-route@2.3.2

+ 0 - 1
Dockerfile

@@ -148,7 +148,6 @@ RUN \
     cd /home/wekan/app/packages && \
     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/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/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 && \
     sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \
     cd /home/wekan/.meteor && \
     cd /home/wekan/.meteor && \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \
     gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \

+ 0 - 3
client/components/main/layouts.jade

@@ -18,9 +18,6 @@ template(name="userFormsLayout")
       img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
       img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan")
     section.auth-dialog
     section.auth-dialog
       +Template.dynamic(template=content)
       +Template.dynamic(template=content)
-      if isCas
-        .at-form
-          button#cas(class='at-btn submit' type='submit') {{casSignInLabel}}
       div.at-form-lang
       div.at-form-lang
         select.select-lang.js-userform-set-language
         select.select-lang.js-userform-set-language
           each languages
           each languages

+ 0 - 17
client/components/main/layouts.js

@@ -39,16 +39,6 @@ Template.userFormsLayout.helpers({
     const curLang = T9n.getLanguage() || 'en';
     const curLang = T9n.getLanguage() || 'en';
     return t9nTag === curLang;
     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({
 Template.userFormsLayout.events({
@@ -57,13 +47,6 @@ Template.userFormsLayout.events({
     T9n.setLanguage(i18nTagToT9n(i18nTag));
     T9n.setLanguage(i18nTagToT9n(i18nTag));
     evt.preventDefault();
     evt.preventDefault();
   },
   },
-  'click button#cas'() {
-    Meteor.loginWithCas(function() {
-      if (FlowRouter.getRouteName() === 'atSignIn') {
-        FlowRouter.go('/');
-      }
-    });
-  },
 });
 });
 
 
 Template.defaultLayout.events({
 Template.defaultLayout.events({

+ 0 - 5
snapcraft.yaml

@@ -142,11 +142,6 @@ parts:
               sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
               sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' meteor-useraccounts-core/package.js
               cd ..
               cd ..
             fi
             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
             rm -rf package-lock.json .build
             meteor add standard-minifier-js --allow-superuser
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
             meteor npm install --allow-superuser