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

FDR-297: Adding okta for enterprise #2172

Merged
merged 7 commits into from
Sep 14, 2022
Merged

FDR-297: Adding okta for enterprise #2172

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef3218e
Adding okta for enterprise
jamescgarrett Sep 9, 2022
6a982de
Merge branch 'master' into fdr-297
jamescgarrett Sep 9, 2022
16284e1
Merge branch 'master' into fdr-297
jamescgarrett Sep 12, 2022
8222470
Merge branch 'master' into fdr-297
Sep 13, 2022
daf4b42
Update logo color
jamescgarrett Sep 13, 2022
1346801
Merge branch 'master' of github.com:auth0/lock into fdr-297
jamescgarrett Sep 13, 2022
cb971ed
Merge branch 'fdr-297' of github.com:jamescgarrett/lock into fdr-297
jamescgarrett Sep 13, 2022
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
6 changes: 6 additions & 0 deletions css/social_icons.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
.auth0-lock-social-button[data-provider="oauth2"] {
background-color: #eb5424;
}
.auth0-lock-social-button[data-provider="okta"] {
background-color: #00297A;
}
.auth0-lock-social-button[data-provider="paypal"] {
background-color: #009cde;
}
Expand Down Expand Up @@ -181,6 +184,9 @@
.auth0-lock-social-button[data-provider^=oauth2] .auth0-lock-social-button-icon {
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOC4xLjEsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAxNTAuMSAxNjcuOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMTUwLjEgMTY3LjgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPGc+DQoJPHBvbHlnb24gZmlsbD0iI0ZGRkZGRiIgcG9pbnRzPSIzMSwxMzUuOCAzMC45LDEzNS44IDc1LjEsMTY3LjggMTE5LjIsMTM1LjggNzUuMSwxMDMuNyAJIi8+DQoJPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTMuNyw1MS45TDMuNyw1MS45Qy02LjYsODMuNiw1LjMsMTE3LjIsMzEsMTM1LjhsMCwwbDE2LjktNTEuOUwzLjcsNTEuOWw1NC41LDBMNzUuMSwwbDAsMEgyMC41TDMuNyw1MS45eg0KCQkiLz4NCgk8cGF0aCBmaWxsPSIjRkZGRkZGIiBkPSJNMTQ2LjUsNTEuOUwxNDYuNSw1MS45TDE0Ni41LDUxLjlMMTI5LjYsMEg3NS4xbDAsMGwxNi45LDUxLjlMMTQ2LjUsNTEuOWwtNDQuMSwzMi4xbDE2LjgsNTEuOQ0KCQlDMTQ2LjIsMTE2LjIsMTU2LjMsODIsMTQ2LjUsNTEuOXoiLz4NCjwvZz4NCjwvc3ZnPg0K");
}
.auth0-lock-social-button[data-provider^=okta] .auth0-lock-social-button-icon {
background-image: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxMTk2IDQxMCI+PHBhdGggZmlsbD0iIzAwMjk3YSIgZD0iTTE1NC40OTYgMTA1LjVjLTgyLjIgMC0xNDkuMiA2Ny0xNDkuMiAxNDkuMnM2NyAxNDkuMiAxNDkuMiAxNDkuMiAxNDkuMi02NyAxNDkuMi0xNDkuMi02Ny0xNDkuMi0xNDkuMi0xNDkuMnptMCAyMjMuNmMtNDEuNiAwLTc0LjItMzMuNi03NC4yLTc0LjJzMzMuNi03NC4yIDc0LjItNzQuMiA3NC4yIDMzLjYgNzQuMiA3NC4yLTMzLjQgNzQuMi03NC4yIDc0LjJ6bTI2Mi0yNGMwLTEyIDE0LjQtMTcuNiAyMi40LTkuNiAzNy42IDM4LjQgOTkgMTAzIDk5IDEwMy44LjguOCAxLjYgMi40IDUuNiAzLjIgMS42LjggNCAuOCA2LjQuOGg2N2MxMiAwIDE2LTE0LjQgMTAuNC0yMC44bC0xMTEuOC0xMTUtNS42LTYuNGMtMTIuOC0xNS4yLTExLjItMjAuOCAzLjItMzYuOGw4OC42LTk4LjJjNS42LTcuMiAyLjQtMjAuOC0xMC40LTIwLjhoLTYwLjZjLTIuNCAwLTQgMC01LjYuOC00IC44LTQuOCAyLjQtNS42IDMuMiAwIDAtNDkuNiA1Mi42LTc5IDg1LjQtOCA4LjgtMjMuMiAzLjItMjMuMi04Ljh2LTE2OWMwLTguOC03LjItMTItMTIuOC0xMmgtNDkuNmMtOC44IDAtMTIuOCA1LjYtMTIuOCAxMS4ydjM3NS4yYzAgOC44IDcuMiAxMS4yIDEyLjggMTEuMmg0OC44YzggMCAxMi44LTUuNiAxMi44LTExLjJ2LTg2LjJ6bTQwNi4yIDg0LjYtNS42LTUwLjJjLS44LTcuMi03LjItMTEuMi0xMy42LTEwLjQtNCAuOC04IC44LTExLjIuOC00MCAwLTcxLjgtMzEuMi03NC4yLTcwLjJ2LTY0LjhjMC04IDUuNi0xNC40IDEzLjYtMTQuNGg2N2M0LjggMCAxMi00IDEyLTEyLjh2LTQ3YzAtOC44LTUuNi0xNC40LTExLjItMTQuNGgtNjdjLTggMC0xNC40LTUuNi0xNC40LTEzLjZ2LTc1YzAtNC44LTMuMi0xMi0xMi44LTEyaC00OS40Yy02LjQgMC0xMiA0LTEyIDExLjJ2MjQyLjhjMi40IDgwLjYgNjcuOCAxNDUuNCAxNDkuMiAxNDUuNCA2LjQgMCAxMy42LS44IDIwLTEuNiA1LjYtMSAxMC40LTcuNCA5LjYtMTMuOHptMzU5LjQtNjIuMmMtNDIuNCAwLTQ4LjgtMTUuMi00OC44LTcxLjhWMTE5LjFjMC00LjgtMy4yLTEyLjgtMTIuOC0xMi44aC00OS42Yy02LjQgMC0xMi44IDQuOC0xMi44IDEyLjh2Ni40Yy0yMS42LTEyLTQ3LjItMTkuMi03My40LTE5LjItODIuMiAwLTE0OS4yIDY3LTE0OS4yIDE0OS4yczY3IDE0OS4yIDE0OS4yIDE0OS4yYzM2LjggMCA3MS0xMy42IDk2LjYtMzYgMTQuNCAyMS42IDM2LjggMzUuMiA3MS44IDM2IDYuNCAwIDM3LjYuOCAzNy42LTEzLjZ2LTUyLjZjLjItNi4yLTMuOC0xMS04LjYtMTF6bS0xOTggMS42Yy00MS42IDAtNzQuMi0zMy42LTc0LjItNzQuMiAwLTQxLjYgMzMuNi03NC4yIDc0LjItNzQuMiA0MS42IDAgNzQuMiAzMy42IDc0LjIgNzQuMi44IDQwLjYtMzIuOCA3NC4yLTc0LjIgNzQuMnoiLz48L3N2Zz4=");
}
.auth0-lock-social-button[data-provider^=paypal] .auth0-lock-social-button-icon {
background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+Cjxzdmcgd2lkdGg9IjYzcHgiIGhlaWdodD0iNjVweCIgdmlld0JveD0iMCAwIDYzIDY1IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHhtbG5zOnNrZXRjaD0iaHR0cDovL3d3dy5ib2hlbWlhbmNvZGluZy5jb20vc2tldGNoL25zIj4KICAgIDwhLS0gR2VuZXJhdG9yOiBTa2V0Y2ggMy40ICgxNTU4OCkgLSBodHRwOi8vd3d3LmJvaGVtaWFuY29kaW5nLmNvbS9za2V0Y2ggLS0+CiAgICA8dGl0bGU+cGF5cGFsPC90aXRsZT4KICAgIDxkZXNjPkNyZWF0ZWQgd2l0aCBTa2V0Y2guPC9kZXNjPgogICAgPGRlZnM+PC9kZWZzPgogICAgPGcgaWQ9IlBhZ2UtMSIgc3Ryb2tlPSJub25lIiBzdHJva2Utd2lkdGg9IjEiIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc2tldGNoOnR5cGU9Ik1TUGFnZSI+CiAgICAgICAgPGcgaWQ9InBheXBhbCIgc2tldGNoOnR5cGU9Ik1TTGF5ZXJHcm91cCIgZmlsbD0iI0ZGRkZGRiI+CiAgICAgICAgICAgIDxwYXRoIGQ9Ik0wLDU3LjY4OCBMMTYuNDM4LDU3LjY4OCBMMjAuNTAxLDM4Ljc1IEwzMi4xODksMzguNzUgQzM3LjkzOSwzOC43NSA0Mi44NzcsMzcuMTI1IDQ3LjEyNywzMy43NSBDNTEuMzc3LDMwLjQzNyA1NC4xMjcsMjUuODc1IDU1LjM3NywyMC4wNjIgQzU2LjAwMiwxNi43NDkgNTYuMDAyLDEzLjg3NCA1NS4zNzcsMTEuNDM3IEM1NC43NTIsOSA1My42MjcsNi45OTkgNTIuMDY0LDUuMzc0IEM1MC40MzksMy44MTEgNDguNjI2LDIuNjI0IDQ2LjYyNiwxLjgxMSBDNDQuNjI2LDEuMDYxIDQyLjU2MywwLjY4NiA0MC40MzgsMC42ODYgTDEyLjQzOCwwLjY4NiBMMCw1Ny42ODggWiBNNi4zNzUsNjQuNjg4IEw3LjEyNSw2MS41NjMgTDIwLjkzOCw2MS41NjMgTDI0LjkzOCw0Mi42ODggTDM2LjY4OCw0Mi42ODggQzQyLjM3Niw0Mi42ODggNDcuMzc2LDQxIDUxLjYyNiwzNy42ODggQzU1Ljg3NiwzNC4zNzYgNTguNjI2LDI5LjgxMyA1OS44MTQsMjQgQzYwLjc1MiwxOS44NzUgNjAuNTAyLDE2LjI1IDU5LjA2NCwxMy4xMjUgQzYyLjEyNywxNi42ODggNjMuMDAyLDIxLjM3NSA2MS44MTQsMjcuMTI1IEM2MC41NjQsMzIuOTM4IDU3LjgxNCwzNy41IDUzLjU2NCw0MC44MTMgQzQ5LjM3Niw0NC4xMjYgNDQuMzc2LDQ1LjgxMyAzOC42MjYsNDUuODEzIEwyNi44NzYsNDUuODEzIEwyMi44NzYsNjQuNjg4IEw2LjM3Niw2NC42ODggTDYuMzc1LDY0LjY4OCBaIE0yMi44NzUsMjcuODc1IEwyNi4zNzUsMTIuMjUgTDM0LjM3NSwxMi4yNSBDMzUuNzUsMTIuMjUgMzYuOTM4LDEyLjYyNSAzNy45MzgsMTMuMzc1IEMzOC45MzgsMTQuMTI1IDM5LjYyNiwxNS4xMjUgMzkuOTM4LDE2LjM3NSBDMzkuMzEzLDE2LjI1IDM4LjkzOCwxNi4xODcgMzguODc1LDE2LjE4NyBMMzAuODc1LDE2LjE4NyBMMjguMTg3LDI3Ljg3NSBMMjIuODc0LDI3Ljg3NSBMMjIuODc1LDI3Ljg3NSBaIE0zMC44NzUsMjcuODEzIEwzMi43NSwxOS4zMTMgTDQwLjA2MywxOS4zMTMgQzQwLjA2MywxOS4zNzYgNDAuMDYzLDE5LjUwMSA0MCwxOS42ODggQzM5LjkzNywxOS44NzUgMzkuOTM3LDIwLjAwMSAzOS45MzcsMjAuMDYzIEMzOS40MzcsMjIuMTg4IDM4LjM3NCwyMy45MzggMzYuNTYyLDI1LjQzOCBDMzQuODEyLDI2LjkzOCAzMi44NzQsMjcuNzUxIDMwLjg3NCwyNy44MTMgTDMwLjg3NSwyNy44MTMgWiIgaWQ9IlNoYXBlIiBza2V0Y2g6dHlwZT0iTVNTaGFwZUdyb3VwIj48L3BhdGg+CiAgICAgICAgPC9nPgogICAgPC9nPgo8L3N2Zz4=");
}
Expand Down
3 changes: 2 additions & 1 deletion src/connection/enterprise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ export const STRATEGIES = {
samlp: 'SAML',
sharepoint: 'SharePoint Apps',
waad: 'Windows Azure AD',
oidc: 'OpenID Connect'
oidc: 'OpenID Connect',
okta: 'Okta Workforce'
};

export function initEnterprise(m, opts) {
Expand Down
2 changes: 1 addition & 1 deletion src/connection/enterprise/quick_auth_screen.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { authButtonsTheme } from '../../connection/social/index';

// TODO: handle this from CSS
function icon(strategy) {
if (strategy === 'google-apps') return strategy;
if (strategy === 'google-apps' || strategy === 'okta') return strategy;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am assuming this is for enterprise? The other enterprise connections only return the 'auth0' icon (including PingFederate).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, this is for enterprise. I was slightly confused by this section, so hoping @auth0/dx-sdks-engineer can clarify if this is necessary

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for my understanding - This means the avatar/icon only displays for Okta and Google right? And the other if is for microsoft and everything else displays default auth0 button?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct. I'm unaware as to the history as to why it's like that though.

if (~['adfs', 'office365', 'waad'].indexOf(strategy)) return 'windows';
return 'auth0';
}
Expand Down