Skip to content

Commit 59aa38a

Browse files
committed
fix: remove auth put and fix token cycling
1 parent 9cb76c3 commit 59aa38a

File tree

1 file changed

+1
-47
lines changed

1 file changed

+1
-47
lines changed

app/api/authentication_api.rb

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -288,52 +288,6 @@ class AuthenticationApi < Grape::API
288288
present response, with: Grape::Presenters::Presenter
289289
end
290290

291-
#
292-
# Update the expiry of an existing authentication token
293-
#
294-
desc 'Allow tokens to be updated',
295-
{
296-
headers:
297-
{
298-
"username" =>
299-
{
300-
description: "User username",
301-
required: true
302-
},
303-
"auth_token" =>
304-
{
305-
description: "The user's temporary auth token",
306-
required: true
307-
}
308-
}
309-
}
310-
params do
311-
optional :remember, type: Boolean, desc: 'User has requested to remember login', default: false
312-
end
313-
put '/auth' do
314-
token_param = headers['auth-token'] || headers['Auth-Token'] || params['Auth-Token']
315-
user_param = headers['username'] || headers['Username'] || params['Username'] || params['username']
316-
317-
error!({ error: 'Invalid token/username.' }, 404) if token_param.nil? || user_param.nil?
318-
319-
logger.info "Update token #{token_param} from #{request.ip} for #{user_param}"
320-
321-
# Find user
322-
user = User.find_by(username: user_param)
323-
token = user.token_for_text?(token_param, :general) unless user.nil?
324-
remember = params[:remember] || false
325-
326-
# Token does not match user
327-
if token.nil? || user.nil? || user.username != user_param
328-
error!({ error: 'Invalid token.' }, 404)
329-
else
330-
token.extend_token remember if token.auth_token_expiry > Time.zone.now
331-
332-
# Return extended auth token
333-
present :auth_token, token.authentication_token
334-
end
335-
end
336-
337291
#
338292
# Sign out
339293
#
@@ -407,7 +361,7 @@ class AuthenticationApi < Grape::API
407361
if authenticated_via_refresh_token?
408362
# Check if we have a auth token as well
409363
if params[:delete_auth_token]
410-
user_param, auth_param = get_user_and_token_from(:cookie)
364+
user_param, auth_param = get_user_and_token_from(:header)
411365
case user_auth_token_type(user_param, auth_param, :general)
412366
when :valid
413367
# Valid token and user

0 commit comments

Comments
 (0)