Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Login Button for Branding #52

Merged
merged 2 commits into from
Sep 27, 2018
Merged

Update Login Button for Branding #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
414f348
Update Login Button for Branding
srvrguy Jul 11, 2018
c50f7ed
Update Readme
srvrguy Jul 13, 2018
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified _img/loginwithAD.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/main/java/org/almrangers/auth/aad/AadIdentityProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
}

Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/static/azure.svg
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/main/resources/static/ms-symbol.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/test/java/org/almrangers/auth/aad/AadIdentityProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down