Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(bundle): explicit keyId param to Api

Browse Source
This commit is contained in:
Sérgio Ramos 2018-02-27 11:41:40 +00:00
parent e540425472
commit 2b2e431830
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundle/src/index.js
View File

@ -7,9 +7,6 @@ const Brok = require('brok');
const { homedir } = require('os'); const { homedir } = require('os');
const { join } = require('path'); const { join } = require('path');
process.env.SDC_KEY_PATH =
process.env.SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa');
const Sso = require('hapi-triton-auth'); const Sso = require('hapi-triton-auth');
const Nav = require('joyent-navigation'); const Nav = require('joyent-navigation');
const Api = require('cloudapi-gql'); const Api = require('cloudapi-gql');
@ -72,7 +69,7 @@ async function main() {
ttl: 1000 * 60 * 60 // 1 hour ttl: 1000 * 60 * 60 // 1 hour
}, },
sso: { sso: {
keyPath: SDC_KEY_PATH, keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'),
keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID, keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID,
apiBaseUrl: SDC_URL, apiBaseUrl: SDC_URL,
url: 'https://sso.joyent.com/login', url: 'https://sso.joyent.com/login',
@ -89,7 +86,12 @@ async function main() {
plugin: Ui plugin: Ui
}, },
{ {
plugin: Api plugin: Api,
options: {
keyId: '/' + SDC_ACCOUNT + '/keys/' + SDC_KEY_ID,
keyPath: SDC_KEY_PATH || join(homedir(), '.ssh/id_rsa'),
apiBaseUrl: SDC_URL
}
} }
]); ]);