forked from AkkomaGang/akkoma
[#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
This commit is contained in:
parent
47a236f753
commit
e3328bc138
4 changed files with 16 additions and 17 deletions
|
@ -390,6 +390,11 @@ config :auto_linker,
|
||||||
]
|
]
|
||||||
```
|
```
|
||||||
|
|
||||||
|
## Pleroma.Web.Auth.Authenticator
|
||||||
|
|
||||||
|
* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator
|
||||||
|
* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication
|
||||||
|
|
||||||
## :ldap
|
## :ldap
|
||||||
|
|
||||||
Use LDAP for user authentication. When a user logs in to the Pleroma
|
Use LDAP for user authentication. When a user logs in to the Pleroma
|
||||||
|
@ -408,16 +413,15 @@ Pleroma account will be created with the same name as the LDAP user name.
|
||||||
* `base`: LDAP base, e.g. "dc=example,dc=com"
|
* `base`: LDAP base, e.g. "dc=example,dc=com"
|
||||||
* `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
|
* `uid`: LDAP attribute name to authenticate the user, e.g. when "cn", the filter will be "cn=username,base"
|
||||||
|
|
||||||
## Pleroma.Web.Auth.Authenticator
|
|
||||||
|
|
||||||
* `Pleroma.Web.Auth.PleromaAuthenticator`: default database authenticator
|
|
||||||
* `Pleroma.Web.Auth.LDAPAuthenticator`: LDAP authentication
|
|
||||||
|
|
||||||
## :auth
|
## :auth
|
||||||
|
|
||||||
Authentication / authorization settings.
|
Authentication / authorization settings.
|
||||||
|
|
||||||
* `oauth_consumer_strategies`: lists enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable.
|
* `auth_template`: authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.eex`.
|
||||||
|
* `oauth_consumer_template`: OAuth consumer mode authentication form template. By default it's `consumer.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex`.
|
||||||
|
* `oauth_consumer_strategies`: the list of enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable.
|
||||||
|
|
||||||
|
# OAuth consumer mode
|
||||||
|
|
||||||
OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.).
|
OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.).
|
||||||
Implementation is based on Ueberauth; see the list of [available strategies](https://github.com/ueberauth/ueberauth/wiki/List-of-Strategies).
|
Implementation is based on Ueberauth; see the list of [available strategies](https://github.com/ueberauth/ueberauth/wiki/List-of-Strategies).
|
||||||
|
|
|
@ -31,12 +31,15 @@ def handle_error(plug, error), do: implementation().handle_error(plug, error)
|
||||||
|
|
||||||
@callback auth_template() :: String.t() | nil
|
@callback auth_template() :: String.t() | nil
|
||||||
def auth_template do
|
def auth_template do
|
||||||
implementation().auth_template() || Pleroma.Config.get(:auth_template, "show.html")
|
# Note: `config :pleroma, :auth_template, "..."` support is deprecated
|
||||||
|
implementation().auth_template() ||
|
||||||
|
Pleroma.Config.get([:auth, :auth_template], Pleroma.Config.get(:auth_template)) ||
|
||||||
|
"show.html"
|
||||||
end
|
end
|
||||||
|
|
||||||
@callback oauth_consumer_template() :: String.t() | nil
|
@callback oauth_consumer_template() :: String.t() | nil
|
||||||
def oauth_consumer_template do
|
def oauth_consumer_template do
|
||||||
implementation().oauth_consumer_template() ||
|
implementation().oauth_consumer_template() ||
|
||||||
Pleroma.Config.get(:oauth_consumer_template, "consumer.html")
|
Pleroma.Config.get([:auth, :oauth_consumer_template], "consumer.html")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<h2>Sign in with external provider</h2>
|
<h2>Sign in with external provider</h2>
|
||||||
|
|
||||||
<%= form_for @conn, o_auth_path(@conn, :prepare_request), [method: "get"], fn f -> %>
|
<%= form_for @conn, o_auth_path(@conn, :prepare_request), [method: "get"], fn f -> %>
|
||||||
|
|
|
@ -7,10 +7,7 @@
|
||||||
|
|
||||||
<h2>Registration Details</h2>
|
<h2>Registration Details</h2>
|
||||||
|
|
||||||
<p>If you'd like to register a new account,
|
<p>If you'd like to register a new account, please provide the details below.</p>
|
||||||
<br>
|
|
||||||
please provide the details below.</p>
|
|
||||||
<br>
|
|
||||||
|
|
||||||
<%= form_for @conn, o_auth_path(@conn, :register), [], fn f -> %>
|
<%= form_for @conn, o_auth_path(@conn, :register), [], fn f -> %>
|
||||||
|
|
||||||
|
@ -25,9 +22,6 @@ please provide the details below.</p>
|
||||||
|
|
||||||
<%= submit "Proceed as new user", name: "op", value: "register" %>
|
<%= submit "Proceed as new user", name: "op", value: "register" %>
|
||||||
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<br>
|
|
||||||
<p>Alternatively, sign in to connect to existing account.</p>
|
<p>Alternatively, sign in to connect to existing account.</p>
|
||||||
|
|
||||||
<div class="input">
|
<div class="input">
|
||||||
|
|
Loading…
Reference in a new issue