config.token() and arg_token are not used anymore

setup/argparser.sh

@@ -12,7 +12,6 @@ arg_zone_name=""
 arg_is_custom_domain="false" # can be removed after 1.9
 arg_retire_reason=""
 arg_retire_info=""
-arg_token=""
 arg_version=""
 arg_web_server_origin=""
 arg_provider=""
@@ -58,8 +57,6 @@ while true; do
         arg_is_demo=$(echo "$2" | $json isDemo)
         [[ "${arg_is_demo}" == "" ]] && arg_is_demo="false"
 
-        arg_token=$(echo "$2" | $json token)
-
         arg_provider=$(echo "$2" | $json provider)
         [[ "${arg_provider}" == "" ]] && arg_provider="generic"
 
@@ -74,8 +71,6 @@ echo "Parsed arguments:"
 echo "api server: ${arg_api_server_origin}"
 echo "fqdn: ${arg_fqdn}"
 echo "custom domain: ${arg_is_custom_domain}"
-# do not dump these as they might become available via logs API
-#echo "token: ${arg_token}"
 echo "version: ${arg_version}"
 echo "web server: ${arg_web_server_origin}"
 echo "provider: ${arg_provider}"

setup/start.sh

@@ -217,7 +217,6 @@ echo "==> Creating cloudron.conf"
 cat > "${CONFIG_DIR}/cloudron.conf" <<CONF_END
 {
     "version": "${arg_version}",
-    "token": "${arg_token}",
     "apiServerOrigin": "${arg_api_server_origin}",
     "webServerOrigin": "${arg_web_server_origin}",
     "fqdn": "${arg_fqdn}",

src/cloudron.js

@@ -720,7 +720,6 @@ function doUpdate(boxUpdateInfo, callback) {
         // NOTE: this data is opaque and will be passed through the installer.sh
         var data= {
             provider: config.provider(),
-            token: config.token(),
             apiServerOrigin: config.apiServerOrigin(),
             webServerOrigin: config.webServerOrigin(),
             fqdn: config.fqdn(),
@@ -730,11 +729,9 @@ function doUpdate(boxUpdateInfo, callback) {
             zoneName: config.zoneName(),
 
             appstore: {
-                token: config.token(),
                 apiServerOrigin: config.apiServerOrigin()
             },
             caas: {
-                token: config.token(),
                 apiServerOrigin: config.apiServerOrigin(),
                 webServerOrigin: config.webServerOrigin()
             },

src/config.js

@@ -21,7 +21,6 @@ exports = module.exports = {
     setFqdn: setFqdn,
     setAdminFqdn: setAdminFqdn,
     setAdminLocation: setAdminLocation,
-    token: token,
     version: version,
     setVersion: setVersion,
     database: database,
@@ -73,7 +72,6 @@ function saveSync() {
     // only save values we want to have in the cloudron.conf, see start.sh
     var conf = {
         version: data.version,
-        token: data.token,
         apiServerOrigin: data.apiServerOrigin,
         webServerOrigin: data.webServerOrigin,
         fqdn: data.fqdn,
@@ -102,7 +100,6 @@ function initConfig() {
     data.zoneName = '';
     data.adminLocation = 'my';
     data.port = 3000;
-    data.token = null;
     data.version = null;
     data.apiServerOrigin = null;
     data.webServerOrigin = null;
@@ -124,7 +121,6 @@ function initConfig() {
     if (exports.TEST) {
         data.version = '1.1.1-test';
         data.port = 5454;
-        data.token = 'APPSTORE_TOKEN';
         data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
         data.database.password = '';
         data.database.name = 'boxtest';
@@ -222,10 +218,6 @@ function sysadminOrigin() {
     return 'http://127.0.0.1:' + get('sysadminPort');
 }
 
-function token() {
-    return get('token');
-}
-
 function version() {
     return get('version');
 }