From 509215f787679bda5f0f2da3e3637c2c6ccb0a97 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 May 2022 15:56:48 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20display=20auth=20method?= =?UTF-8?q?=20names=20in=20auth=20form,=20if=20available=20(#1113)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/desktop/app/styles/app.scss | 4 +++- .../app/templates/scopes/scope/authenticate.hbs | 12 ++++++++++-- ui/desktop/electron-app/src/index.js | 4 +--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss index 2d5758152..858980f47 100644 --- a/ui/desktop/app/styles/app.scss +++ b/ui/desktop/app/styles/app.scss @@ -489,7 +489,9 @@ $chevron-down: url("data:image/svg+xml;utf-8, - {{t (concat 'resources.auth-method.types.' authMethod.type)}} + {{#if authMethod.name}} + {{authMethod.name}} + {{else}} + {{t (concat 'resources.auth-method.types.' authMethod.type)}} + {{/if}} {{/each}} {{else}} @@ -43,7 +47,11 @@ @route='scopes.scope.authenticate.method' @model={{authMethod.id}} > - {{t (concat 'resources.auth-method.types.' authMethod.type)}} + {{#if authMethod.name}} + {{authMethod.name}} + {{else}} + {{t (concat 'resources.auth-method.types.' authMethod.type)}} + {{/if}} {{/unless}} {{/each}} diff --git a/ui/desktop/electron-app/src/index.js b/ui/desktop/electron-app/src/index.js index 619b7172e..35540da6b 100644 --- a/ui/desktop/electron-app/src/index.js +++ b/ui/desktop/electron-app/src/index.js @@ -86,9 +86,7 @@ const createWindow = (partition, closeWindowCB) => { // If the user-specified origin changes, reload the page so that // the CSP can be refreshed with the this source allowed - runtimeSettings.onOriginChange(() => - browserWindow.loadURL(emberAppURL) - ); + runtimeSettings.onOriginChange(() => browserWindow.loadURL(emberAppURL)); // Load the ember application browserWindow.loadURL(emberAppURL);