From 58f3bb4d3b5249adc82876db2917b4c9f419654b Mon Sep 17 00:00:00 2001 From: Philip Molares Date: Sat, 16 May 2020 20:59:59 +0200 Subject: [PATCH] renamed via-oauth2 to via-one-click Signed-off-by: Philip Molares --- .../{via-oauth2.tsx => via-one-click.tsx} | 34 +++++++++---------- src/components/landing/pages/login/login.tsx | 20 +++++------ 2 files changed, 27 insertions(+), 27 deletions(-) rename src/components/landing/pages/login/auth/{via-oauth2.tsx => via-one-click.tsx} (79%) diff --git a/src/components/landing/pages/login/auth/via-oauth2.tsx b/src/components/landing/pages/login/auth/via-one-click.tsx similarity index 79% rename from src/components/landing/pages/login/auth/via-oauth2.tsx rename to src/components/landing/pages/login/auth/via-one-click.tsx index e135aa5ab..e056f018a 100644 --- a/src/components/landing/pages/login/auth/via-oauth2.tsx +++ b/src/components/landing/pages/login/auth/via-one-click.tsx @@ -2,7 +2,7 @@ import React from "react"; import {IconProp} from "@fortawesome/fontawesome-svg-core"; import {IconButton} from "./icon-button/icon-button"; -export enum OAuth2Type { +export enum OneClickType { 'DROPBOX'="dropbox", 'FACEBOOK'="facebook", 'GITHUB'="github", @@ -13,7 +13,7 @@ export enum OAuth2Type { 'TWITTER'="twitter" } -type OAuth2Map = (oauth2type: OAuth2Type) => { +type OneClick2Map = (oneClickType: OneClickType) => { name: string, icon: IconProp, className: string, @@ -24,58 +24,58 @@ const buildBackendAuthUrl = (backendName: string) => { return `https://localhost:3000/auth/${backendName}` }; -const getMetadata: OAuth2Map = (oauth2type: OAuth2Type) => { - switch (oauth2type) { - case OAuth2Type.DROPBOX: +const getMetadata: OneClick2Map = (oneClickType: OneClickType) => { + switch (oneClickType) { + case OneClickType.DROPBOX: return { name: "Dropbox", icon: ["fab", "dropbox"], className: "btn-social-dropbox", url: buildBackendAuthUrl("dropbox") } - case OAuth2Type.FACEBOOK: + case OneClickType.FACEBOOK: return { name: "Facebook", icon: ["fab", "facebook"], className: "btn-social-facebook", url: buildBackendAuthUrl("facebook") } - case OAuth2Type.GITHUB: + case OneClickType.GITHUB: return { name: "GitHub", icon: ["fab", "github"], className: "btn-social-github", url: buildBackendAuthUrl("github") } - case OAuth2Type.GITLAB: + case OneClickType.GITLAB: return { name: "GitLab", icon: ["fab", "gitlab"], className: "btn-social-gitlab", url: buildBackendAuthUrl("gitlab") } - case OAuth2Type.GOOGLE: + case OneClickType.GOOGLE: return { name: "Google", icon: ["fab", "google"], className: "btn-social-google", url: buildBackendAuthUrl("google") } - case OAuth2Type.OAUTH2: + case OneClickType.OAUTH2: return { name: "OAuth2", icon: "share", className: "btn-primary", url: buildBackendAuthUrl("oauth2") } - case OAuth2Type.SAML: + case OneClickType.SAML: return { name: "SAML", icon: "users", className: "btn-success", url: buildBackendAuthUrl("saml") } - case OAuth2Type.TWITTER: + case OneClickType.TWITTER: return { name: "Twitter", icon: ["fab", "twitter"], @@ -92,13 +92,13 @@ const getMetadata: OAuth2Map = (oauth2type: OAuth2Type) => { } } -export interface ViaOAuth2Props { - oauth2Type: OAuth2Type; +export interface ViaOneClickProps { + oneClickType: OneClickType; optionalName?: string; } -const ViaOAuth2: React.FC = ({oauth2Type, optionalName}) => { - const {name, icon, className, url} = getMetadata(oauth2Type); +const ViaOneClick: React.FC = ({oneClickType, optionalName}) => { + const {name, icon, className, url} = getMetadata(oneClickType); const text = !!optionalName ? optionalName : name; return ( = ({oauth2Type, optionalName}) => { ) } -export {ViaOAuth2} +export {ViaOneClick} diff --git a/src/components/landing/pages/login/login.tsx b/src/components/landing/pages/login/login.tsx index df37c0d07..cb353c9fd 100644 --- a/src/components/landing/pages/login/login.tsx +++ b/src/components/landing/pages/login/login.tsx @@ -2,7 +2,7 @@ import React from "react" import {Col, Jumbotron, Row} from "react-bootstrap" import {Trans, useTranslation} from "react-i18next"; import {ViaEMail} from "./auth/via-email"; -import {OAuth2Type, ViaOAuth2} from "./auth/via-oauth2"; +import {OneClickType, ViaOneClick} from "./auth/via-one-click"; import {ViaLdap} from "./auth/via-ldap"; import {useSelector} from "react-redux"; import {ApplicationState} from "../../../../redux"; @@ -13,13 +13,13 @@ const Login: React.FC = () => { const customAuthNames = useSelector((state: ApplicationState) => state.backendConfig.customAuthNames); const emailForm = authProviders.email ? : null const ldapForm = authProviders.ldap ? : null - const emailLdapSeperator = authProviders.email && authProviders.ldap ?
: null + const emailLdapSeparator = authProviders.email && authProviders.ldap ?
: null - const oauth2CustomName: (type: OAuth2Type) => string | undefined = (type) => { + const oneClickCustomName: (type: OneClickType) => string | undefined = (type) => { switch (type) { - case OAuth2Type.SAML: + case OneClickType.SAML: return customAuthNames.saml; - case OAuth2Type.OAUTH2: + case OneClickType.OAUTH2: return customAuthNames.oauth2; default: return undefined; @@ -34,7 +34,7 @@ const Login: React.FC = () => { authProviders.email || authProviders.ldap ? {emailForm} - {emailLdapSeperator} + {emailLdapSeparator} {ldapForm}
@@ -46,7 +46,7 @@ const Login: React.FC = () => {
{ - Object.values(OAuth2Type) + Object.values(OneClickType) .filter((value) => authProviders[value]) .map((value) => { return ( @@ -56,9 +56,9 @@ const Login: React.FC = () => { className="p-2 d-flex flex-column" key={value} > - )