Move new API from /api/v2 to /api/v0

9de2837a · theworldbright · theworldbright · beae7710 · 9de2837a · 9de2837a
--- a/app/controllers/api/v2/base_controller.rb
+++ b/app/controllers/api/v2/base_controller.rb
-class Api::V2::BaseController < ApplicationController
+class Api::V0::BaseController < ApplicationController
  include OpenidConnect::Authentication

  before_filter :require_access_token

--- a/app/controllers/api/v2/users_controller.rb
+++ b/app/controllers/api/v2/users_controller.rb
-class Api::V2::UsersController < Api::V2::BaseController
+class Api::V0::UsersController < Api::V0::BaseController

  def show
    render json: user

--- a/app/presenters/api/v0/base_presenter.rb
+++ b/app/presenters/api/v0/base_presenter.rb
+class Api::V0::BasePresenter
+end
--- a/app/presenters/api/v2/base_presenter.rb
+++ b/app/presenters/api/v2/base_presenter.rb
-class Api::V2::BasePresenter
-end
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -198,15 +198,7 @@ Diaspora::Application.routes.draw do
    end
  end

-  scope 'api/v0', :controller => :apis do
-    get :me
-  end
-
  namespace :api do
-    namespace :v0 do
-      get "/users/:username" => 'users#show', :as => 'user'
-      get "/tags/:name" => 'tags#show', :as => 'tag'
-    end
    namespace :v1 do
      resources :tokens, :only => [:create, :destroy]
    end
@@ -249,7 +241,7 @@ Diaspora::Application.routes.draw do
    post 'access_tokens', to: proc { |env| OpenidConnect::TokenEndpoint.new.call(env) }
  end

-  api_version(:module => "Api::V2", path: {value: "api/v2"}, default: true) do
+  api_version(module: "Api::V0", path: {value: "api/v0"}, default: true) do
    match 'user', to: 'users#show', via: :get
  end
 end
--- a/features/step_definitions/openid_steps.rb
+++ b/features/step_definitions/openid_steps.rb
@@ -10,13 +10,13 @@ end

 When /^I use received valid bearer tokens to access user info via URI query parameter$/ do
  accessTokenJson = JSON.parse(last_response.body)
-  userInfoEndPointURL = "/api/v2/user/"
+  userInfoEndPointURL = "/api/v0/user/"
  userInfoEndPointURLQuery = "?access_token=" + accessTokenJson["access_token"]
  visit userInfoEndPointURL + userInfoEndPointURLQuery
 end

 When /^I use invalid bearer tokens to access user info via URI query parameter$/ do
-  userInfoEndPointURL = "/api/v2/user/"
+  userInfoEndPointURL = "/api/v0/user/"
  userInfoEndPointURLQuery = "?access_token=" + SecureRandom.hex(32)
  visit userInfoEndPointURL + userInfoEndPointURLQuery
 end

--- a/public/docs/v2/index.html
+++ b/public/docs/v2/index.html
 <!DOCTYPE html>
 <html lang="en-US">
  <head>
-    <title>Documentation for v2</title>
+    <title>Documentation for v0</title>
    <link href="v2/style.css" media="screen" rel="stylesheet" type="text/css">
  </head>
  <body>
@@ -10,7 +10,7 @@
        <h3>API Operations</h3>
      </div>
      <div id="content">
-        <h1>Documentation for v2</h1>
+        <h1>Documentation for v0</h1>
      </div>
    </div>
  </body>

--- a/public/docs/v2/style.css
+++ b/public/docs/v2/style.css
--- a/spec/controllers/api/v2/base_controller_spec.rb
+++ b/spec/controllers/api/v2/base_controller_spec.rb
 require 'spec_helper'

-describe Api::V2::BaseController do
+describe Api::V0::BaseController do

 end
--- a/spec/controllers/api/v2/users_controller_spec.rb
+++ b/spec/controllers/api/v2/users_controller_spec.rb
@@ -2,14 +2,14 @@ require 'spec_helper'

 # TODO: Confirm that the cache-control header in the response is private as according to RFC 6750
 # TODO: Check for WWW-Authenticate response header field as according to RFC 6750
-describe Api::V2::UsersController, type: :request do
+describe Api::V0::UsersController, type: :request do
  describe "#show" do
    let!(:application) { bob.o_auth_applications.create!(client_id: 1, client_secret: "secret") }
    let!(:token) { application.tokens.create!.bearer_token.to_s }

    context "when valid" do
      it "shows the user's info" do
-        get "/api/v2/user/?access_token=" + token
+        get "/api/v0/user/?access_token=" + token
        jsonBody = JSON.parse(response.body)
        expect(jsonBody["username"]).to eq(bob.username)
        expect(jsonBody["email"]).to eq(bob.email)

--- a/spec/presenters/api/v2/base_presenter_spec.rb
+++ b/spec/presenters/api/v2/base_presenter_spec.rb
 require 'spec_helper'

-describe Api::V2::BasePresenter do
+describe Api::V0::BasePresenter do

 end
--- a/spec/requests/api/v2/base_controller_spec.rb
+++ b/spec/requests/api/v2/base_controller_spec.rb
 require 'spec_helper'

-describe Api::V2::BaseController do
+describe Api::V0::BaseController do

 end