diff --git a/README.md b/README.md index 1c73985..84e0385 100644 --- a/README.md +++ b/README.md @@ -108,9 +108,9 @@ Installation and configurations 1. Click **Save Authentication Settings**. - 1. Sign out and go to the log in form. A new button named "**Log in with Azure AD**" allows users to sign in with their Azure AD account. + 1. Sign out and go to the log in form. A new button named "**Log in with Microsoft**" allows users to sign in with their Azure AD account. For login with username and password, clicking "More options" reveals the login form. - ![Login with Azure AD](./_img/loginwithAD.png) + ![Login with Microsoft](./_img/loginwithAD.png) ### General Configurations diff --git a/_img/loginwithAD.png b/_img/loginwithAD.png index 5302191..a24ae5d 100644 Binary files a/_img/loginwithAD.png and b/_img/loginwithAD.png differ diff --git a/src/main/java/org/almrangers/auth/aad/AadIdentityProvider.java b/src/main/java/org/almrangers/auth/aad/AadIdentityProvider.java index 4018da8..a53a679 100644 --- a/src/main/java/org/almrangers/auth/aad/AadIdentityProvider.java +++ b/src/main/java/org/almrangers/auth/aad/AadIdentityProvider.java @@ -63,7 +63,7 @@ @ServerSide public class AadIdentityProvider implements OAuth2IdentityProvider { private static final String KEY = "aad"; - private static final String NAME = "Azure AD"; + private static final String NAME = "Microsoft"; private static final Logger LOGGER = Loggers.get(AadIdentityProvider.class); private final AadSettings settings; @@ -75,8 +75,8 @@ public AadIdentityProvider(AadSettings settings) { @Override public Display getDisplay() { return Display.builder() - .setIconPath("/static/authaad/azure.svg") - .setBackgroundColor("#336699") + .setIconPath("/static/authaad/ms-symbol.svg") + .setBackgroundColor("#2F2F2F") .build(); } diff --git a/src/main/resources/static/azure.svg b/src/main/resources/static/azure.svg deleted file mode 100644 index 21a5ae1..0000000 --- a/src/main/resources/static/azure.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/src/main/resources/static/ms-symbol.svg b/src/main/resources/static/ms-symbol.svg new file mode 100644 index 0000000..1f73976 --- /dev/null +++ b/src/main/resources/static/ms-symbol.svg @@ -0,0 +1 @@ +MS-SymbolLockup \ No newline at end of file diff --git a/src/test/java/org/almrangers/auth/aad/AadIdentityProviderTest.java b/src/test/java/org/almrangers/auth/aad/AadIdentityProviderTest.java index d64cc90..e71d1fc 100644 --- a/src/test/java/org/almrangers/auth/aad/AadIdentityProviderTest.java +++ b/src/test/java/org/almrangers/auth/aad/AadIdentityProviderTest.java @@ -94,9 +94,9 @@ public void shouldHandleGetMembershipsPagination() throws IOException { @Test public void check_fields() { assertThat(underTest.getKey()).isEqualTo("aad"); - assertThat(underTest.getName()).isEqualTo("Azure AD"); - assertThat(underTest.getDisplay().getIconPath()).isEqualTo("/static/authaad/azure.svg"); - assertThat(underTest.getDisplay().getBackgroundColor()).isEqualTo("#336699"); + assertThat(underTest.getName()).isEqualTo("Microsoft"); + assertThat(underTest.getDisplay().getIconPath()).isEqualTo("/static/authaad/ms-symbol.svg"); + assertThat(underTest.getDisplay().getBackgroundColor()).isEqualTo("#2F2F2F"); } @Test