flashii/misuzu
flashii/misuzu
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved flow for using OAuth2 while logged out.

Browse source
This commit is contained in:
flash 2025-02-02 19:50:54 +00:00
parent 8be630531a
commit 8f63b57c0c
9 changed files with 35 additions and 93 deletions
templates
auth
login.twig
oauth2
login.twig

6
templates/auth/login.twig
View file

@ -32,6 +32,12 @@
<p class="auth__warning__paragraph">Welcome to Flashii, you may now log in!</p>
</div>
</div>
{% elseif login_oauth2 %}
<div class="warning auth__warning auth__warning--welcome">
<div class="warning__content">
<p class="auth__warning__paragraph">You must be logged in to authorise applications.</p>
</div>
</div>
{% endif %}
<label class="auth__label">

62
templates/oauth2/login.twig
View file

@ -1,62 +0,0 @@
{% extends 'oauth2/master.twig' %}
{% set body_header_icon = 'login' %}
{% set body_header_text = 'Not logged in' %}
{% set body_title = 'Authorisation Request' %}
{% block body_content %}
<div class="oauth2-authorise-requesting">
{% if app is defined and not app.isTrusted %}
<p>A third-party application is requesting permission to access your account.</p>
{% endif %}
<p>You must be logged in to authorise applications. <a href="{{ login_url }}" target="_blank">Log in</a> or <a href="{{ register_url }}" target="_blank">create an account</a> and reload this page to try again.</p>
{% if app is defined and app.isTrusted %}
<p>You will be redirected to the following application after logging in.</p>
{% endif %}
</div>
{% if app is defined %}
<div class="oauth2-appinfo">
<div class="oauth2-appinfo-name">
{{ app.name }}
</div>{# TODO: author should be listed #}
<div class="oauth2-appinfo-links">
<a href="{{ app.website }}" target="_blank" rel="noopener noreferrer" class="oauth2-appinfo-link" title="Website">
<div class="oauth2-appinfo-link-icon oauth2-appinfo-link-icon-globe"></div>
<div class="oauth2-appinfo-link-text">{{ app.websiteDisplay }}</div>
</a>
</div>
<div class="oauth2-appinfo-summary">
<p>{{ app.summary }}</p>
</div>
</div>
<div class="oauth2-scope">
<div class="oauth2-scope-header">This application will be able to:</div>
<div class="oauth2-scope-perms">
<div class="oauth2-scope-perm">
<div class="oauth2-scope-perm-icon"></div>
<div class="oauth2-scope-perm-text">Do anything because I have not made up scopes yet.</div>
</div>
<div class="oauth2-scope-perm">
<div class="oauth2-scope-perm-icon"></div>
<div class="oauth2-scope-perm-text">Eat soup.</div>
</div>
<div class="oauth2-scope-perm">
<div class="oauth2-scope-perm-icon"></div>
<div class="oauth2-scope-perm-text">These are placeholders.</div>
</div>
<div class="oauth2-scope-perm">
<div class="oauth2-scope-perm-icon"></div>
<div class="oauth2-scope-perm-text">This one is really long because I want to test wrapping and how the chevron icon thing will handle it so there will be a lot of text here, the app will not be gaining anything from it but yeah sometimes you just need to explode seventy times.</div>
</div>
</div>
</div>
{% else %}
<div class="oauth2-authorise-device">
<p>More details about the application will be displayed once you're logged in.</p>
</div>
{% endif %}
{% endblock %}