From 58273efcb295aafc74d8564881dbe6fa391dde4e Mon Sep 17 00:00:00 2001 From: Kasra Bigdeli Date: Sun, 6 Jan 2019 16:40:47 -0800 Subject: [PATCH] better error management --- app-cli/built/commands/serversetup.js | 23 +++++++++++++-- app-cli/built/commands/serversetup.js.map | 2 +- app-cli/src/commands/serversetup.ts | 34 +++++++++++++++++++++-- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/app-cli/built/commands/serversetup.js b/app-cli/built/commands/serversetup.js index e349594..2b5c79c 100755 --- a/app-cli/built/commands/serversetup.js +++ b/app-cli/built/commands/serversetup.js @@ -21,6 +21,7 @@ const ErrorFactory_1 = require("../utils/ErrorFactory"); const SpinnerHelper_1 = require("../utils/SpinnerHelper"); let newPasswordFirstTry = undefined; let lastWorkingPassword = Constants_1.default.DEFAULT_PASSWORD; +let serverIpAddress = ''; let captainMachine = { authToken: '', baseUrl: '', @@ -56,6 +57,7 @@ const questions = [ // login using captain42. and set the ipAddressToServer captainMachine.baseUrl = `http://${ipFromUser}:3000`; yield CliApiManager_1.default.get(captainMachine).getAuthToken(lastWorkingPassword); + serverIpAddress = ipFromUser; } catch (e) { // User may have used a different default password @@ -86,8 +88,7 @@ const questions = [ type: 'input', name: 'captainRootDomain', message: 'Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you' + - ' setup your DNS to point *.test.yourdomain.com to ip address of your server' + - ': ', + ' setup your DNS to point *.test.yourdomain.com to ip address of your server.', filter: (value) => __awaiter(this, void 0, void 0, function* () { const captainRootDomainFromUser = value.trim(); try { @@ -96,6 +97,18 @@ const questions = [ captainMachine.baseUrl = `http://captain.${captainRootDomainFromUser}`; } catch (e) { + StdOutUtil_1.default.printError('\n\n'); + if (e.captainStatus === ErrorFactory_1.default.VERIFICATION_FAILED) { + if (captainRootDomainFromUser.indexOf('/') >= 0) { + StdOutUtil_1.default.printError('DO NOT include http in your base domain, it should be just plain domain, e.g., test.domain.com'); + } + if (captainRootDomainFromUser.indexOf('*') >= 0) { + StdOutUtil_1.default.printError('DO NOT include * in your base domain, it should be just plain domain, e.g., test.domain.com'); + } + StdOutUtil_1.default.printError(`\n\nCannot verify that http://captain.${captainRootDomainFromUser} points to your server IP.\n` + + `\nAre you sure that you set *.${captainRootDomainFromUser} points to ${serverIpAddress}\n\n` + + `Double check your DNS. If everything looks correct, note that, DNS changes take up to 24 hrs to work properly. Check with your Domain Provider.`); + } StdOutUtil_1.default.errorHandler(e); } return captainRootDomainFromUser; @@ -107,6 +120,10 @@ const questions = [ message: 'Enter a new password:', filter: (value) => { newPasswordFirstTry = value; + if (!newPasswordFirstTry) { + StdOutUtil_1.default.printError('Password empty.', true); + throw new Error('Password empty'); + } return value; } }, @@ -116,7 +133,7 @@ const questions = [ message: 'Enter your new password again:', filter: (value) => __awaiter(this, void 0, void 0, function* () { const confirmPasswordValueFromUser = value; - if (newPasswordFirstTry !== confirmPasswordValueFromUser) { + if ((newPasswordFirstTry !== confirmPasswordValueFromUser)) { StdOutUtil_1.default.printError('Passwords do not match. Try serversetup again.', true); throw new Error('Password mismatch'); } diff --git a/app-cli/built/commands/serversetup.js.map b/app-cli/built/commands/serversetup.js.map index 812606b..8aa6722 100755 --- a/app-cli/built/commands/serversetup.js.map +++ b/app-cli/built/commands/serversetup.js.map @@ -1 +1 @@ -{"version":3,"file":"serversetup.js","sourceRoot":"","sources":["../../src/commands/serversetup.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"serversetup.js","sourceRoot":"","sources":["../../src/commands/serversetup.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/app-cli/src/commands/serversetup.ts b/app-cli/src/commands/serversetup.ts index f419e56..0bc0be0 100644 --- a/app-cli/src/commands/serversetup.ts +++ b/app-cli/src/commands/serversetup.ts @@ -14,6 +14,7 @@ import SpinnerHelper from '../utils/SpinnerHelper'; let newPasswordFirstTry: string | undefined = undefined; let lastWorkingPassword: string = Constants.DEFAULT_PASSWORD; +let serverIpAddress = ''; let captainMachine: IMachine = { authToken: '', @@ -58,6 +59,7 @@ const questions = [ // login using captain42. and set the ipAddressToServer captainMachine.baseUrl = `http://${ipFromUser}:3000`; await CliApiManager.get(captainMachine).getAuthToken(lastWorkingPassword); + serverIpAddress = ipFromUser; } catch (e) { // User may have used a different default password if (e.captainStatus === ErrorFactory.STATUS_WRONG_PASSWORD) return ''; @@ -87,8 +89,7 @@ const questions = [ name: 'captainRootDomain', message: 'Enter a root domain for this Captain server. For example, enter test.yourdomain.com if you' + - ' setup your DNS to point *.test.yourdomain.com to ip address of your server' + - ': ', + ' setup your DNS to point *.test.yourdomain.com to ip address of your server.', filter: async (value: string) => { const captainRootDomainFromUser = value.trim(); try { @@ -96,6 +97,26 @@ const questions = [ captainMachine = Utils.copyObject(captainMachine); captainMachine.baseUrl = `http://captain.${captainRootDomainFromUser}`; } catch (e) { + StdOutUtil.printError('\n\n'); + if (e.captainStatus === ErrorFactory.VERIFICATION_FAILED) { + if (captainRootDomainFromUser.indexOf('/') >= 0) { + StdOutUtil.printError( + 'DO NOT include http in your base domain, it should be just plain domain, e.g., test.domain.com' + ); + } + + if (captainRootDomainFromUser.indexOf('*') >= 0) { + StdOutUtil.printError( + 'DO NOT include * in your base domain, it should be just plain domain, e.g., test.domain.com' + ); + } + + StdOutUtil.printError( + `\n\nCannot verify that http://captain.${captainRootDomainFromUser} points to your server IP.\n` + + `\nAre you sure that you set *.${captainRootDomainFromUser} points to ${serverIpAddress}\n\n` + + `Double check your DNS. If everything looks correct, note that, DNS changes take up to 24 hrs to work properly. Check with your Domain Provider.` + ); + } StdOutUtil.errorHandler(e); } @@ -108,6 +129,12 @@ const questions = [ message: 'Enter a new password:', filter: (value: string) => { newPasswordFirstTry = value; + + if (!newPasswordFirstTry) { + StdOutUtil.printError('Password empty.', true); + throw new Error('Password empty'); + } + return value; } }, @@ -118,10 +145,11 @@ const questions = [ filter: async (value: string) => { const confirmPasswordValueFromUser = value; - if (newPasswordFirstTry !== confirmPasswordValueFromUser) { + if ((newPasswordFirstTry !== confirmPasswordValueFromUser)) { StdOutUtil.printError('Passwords do not match. Try serversetup again.', true); throw new Error('Password mismatch'); } + return ''; } },