v1/token -> /v1/tokens

salesforce · Dec 1, 2016 · 1c26cb3 · 1c26cb3
1 parent 475330f
commit 1c26cb3
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -61,7 +61,7 @@ If Single Sign On (SSO) is configured in Refocus, SSO users can login using 'SSO
 ### Using API Access Tokens
 - A token is required for API calls when Refocus config has `useAccessToken` set to `true`.
 - New users should register to get API access token. A user can POST to the `/v1/register` endpoint to generate a token. Save this token for future use.
-- Existing users can POST to the `/v1/token` endpoint to retrieve new token.
+- Existing users can POST to the `/v1/tokens` endpoint to retrieve new token.
 - To use the token for API access, add a Header with `Key:Authorization` and `Value: "token returned"` to your API call.
 - When using [Postman](https://chrome.google.com/webstore/detail/postman/fhbjgbiflinjbdggehcddcbncdddomop?hl=en) to make an API call, set Body to raw and text to JSON.
 

diff --git a/api/v1/controllers/token.js → api/v1/controllers/tokens.js b/api/v1/controllers/token.js → api/v1/controllers/tokens.js
@@ -7,15 +7,15 @@
  */
 
 /**
- * api/v1/controllers/token.js
+ * api/v1/controllers/tokens.js
  */
 const httpStatus = require('../constants').httpStatus;
 const u = require('../helpers/verbs/utils');
 const apiErrors = require('../apiErrors');
 const jwtUtil = require('../../../utils/jwtUtil');
 const helper = require('../helpers/nouns/tokens');
 
-const resourceName = 'token';
+const resourceName = 'tokens';
 
 module.exports = {
 

diff --git a/api/v1/swagger.yaml b/api/v1/swagger.yaml
diff --git a/tests/api/v1/authenticate/SSOConfig.js b/tests/api/v1/authenticate/SSOConfig.js
@@ -41,18 +41,18 @@ describe('api: login ssoconfig', () => {
       if (ssoconfig) {
         api.get(loginPath)
         .expect(constants.httpStatus.OK)
-        .expect((res) => {
-          expect(res.text).to.contain('SSO Login');
-          expect(res.text).to.not.contain('Sign Up');
-        })
-        .end((err/* , res*/) => {
+        .end((err, res) => {
           if (err) {
             return done(err);
           }
+
+          expect(res.text).to.contain('SSO Login');
+          expect(res.text).to.not.contain('Sign Up');
+
+          done();
         });
       }
     })
-    .then(() => done())
     .catch((err) => done(err));
   });
 });
diff --git a/tests/api/v1/token/utils.js → tests/api/v1/tokens/utils.js b/tests/api/v1/token/utils.js → tests/api/v1/tokens/utils.js
@@ -7,7 +7,7 @@
  */
 
 /**
- * tests/api/v1/token/utils.js
+ * tests/api/v1/tokens/utils.js
  */
 
 const tu = require('../../../testUtils');

diff --git a/tests/tokenReq/api/token/createToken.js → tests/tokenReq/api/tokens/createToken.js b/tests/tokenReq/api/token/createToken.js → tests/tokenReq/api/tokens/createToken.js
@@ -7,7 +7,7 @@
  */
 
 /**
- * tests/tokenReq/api/token/createtoken.js
+ * tests/tokenReq/api/tokens/createtoken.js
  */
 
 const expect = require('chai').expect;
@@ -16,7 +16,7 @@ const api = supertest(require('../../../../index').app);
 const constants = require('../../../../api/v1/constants');
 const u = require('./utils');
 const registerPath = '/v1/register';
-const tokenPath = '/v1/token';
+const tokenPath = '/v1/tokens';
 
 describe('api: createToken', () => {
   let defaultToken;

diff --git a/tests/tokenReq/api/token/utils.js → tests/tokenReq/api/tokens/utils.js b/tests/tokenReq/api/token/utils.js → tests/tokenReq/api/tokens/utils.js
@@ -7,7 +7,7 @@
  */
 
 /**
- * tests/tokenReq/api/token/utils.js
+ * tests/tokenReq/api/tokens/utils.js
  */
 
 const tu = require('../../../testUtils');