Przeglądaj źródła

Forked salleman-oidc to https://github.com/wekan/meteor-accounts-oidc
where salleman also has write access, xet7 can make changes directly
and GitHub issues are enabled.

Thanks to xet7 !

Lauri Ojansivu 6 lat temu
rodzic
commit
8867bec8e6

+ 3 - 3
.meteor/packages

@@ -31,7 +31,9 @@ kenton:accounts-sandstorm
 service-configuration@1.0.11
 service-configuration@1.0.11
 useraccounts:unstyled
 useraccounts:unstyled
 useraccounts:flow-routing
 useraccounts:flow-routing
-salleman:accounts-oidc
+wekan:wekan-ldap
+wekan:accounts-cas
+wekan-accounts-oidc
 
 
 # Utilities
 # Utilities
 check@1.2.5
 check@1.2.5
@@ -86,8 +88,6 @@ momentjs:moment@2.22.2
 browser-policy-framing
 browser-policy-framing
 mquandalle:moment
 mquandalle:moment
 msavin:usercache
 msavin:usercache
-wekan:wekan-ldap
-wekan:accounts-cas
 wekan-scrollbar
 wekan-scrollbar
 mquandalle:perfect-scrollbar
 mquandalle:perfect-scrollbar
 mdg:meteor-apm-agent
 mdg:meteor-apm-agent

+ 2 - 2
.meteor/versions

@@ -145,8 +145,8 @@ reload@1.1.11
 retry@1.0.9
 retry@1.0.9
 routepolicy@1.0.12
 routepolicy@1.0.12
 rzymek:fullcalendar@3.8.0
 rzymek:fullcalendar@3.8.0
-salleman:accounts-oidc@1.0.10
-salleman:oidc@1.0.12
+wekan-accounts-oidc@1.0.10
+wekan-oidc@1.0.12
 service-configuration@1.0.11
 service-configuration@1.0.11
 session@1.1.7
 session@1.1.7
 sha@1.0.9
 sha@1.0.9

+ 4 - 0
Dockerfile

@@ -267,6 +267,10 @@ RUN \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
     gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \
+    gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \
+    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \
+    gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \
+    gosu wekan:wekan rm -rf meteor-accounts-oidc && \
     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; \

+ 4 - 0
rebuild-wekan.bat

@@ -34,6 +34,10 @@ git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git me
 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+move meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+move meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+del /S /F /Q meteor-accounts-oidc
 REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 REM sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 cd ..
 cd ..
 REM del /S /F /Q node_modules
 REM del /S /F /Q node_modules

+ 4 - 0
rebuild-wekan.sh

@@ -118,6 +118,10 @@ do
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+                rm -rf meteor-accounts-oidc
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			echo "sed at macOS";
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js

+ 4 - 1
releases/virtualbox/rebuild-wekan.sh

@@ -71,7 +71,10 @@ do
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
 		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
-
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+                rm -rf meteor-accounts-oidc
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
 			echo "sed at macOS";
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
 			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js

+ 8 - 0
snapcraft.yaml

@@ -176,6 +176,14 @@ parts:
               git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
               git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
               cd ..
               cd ..
             fi
             fi
+            if [ ! -d "packages/wekan_accounts-oidc" ]; then
+              cd packages
+              git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+              mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+              mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+              rm -rf meteor-accounts-oidc
+              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

+ 6 - 0
stacksmith/user-scripts/build.sh

@@ -75,6 +75,12 @@ sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.g
 sudo -u wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 sudo -u wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
 sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git
 sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git
 sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git
 sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git
+sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git
+sudo -u wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git
+sudo -u wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+sudo -u wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
+sudo -u wekan rm -rf meteor-accounts-oidc
+
 sudo sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js
 sudo sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js
 sudo -u wekan /home/wekan/.meteor/meteor -- help
 sudo -u wekan /home/wekan/.meteor/meteor -- help