feat: only show auth providers if they're enabled
This commit is contained in:
parent
17f2552c6a
commit
f5d7bc4095
GPG key ID:
B4EF20DDE721CAA1
4 changed files with 98 additions and 83 deletions
|
|
@ -144,9 +144,9 @@ type oauthURLsRequest struct {
|
|||
}
|
||||
|
||||
type oauthURLsResponse struct {
|
||||
Discord string `json:"discord"`
|
||||
Tumblr string `json:"tumblr"`
|
||||
Google string `json:"google"`
|
||||
Discord string `json:"discord,omitempty"`
|
||||
Tumblr string `json:"tumblr,omitempty"`
|
||||
Google string `json:"google,omitempty"`
|
||||
}
|
||||
|
||||
func (s *Server) oauthURLs(w http.ResponseWriter, r *http.Request) error {
|
||||
|
|
@ -162,22 +162,25 @@ func (s *Server) oauthURLs(w http.ResponseWriter, r *http.Request) error {
|
|||
if err != nil {
|
||||
return errors.Wrap(err, "setting CSRF state")
|
||||
}
|
||||
var resp oauthURLsResponse
|
||||
|
||||
// copy Discord config and set redirect url
|
||||
discordCfg := discordOAuthConfig
|
||||
discordCfg.RedirectURL = req.CallbackDomain + "/auth/login/discord"
|
||||
// copy tumblr config
|
||||
tumblrCfg := tumblrOAuthConfig
|
||||
tumblrCfg.RedirectURL = req.CallbackDomain + "/auth/login/tumblr"
|
||||
// copy google config
|
||||
googleCfg := googleOAuthConfig
|
||||
googleCfg.RedirectURL = req.CallbackDomain + "/auth/login/google"
|
||||
if discordOAuthConfig.ClientID != "" {
|
||||
discordCfg := discordOAuthConfig
|
||||
discordCfg.RedirectURL = req.CallbackDomain + "/auth/login/discord"
|
||||
resp.Discord = discordCfg.AuthCodeURL(state) + "&prompt=none"
|
||||
}
|
||||
if tumblrOAuthConfig.ClientID != "" {
|
||||
tumblrCfg := tumblrOAuthConfig
|
||||
tumblrCfg.RedirectURL = req.CallbackDomain + "/auth/login/tumblr"
|
||||
resp.Tumblr = tumblrCfg.AuthCodeURL(state)
|
||||
}
|
||||
if googleOAuthConfig.ClientID != "" {
|
||||
googleCfg := googleOAuthConfig
|
||||
googleCfg.RedirectURL = req.CallbackDomain + "/auth/login/google"
|
||||
resp.Google = googleCfg.AuthCodeURL(state)
|
||||
}
|
||||
|
||||
render.JSON(w, r, oauthURLsResponse{
|
||||
Discord: discordCfg.AuthCodeURL(state) + "&prompt=none",
|
||||
Tumblr: tumblrCfg.AuthCodeURL(state),
|
||||
Google: googleCfg.AuthCodeURL(state),
|
||||
})
|
||||
render.JSON(w, r, resp)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@ export interface MetaResponse {
|
|||
}
|
||||
|
||||
export interface UrlsResponse {
|
||||
discord: string;
|
||||
tumblr: string;
|
||||
google: string;
|
||||
discord?: string;
|
||||
tumblr?: string;
|
||||
google?: string;
|
||||
}
|
||||
|
||||
export interface ExportResponse {
|
||||
|
|
|
|||
|
|
@ -60,9 +60,15 @@
|
|||
<div class="col-md-4 mb-1">
|
||||
<ListGroup>
|
||||
<ListGroupItem tag="button" on:click={toggleModal}>Log in with the Fediverse</ListGroupItem>
|
||||
<ListGroupItem tag="a" href={data.discord}>Log in with Discord</ListGroupItem>
|
||||
<ListGroupItem tag="a" href={data.tumblr}>Log in with Tumblr</ListGroupItem>
|
||||
<ListGroupItem tag="a" href={data.google}>Log in with Google</ListGroupItem>
|
||||
{#if data.discord}
|
||||
<ListGroupItem tag="a" href={data.discord}>Log in with Discord</ListGroupItem>
|
||||
{/if}
|
||||
{#if data.tumblr}
|
||||
<ListGroupItem tag="a" href={data.tumblr}>Log in with Tumblr</ListGroupItem>
|
||||
{/if}
|
||||
{#if data.google}
|
||||
<ListGroupItem tag="a" href={data.google}>Log in with Google</ListGroupItem>
|
||||
{/if}
|
||||
</ListGroup>
|
||||
<Modal header="Pick an instance" isOpen={modalOpen} toggle={toggleModal}>
|
||||
<ModalBody>
|
||||
|
|
|
|||
|
|
@ -132,72 +132,78 @@
|
|||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Discord</CardTitle>
|
||||
<CardText>
|
||||
{#if data.user.discord || data.urls.discord}
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Discord</CardTitle>
|
||||
<CardText>
|
||||
{#if data.user.discord}
|
||||
Your currently linked Discord account is <b>{data.user.discord_username}</b>
|
||||
(<code>{data.user.discord}</code>).
|
||||
{:else}
|
||||
You do not have a linked Discord account.
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.discord}
|
||||
Your currently linked Discord account is <b>{data.user.discord_username}</b>
|
||||
(<code>{data.user.discord}</code>).
|
||||
{:else}
|
||||
You do not have a linked Discord account.
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleDiscordUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else if data.urls.discord}
|
||||
<Button color="secondary" href={data.urls.discord}>Link account</Button>
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.discord}
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleDiscordUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else}
|
||||
<Button color="secondary" href={data.urls.discord}>Link account</Button>
|
||||
{/if}
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Tumblr</CardTitle>
|
||||
<CardText>
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
{/if}
|
||||
{#if data.user.tumblr || data.urls.tumblr}
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Tumblr</CardTitle>
|
||||
<CardText>
|
||||
{#if data.user.tumblr}
|
||||
Your currently linked Tumblr account is <b>{data.user.tumblr_username}</b>
|
||||
(<code>{data.user.tumblr}</code>).
|
||||
{:else}
|
||||
You do not have a linked Tumblr account.
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.tumblr}
|
||||
Your currently linked Tumblr account is <b>{data.user.tumblr_username}</b>
|
||||
(<code>{data.user.tumblr}</code>).
|
||||
{:else}
|
||||
You do not have a linked Tumblr account.
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleTumblrUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else if data.urls.tumblr}
|
||||
<Button color="secondary" href={data.urls.tumblr}>Link account</Button>
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.tumblr}
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleTumblrUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else}
|
||||
<Button color="secondary" href={data.urls.tumblr}>Link account</Button>
|
||||
{/if}
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Google</CardTitle>
|
||||
<CardText>
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
{/if}
|
||||
{#if data.user.google || data.urls.google}
|
||||
<div class="my-2">
|
||||
<Card>
|
||||
<CardBody>
|
||||
<CardTitle>Google</CardTitle>
|
||||
<CardText>
|
||||
{#if data.user.google}
|
||||
Your currently linked Google account is <b>{data.user.google_username}</b>
|
||||
(<code>{data.user.google}</code>).
|
||||
{:else}
|
||||
You do not have a linked Google account.
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.google}
|
||||
Your currently linked Google account is <b>{data.user.google_username}</b>
|
||||
(<code>{data.user.google}</code>).
|
||||
{:else}
|
||||
You do not have a linked Google account.
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleGoogleUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else if data.urls.google}
|
||||
<Button color="secondary" href={data.urls.google}>Link account</Button>
|
||||
{/if}
|
||||
</CardText>
|
||||
{#if data.user.google}
|
||||
<Button color="danger" disabled={!canUnlink} on:click={toggleGoogleUnlinkModal}
|
||||
>Unlink account</Button
|
||||
>
|
||||
{:else}
|
||||
<Button color="secondary" href={data.urls.google}>Link account</Button>
|
||||
{/if}
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
</CardBody>
|
||||
</Card>
|
||||
</div>
|
||||
{/if}
|
||||
<Modal header="Pick an instance" isOpen={fediLinkModalOpen} toggle={toggleFediLinkModal}>
|
||||
<ModalBody>
|
||||
<Input placeholder="Instance (e.g. mastodon.social)" bind:value={instance} />
|
||||
|
|
|
|||
Loading…
Reference in a new issue