From 611f16328919d7d7b366606e053ce8da1cad49d3 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 10 Sep 2019 14:26:52 -0400 Subject: [PATCH] Make sure that the license page under settings has creds available --- .../forms/settings-form.route.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/awx/ui/client/src/configuration/forms/settings-form.route.js b/awx/ui/client/src/configuration/forms/settings-form.route.js index a03b4cbfa5..a67ec164e8 100644 --- a/awx/ui/client/src/configuration/forms/settings-form.route.js +++ b/awx/ui/client/src/configuration/forms/settings-form.route.js @@ -53,4 +53,24 @@ export default { } }); }], + resolve: { + rhCreds: ['Rest', 'GetBasePath', function(Rest, GetBasePath) { + Rest.setUrl(`${GetBasePath('settings')}system/`); + return Rest.get() + .then(({data}) => { + const rhCreds = {}; + if (data.REDHAT_USERNAME && data.REDHAT_USERNAME !== "") { + rhCreds.REDHAT_USERNAME = data.REDHAT_USERNAME; + } + + if (data.REDHAT_PASSWORD && data.REDHAT_PASSWORD !== "") { + rhCreds.REDHAT_PASSWORD = data.REDHAT_PASSWORD; + } + + return rhCreds; + }).catch(() => { + return {}; + }); + }] + } }; \ No newline at end of file