Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions packages/sitevision-scripts/config/setup-questions.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ export const questions = [
type: 'password',
message: 'Password for development site',
},
{
name: 'signUsername',
message: 'Username for developer.sitevision.se',
},
{
name: 'signPassword',
type: 'password',
message: 'Password for developer.sitevision.se',
},
{
name: 'certificateName',
message: 'Certificate for developer.sitevision.se',
},
{
name: 'useHTTPForDevDeploy',
message: 'Use (unsafe) HTTP for local deployment?',
Expand Down
6 changes: 6 additions & 0 deletions packages/sitevision-scripts/scripts/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ export default async ({ appPath, appName }) => {
addonName,
username,
password,
signUsername,
signPassword,
certificateName,
typescript,
serverSideOnly,
useHTTPForDevDeploy,
Expand All @@ -186,6 +189,9 @@ export default async ({ appPath, appName }) => {
addonName,
username,
password,
signUsername,
signPassword,
certificateName,
useHTTPForDevDeploy,
},
null,
Expand Down
6 changes: 6 additions & 0 deletions packages/sitevision-scripts/scripts/setup-dev-properties.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ const hasTranspileOptionInPackageJSON = () => {
addonName,
username,
password,
signUsername,
signPassword,
certificateName,
useHTTPForDevDeploy,
}) => {
console.clear();
Expand All @@ -82,6 +85,9 @@ const hasTranspileOptionInPackageJSON = () => {
addonName,
username,
password,
signUsername,
signPassword,
certificateName,
useHTTPForDevDeploy,
},
null,
Expand Down
48 changes: 34 additions & 14 deletions packages/sitevision-scripts/scripts/sign.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,38 @@ import chalk from 'chalk';
import { getFullAppId } from './util/id.js';

(function () {
var questions = [
{
name: 'username',
const props = properties.getDevProperties();

const signUsernameFromProps = (props.signUsername || '');
const signPasswordFromProps = (props.signPassword || '');
const certificateFromProps = (props.certificateName || '');

const questions = [];

// Add the questions if the fields dont exist in dev_properties
if (!signUsernameFromProps) {
questions.push({
name: 'signUsername',
message: 'Username for developer.sitevision.se',
validate: (input) => (input.length ? true : 'Please enter your username'),
},
{
name: 'password',
});
}

if (!signPasswordFromProps) {
questions.push({
name: 'signPassword',
type: 'password',
message: 'Password for developer.sitevision.se',
validate: (input) => (input.length ? true : 'Please enter your password'),
},
{
});
}

if (!certificateFromProps) {
questions.push({
name: 'certificateName',
message: 'Certificate name for signing (blank for default)',
},
];
});
}

const manifest = properties.getManifest();
const appId = getFullAppId(manifest.id);
Expand All @@ -37,15 +52,20 @@ import { getFullAppId } from './util/id.js';
}

inquirer.prompt(questions).then(async (answers) => {
if (!answers.username || !answers.password) {
const username = (answers.signUsername || signUsernameFromProps);
const password = (answers.signPassword || signPasswordFromProps);

const certificateName = (answers.certificateName || certificateFromProps);

if (!username || !password) {
console.log(chalk.red('Invalid user name or password'));
return null;
}

let url = `https://developer.sitevision.se/rest-api/appsigner/signapp`;

if (answers.certificateName) {
url += '?certificateName=' + answers.certificateName;
if (certificateName) {
url += '?certificateName=' + certificateName;
}

const formData = new FormData();
Expand All @@ -60,7 +80,7 @@ import { getFullAppId } from './util/id.js';
body: formData,
headers: formData.getHeaders({
Authorization: `Basic ${Buffer.from(
answers.username + ':' + answers.password
username + ':' + password
).toString('base64')}`,
}),
});
Expand Down