Unverified Commit 16cd4752 authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert

Move auth_token to users controller

This token is only used for the chat, it isn't an official API.
parent 368e6d9e
......@@ -12,7 +12,7 @@
// initialize jsxc xmpp client
$(document).ready(function() {
if (app.currentUser.authenticated()) {
$.post('api/v1/tokens', null, function(data) {
$.post("/user/auth_token", null, function(data) {
if (jsxc && data['token']) {
var jid = app.currentUser.get('diaspora_id');
jsxc.init({
......
class Api::V1::TokensController < ApplicationController
skip_before_filter :verify_authenticity_token
before_filter :authenticate_user!
respond_to :json
def create
current_user.ensure_authentication_token!
render :status => 200, :json => { :token => current_user.authentication_token }
end
def destroy
current_user.reset_authentication_token!
render :json => true, :status => 200
end
end
......@@ -128,6 +128,11 @@ class UsersController < ApplicationController
redirect_to edit_user_path
end
def auth_token
current_user.ensure_authentication_token!
render status: 200, json: {token: current_user.authentication_token}
end
private
# rubocop:disable Metrics/MethodLength
......
......@@ -106,6 +106,7 @@ Diaspora::Application.routes.draw do
get :download_profile
post :export_photos
get :download_photos
post :auth_token
end
controller :users do
......@@ -184,12 +185,6 @@ Diaspora::Application.routes.draw do
end
end
namespace :api do
namespace :v1 do
resources :tokens, :only => [:create, :destroy]
end
end
get 'community_spotlight' => "contacts#spotlight", :as => 'community_spotlight'
# Mobile site
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment