Skip to content

Commit e083a06

Browse files
committed
Expose API Access tab to all users / restrict legacy token rendering
The API Access tab is now visible to all users to support the new v2 API token, which is accessible to everyone. The existing v0/v1 legacy token remains restricted and continues to use the previous authorization and rendering logic within the tab.
1 parent 7afb362 commit e083a06

2 files changed

Lines changed: 13 additions & 15 deletions

File tree

app/views/devise/registrations/_api_token.html.erb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<%# v2 API token %>
55
<%= render partial: "devise/registrations/v2_api_token", locals: { user: user } %>
66

7-
<%# v0/v1 API token %>
8-
<%= render partial: "devise/registrations/legacy_api_token", locals: { user: user } %>
7+
<% if user.can_use_api? %>
8+
<%# v0/v1 API token %>
9+
<%= render partial: "devise/registrations/legacy_api_token", locals: { user: user } %>
10+
<% end %>
911
</div>

app/views/devise/registrations/edit.html.erb

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
<a href="#password-details" role="tab" class="nav-link"
1717
aria-controls="password-details" data-bs-toggle="tab"><%= _('Password') %></a>
1818
</li>
19-
<% if @user.can_use_api? %>
20-
<li role="api-details" class="nav-item">
21-
<a href="#api-details" role="tab" class="nav-link"
22-
aria-controls="api-details" data-bs-toggle="tab"><%= _('API Access') %></a>
23-
</li>
24-
<% end %>
19+
<li role="api-details" class="nav-item">
20+
<a href="#api-details" role="tab" class="nav-link"
21+
aria-controls="api-details" data-bs-toggle="tab"><%= _('API Access') %></a>
22+
</li>
2523
<li role="notification-preferences" class="nav-item">
2624
<a href="#notification-preferences" role="tab" class="nav-link"
2725
aria-controls="notification-preferences" data-bs-toggle="tab"><%= _('Notification Preferences') %></a>
@@ -43,15 +41,13 @@
4341
</div>
4442
</div>
4543
</div>
46-
<% if @user.can_use_api? %>
47-
<div id="api-details" role="tabpanel" class="tab-pane">
48-
<div class="card card-default">
49-
<div class="card-body">
50-
<%= render partial: 'devise/registrations/api_token', locals: { user: @user } %>
51-
</div>
44+
<div id="api-details" role="tabpanel" class="tab-pane">
45+
<div class="card card-default">
46+
<div class="card-body">
47+
<%= render partial: 'devise/registrations/api_token', locals: { user: @user } %>
5248
</div>
5349
</div>
54-
<% end %>
50+
</div>
5551
<div id="notification-preferences" role="tabpanel" class="tab-pane">
5652
<div class="card card-default">
5753
<div class="card-body">

0 commit comments

Comments
 (0)