Skip to content

Commit 279473f

Browse files
wxiaoguangwxiaoguang
authored
Fix oauth2 auth and UI (#33961)
1 parent 0da7318 commit 279473f

File tree

3 files changed

+38
-43
lines changed

3 files changed

+38
-43
lines changed

‎routers/web/auth/oauth2_provider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func AuthorizeOAuth(ctx *context.Context) {
249249
}, form.RedirectURI)
250250
return
251251
}
252-
if err := ctx.Session.Set("CodeChallengeMethod", form.CodeChallenge); err != nil {
252+
if err := ctx.Session.Set("CodeChallenge", form.CodeChallenge); err != nil {
253253
handleAuthorizeError(ctx, AuthorizeError{
254254
ErrorCode: ErrorCodeServerError,
255255
ErrorDescription: "cannot set code challenge",

‎templates/user/auth/grant.tmpl

+29-31
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
11
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content ui one column stackable tw-text-center page grid oauth2-authorize-application-box">
3-
<div class="column seven wide">
4-
<div class="ui middle centered raised segments">
5-
<h3 class="ui top attached header">
6-
{{ctx.Locale.Tr "auth.authorize_title" .Application.Name}}
7-
</h3>
8-
<div class="ui attached segment">
9-
{{template "base/alert" .}}
10-
<p>
11-
{{if not .AdditionalScopes}}
12-
<b>{{ctx.Locale.Tr "auth.authorize_application_description"}}</b><br>
13-
{{end}}
14-
{{ctx.Locale.Tr "auth.authorize_application_created_by" .ApplicationCreatorLinkHTML}}<br>
15-
{{ctx.Locale.Tr "auth.authorize_application_with_scopes" (HTMLFormat "<b>%s</b>" .Scope)}}
16-
</p>
17-
</div>
18-
<div class="ui attached segment">
19-
<p>{{ctx.Locale.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML}}</p>
20-
</div>
21-
<div class="ui attached segment">
22-
<form method="post" action="{{AppSubUrl}}/login/oauth/grant">
23-
{{.CsrfTokenHtml}}
24-
<input type="hidden" name="client_id" value="{{.Application.ClientID}}">
25-
<input type="hidden" name="state" value="{{.State}}">
26-
<input type="hidden" name="scope" value="{{.Scope}}">
27-
<input type="hidden" name="nonce" value="{{.Nonce}}">
28-
<input type="hidden" name="redirect_uri" value="{{.RedirectURI}}">
29-
<button type="submit" id="authorize-app" name="granted" value="true" class="ui red inline button">{{ctx.Locale.Tr "auth.authorize_application"}}</button>
30-
<button type="submit" name="granted" value="false" class="ui basic primary inline button">{{ctx.Locale.Tr "cancel"}}</button>
31-
</form>
32-
</div>
2+
<div role="main" aria-label="{{.Title}}" class="page-content oauth2-authorize-application-box">
3+
<div class="ui container tw-max-w-[500px]">
4+
<h3 class="ui top attached header">
5+
{{ctx.Locale.Tr "auth.authorize_title" .Application.Name}}
6+
</h3>
7+
<div class="ui attached segment">
8+
{{template "base/alert" .}}
9+
<p>
10+
{{if not .AdditionalScopes}}
11+
<b>{{ctx.Locale.Tr "auth.authorize_application_description"}}</b><br>
12+
{{end}}
13+
{{ctx.Locale.Tr "auth.authorize_application_created_by" .ApplicationCreatorLinkHTML}}<br>
14+
{{ctx.Locale.Tr "auth.authorize_application_with_scopes" (HTMLFormat "<b>%s</b>" .Scope)}}
15+
</p>
16+
</div>
17+
<div class="ui attached segment">
18+
<p>{{ctx.Locale.Tr "auth.authorize_redirect_notice" .ApplicationRedirectDomainHTML}}</p>
19+
</div>
20+
<div class="ui attached segment tw-text-center">
21+
<form method="post" action="{{AppSubUrl}}/login/oauth/grant">
22+
{{.CsrfTokenHtml}}
23+
<input type="hidden" name="client_id" value="{{.Application.ClientID}}">
24+
<input type="hidden" name="state" value="{{.State}}">
25+
<input type="hidden" name="scope" value="{{.Scope}}">
26+
<input type="hidden" name="nonce" value="{{.Nonce}}">
27+
<input type="hidden" name="redirect_uri" value="{{.RedirectURI}}">
28+
<button type="submit" id="authorize-app" name="granted" value="true" class="ui red inline button">{{ctx.Locale.Tr "auth.authorize_application"}}</button>
29+
<button type="submit" name="granted" value="false" class="ui basic primary inline button">{{ctx.Locale.Tr "cancel"}}</button>
30+
</form>
3331
</div>
3432
</div>
3533
</div>

‎templates/user/auth/grant_error.tmpl

+8-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content ui one column stackable tw-text-center page grid oauth2-authorize-application-box {{if .IsRepo}}repository{{end}}">
3-
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
4-
<div class="column seven wide">
5-
<div class="ui middle centered raised segments">
6-
<h1 class="ui top attached header">
7-
{{ctx.Locale.Tr "auth.authorization_failed"}}
8-
</h1>
9-
<h3 class="ui attached segment">{{.Error.ErrorDescription}}</h3>
10-
<div class="ui attached segment">
11-
<p>{{ctx.Locale.Tr "auth.authorization_failed_desc"}}</p>
12-
</div>
2+
<div role="main" aria-label="{{.Title}}" class="page-content oauth2-authorize-application-box">
3+
<div class="ui container tw-max-w-[500px]">
4+
<h1 class="ui top attached header">
5+
{{ctx.Locale.Tr "auth.authorization_failed"}}
6+
</h1>
7+
<h3 class="ui attached segment">{{.Error.ErrorDescription}}</h3>
8+
<div class="ui attached segment">
9+
<p>{{ctx.Locale.Tr "auth.authorization_failed_desc"}}</p>
1310
</div>
1411
</div>
1512
</div>

0 commit comments

Comments
 (0)