mirror of
https://github.com/wassname/talk.git
synced 2026-09-10 12:43:11 +08:00
[Next] Add auto redirect when there is a single enabled auth integration (#2422)
* Add auto redirect when there is a single enabled auth integration * fix: small syntax cleanup
This commit is contained in:
Cristian Dean
committed by
Wyatt Johnson
Wyatt Johnson
parent
14e225e26f
commit
1dba761b40
@@ -28,6 +28,7 @@ it("renders fully", () => {
|
||||
facebook: {
|
||||
enabled: true,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -35,6 +36,7 @@ it("renders fully", () => {
|
||||
google: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -42,6 +44,7 @@ it("renders fully", () => {
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -87,6 +90,7 @@ it("renders without logout button", () => {
|
||||
facebook: {
|
||||
enabled: true,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -94,6 +98,7 @@ it("renders without logout button", () => {
|
||||
google: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -101,6 +106,7 @@ it("renders without logout button", () => {
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -146,6 +152,7 @@ it("renders sso only", () => {
|
||||
facebook: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -153,6 +160,7 @@ it("renders sso only", () => {
|
||||
google: {
|
||||
enabled: true,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: false,
|
||||
},
|
||||
@@ -160,6 +168,7 @@ it("renders sso only", () => {
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -205,6 +214,7 @@ it("renders sso only without logout button", () => {
|
||||
facebook: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -212,6 +222,7 @@ it("renders sso only without logout button", () => {
|
||||
google: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -219,6 +230,7 @@ it("renders sso only without logout button", () => {
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -264,6 +276,7 @@ it("renders without register button", () => {
|
||||
facebook: {
|
||||
enabled: true,
|
||||
allowRegistration: false,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -271,6 +284,7 @@ it("renders without register button", () => {
|
||||
google: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: false,
|
||||
},
|
||||
@@ -278,6 +292,7 @@ it("renders without register button", () => {
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
|
||||
@@ -71,10 +71,37 @@ export class UserBoxContainer extends Component<Props> {
|
||||
].some(i => i.enabled && i.targetFilter.stream);
|
||||
}
|
||||
|
||||
private get authUrl(): string {
|
||||
const {
|
||||
facebook,
|
||||
google,
|
||||
local,
|
||||
oidc,
|
||||
} = this.props.settings.auth.integrations;
|
||||
|
||||
const defaultAuthUrl = `${urls.embed.auth}?view=${
|
||||
this.props.local.authPopup.view
|
||||
}`;
|
||||
|
||||
if (local.enabled) {
|
||||
return defaultAuthUrl;
|
||||
}
|
||||
|
||||
// For each of these integrations, if only one is enabled, then return the
|
||||
// redirectURL for that one only.
|
||||
const integrations = [facebook, google, oidc];
|
||||
const enabled = integrations.filter(integration => integration.enabled);
|
||||
if (enabled.length === 1 && enabled[0].redirectURL) {
|
||||
return enabled[0].redirectURL;
|
||||
}
|
||||
|
||||
return defaultAuthUrl;
|
||||
}
|
||||
|
||||
public render() {
|
||||
const {
|
||||
local: {
|
||||
authPopup: { open, focus, view },
|
||||
authPopup: { open, focus },
|
||||
},
|
||||
viewer,
|
||||
} = this.props;
|
||||
@@ -96,7 +123,7 @@ export class UserBoxContainer extends Component<Props> {
|
||||
return (
|
||||
<>
|
||||
<Popup
|
||||
href={`${urls.embed.auth}?view=${view}`}
|
||||
href={this.authUrl}
|
||||
title="Coral Auth"
|
||||
features="menubar=0,resizable=0,width=350,height=450,top=100,left=500"
|
||||
open={open}
|
||||
@@ -154,6 +181,7 @@ const enhanced = withSignOutMutation(
|
||||
oidc {
|
||||
enabled
|
||||
allowRegistration
|
||||
redirectURL
|
||||
targetFilter {
|
||||
stream
|
||||
}
|
||||
@@ -161,6 +189,7 @@ const enhanced = withSignOutMutation(
|
||||
google {
|
||||
enabled
|
||||
allowRegistration
|
||||
redirectURL
|
||||
targetFilter {
|
||||
stream
|
||||
}
|
||||
@@ -168,6 +197,7 @@ const enhanced = withSignOutMutation(
|
||||
facebook {
|
||||
enabled
|
||||
allowRegistration
|
||||
redirectURL
|
||||
targetFilter {
|
||||
stream
|
||||
}
|
||||
|
||||
@@ -45,6 +45,7 @@ export const settings = createFixture<GQLSettings>({
|
||||
facebook: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/facebook",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -52,6 +53,7 @@ export const settings = createFixture<GQLSettings>({
|
||||
google: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/google",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
@@ -59,6 +61,7 @@ export const settings = createFixture<GQLSettings>({
|
||||
oidc: {
|
||||
enabled: false,
|
||||
allowRegistration: true,
|
||||
redirectURL: "http://localhost/oidc",
|
||||
targetFilter: {
|
||||
stream: true,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user