Skip to content

Commit e86aec8

Browse files
authored
Merge pull request #150 from mraerino/feature/saml-provider
Allow display of SAML provider button
2 parents 9e9df42 + ca4dea6 commit e86aec8

File tree

2 files changed

+28
-7
lines changed

2 files changed

+28
-7
lines changed

src/components/app.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,20 @@ class App extends Component {
132132
return null;
133133
}
134134

135-
const providers = ["Google", "GitHub", "GitLab", "BitBucket"].filter(
136-
p => store.settings.external[p.toLowerCase()]
137-
);
135+
const providers = [
136+
"Google",
137+
"GitHub",
138+
"GitLab",
139+
"BitBucket",
140+
"SAML"
141+
].filter(p => store.settings.external[p.toLowerCase()]);
138142

139143
return providers.length ? (
140-
<Providers providers={providers} onLogin={this.handleExternalLogin} />
144+
<Providers
145+
providers={providers}
146+
labels={store.settings.external_labels || {}}
147+
onLogin={this.handleExternalLogin}
148+
/>
141149
) : null;
142150
}
143151

src/components/forms/providers.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,41 @@ class Provider extends Component {
77
};
88

99
render() {
10-
const { provider } = this.props;
10+
const { provider, label } = this.props;
1111

1212
return (
1313
<button
1414
onClick={this.handleLogin}
1515
className={`provider${provider} btn btnProvider`}
1616
>
17-
Continue with {provider}
17+
Continue with {label}
1818
</button>
1919
);
2020
}
2121
}
2222

2323
export default class Providers extends Component {
24+
getLabel(p) {
25+
const pId = p.toLowerCase();
26+
if (pId in this.props.labels) {
27+
return this.props.labels[pId];
28+
}
29+
return p;
30+
}
31+
2432
render() {
2533
const { providers, onLogin } = this.props;
2634

2735
return (
2836
<div className="providersGroup">
2937
<hr className="hr" />
3038
{providers.map(p => (
31-
<Provider key={p} provider={p} onLogin={onLogin} />
39+
<Provider
40+
key={p}
41+
provider={p}
42+
label={this.getLabel(p)}
43+
onLogin={onLogin}
44+
/>
3245
))}
3346
</div>
3447
);

0 commit comments

Comments
 (0)