Merge pull request #71 from huangqun/dev

replace login implementation

Author: ajefts

README.md

@@ -28,29 +28,26 @@ The following configuration parameters are available:
 
 | Name                     | Description                     |
 |--------------------------|---------------------------------|
-| ES_PROJECT_API_URL       | URL of the ES project API       |
 | API_URL                  | URL of the topcoder API         |
-| WORK_API_URL             | URL of the topcoder work API    |
 | ADMIN_TOOL_URL           | URL of the admin tool API       |
 | API_VERSION_PATH         | Version of the API              |
-| AUTH0_CLIENT_ID          | Client ID for Auth0             |
-| AUTH0_DOMAIN             | Domain for Auth0 authentication |
-| AUTH0_TOKEN_NAME         | Auth0 token name                |
-| AUTH0_REFRESH_TOKEN_NAME | Auth0 refresh token name        |
+| COOKIES_SECURE           | If true the cookies set by this App will only be transmitted over secure  protocols like https. |
+| AUTH_URL                 | Url of Topcoder auth form       |
+| ACCOUNTS_CONNECTOR_URL   | Url to TC account connector     |
+| JWT_V3_NAME              | jwt V3 cookie name              |
+| JWT_V2_NAME              | jwt V2 cookie name              |
 
 ## Start the Application
 
+As application uses Topcoder authorization we have to run it on the one of allowed domains. For development purposes we can use `local.topcoder-dev.com:3000`. So before run we have to add into `hosts` file the line `127.0.0.1 local.topcoder-dev.com`. Be aware, that we also have to run on the port `3000` to be able to authorize when run locally.
+
 Simply execute the following command to start the app in development mode (with browsersync)
 ```
 npm install
-npm start
-```
-Application will be hosted and running at http://locahost:3000
-
-To build the application to be hosted on a real webserver run:
-```
-npm run build
+gulp build
+gulp serve
 ```
+Application will be hosted and running at http://local.topcoder-dev.com:3000.
 
 ## Execute E2E Tests
 
@@ -59,8 +56,6 @@ Before executing the end-to-end (e2e) protractor tests, these environment variab
 | Name | Description | Default Value |
 | --- | --- | --- |
 | BUILD_ENV | Deployment configuration to be tested by e2e tests. | See [Configuration](#configuration) for possible values. Defaults to `dev`. |
-| TEST_USER | Account username to use for e2e tests. | No default. Must be set. |
-| TEST_PASSWORD | Account password to use for e2e tests. | No default. Must be set. |
 | TEST_PORT | Port from which to serve the app for e2e tests. | Defaults to `3000`. |
 
 ```npm test```

bower.json

@@ -21,9 +21,6 @@
     "a0-angular-storage": "~0.0.11",
     "angular-jwt": "~0.0.9",
     "angular-footable": "~1.0.3",
-    "appirio-tech-ng-auth": "git://github.com/appirio-tech/ng-auth.git#3.2.10",
-    "appirio-tech-ng-login-reg": "0.x.x",
-    "appirio-tech-ng-api-services": "0.x.x",
     "angular-clipboard": "~1.2.1",
     "lodash": "~4.2.0",
     "angular-moment": "~1.0.0-beta.3",

config.json

@@ -1,46 +1,42 @@
 {
   "local": {
-    "ES_PROJECT_API_URL": "http://127.0.0.1:8553",
     "API_URL" : "https://127.0.0.1:8443",
-    "WORK_API_URL" : "https://127.0.0.1:8443",
     "ADMIN_TOOL_URL" : "http://localhost:8080/api/v2",
     "API_VERSION_PATH" : "v3",
-    "AUTH0_CLIENT_ID" : "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
-    "AUTH0_DOMAIN" : "127.0.0.1:8443",
-    "AUTH0_TOKEN_NAME" : "userJWTToken",
-    "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
+    "COOKIES_SECURE": false,
+    "AUTH_URL": "https://accounts.topcoder-dev.com/member",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+    "JWT_V3_NAME": "v3jwt",
+    "JWT_V2_NAME": "tcjwt"
   },
   "dev": {
-    "ES_PROJECT_API_URL": "https://internal-api.topcoder-dev.com",
     "API_URL" : "https://api.topcoder-dev.com",
-    "WORK_API_URL" : "https://api-work.topcoder-dev.com",
     "ADMIN_TOOL_URL" : "https://api.topcoder-dev.com/v2",
     "API_VERSION_PATH" : "v3",
-    "AUTH0_CLIENT_ID" : "JFDo7HMkf0q2CkVFHojy3zHWafziprhT",
-    "AUTH0_DOMAIN" : "topcoder-dev.auth0.com",
-    "AUTH0_TOKEN_NAME" : "userJWTToken",
-    "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
+    "COOKIES_SECURE": false,
+    "AUTH_URL": "https://accounts.topcoder-dev.com/member",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-dev.com/connector.html",
+    "JWT_V3_NAME": "v3jwt",
+    "JWT_V2_NAME": "tcjwt"
   },
   "qa": {
-    "ES_PROJECT_API_URL": "https://internal-api.topcoder-qa.com",
     "API_URL" : "https://api.topcoder-qa.com",
-    "WORK_API_URL" : "https://api-work.topcoder-qa.com",
     "ADMIN_TOOL_URL" : "https://api.topcoder-qa.com/v2",
     "API_VERSION_PATH" : "v3",
-    "AUTH0_CLIENT_ID" : "EVOgWZlCtIFlbehkq02treuRRoJk12UR",
-    "AUTH0_DOMAIN" : "topcoder-qa.auth0.com",
-    "AUTH0_TOKEN_NAME" : "userJWTToken",
-    "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
+    "COOKIES_SECURE": false,
+    "AUTH_URL": "https://accounts.topcoder-qa.com/member",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder-qa.com/connector.html",
+    "JWT_V3_NAME": "v3jwt",
+    "JWT_V2_NAME": "tcjwt"
   },
   "prod": {
     "API_URL" : "https://api.topcoder.com",
-    "WORK_API_URL" : "https://api-work.topcoder.com",
-    "ES_PROJECT_API_URL": "https://internal-api.topcoder.com",
     "ADMIN_TOOL_URL" : "https://api.topcoder.com/v2",
     "API_VERSION_PATH" : "v3",
-    "AUTH0_CLIENT_ID" : "6ZwZEUo2ZK4c50aLPpgupeg5v2Ffxp9P",
-    "AUTH0_DOMAIN" : "topcoder.auth0.com",
-    "AUTH0_TOKEN_NAME" : "userJWTToken",
-    "AUTH0_REFRESH_TOKEN_NAME" : "userRefreshJWTToken"
+    "COOKIES_SECURE": false,
+    "AUTH_URL": "https://accounts.topcoder.com/member",
+    "ACCOUNTS_CONNECTOR_URL": "https://accounts.topcoder.com/connector.html",
+    "JWT_V3_NAME": "v3jwt",
+    "JWT_V2_NAME": "tcjwt"
   }
 }

e2e/dashboard.spec.js

@@ -1,30 +1,11 @@
 'use strict';
 
 describe('The dashboard view', function () {
-  var page;
   var mainPage;
-  var testUser = process.env.TEST_USER;
-  var testPassword = process.env.TEST_PASSWORD;
   var testPort = process.env.TEST_PORT || 3000;
 
   beforeEach(function () {
     browser.get('http://localhost:' + testPort + '/');
-    page = require('./login.po');
     mainPage = require('./main.po');
   });
-
-  it('should have environment variables defined', function(){
-    expect(testUser).toBeDefined();
-    expect(testPassword).toBeDefined();
-  });
-
-  it('should find members', function() {
-    page.usernameInput.sendKeys(testUser);
-    page.passwordInput.sendKeys(testPassword);
-    page.loginButton.click();
-    mainPage.searchHandleInput.sendKeys('sah2ed');
-    mainPage.searchButton.click();
-    expect(mainPage.users.count()).toBe(1);
-    expect(mainPage.users.get(0).element(by.cssContainingText('td', 'sah2ed')).getText()).toBe('sah2ed');
-  });
 });

e2e/login.po.js

@@ -27,7 +27,9 @@ function browserSyncInit(baseDir, files, browser) {
       middleware: middleware,
       routes: routes
     },
-    browser: browser
+    browser: browser,
+    host: 'local.topcoder-dev.com',
+    open: 'external'
   });
 }
 

e2e/login.spec.js

@@ -33,7 +33,7 @@
     "gulp-useref": "~1.0.2",
     "http-proxy": "~1.7.0",
     "jasmine-core": "^2.5.2",
-	"jshint":"~2.9.4",
+    "jshint": "~2.9.4",
     "jshint-stylish": "~1.0.0",
     "main-bower-files": "~2.13.1",
     "protractor": "~5.1.1",

gulp/server.js

@@ -11,13 +11,6 @@ exports.config = {
     'browserName': 'chrome'
   },
 
-  onPrepare: function() {
-    // check if env variables for testing are set
-    if (typeof process.env.TEST_USER === "undefined" || typeof process.env.TEST_PASSWORD === "undefined") {
-        throw "The environment variables TEST_USER and TEST_PASSWORD should be set in order for the tests to work";
-    }
-  },
-
   // Spec patterns are relative to the current working directly when
   // protractor is called.
   specs: [paths.e2e + '/**/*.js'],

package.json

@@ -2,7 +2,7 @@
 
 var module = angular.module('supportAdminApp');
 
-module.controller('addmembers.AddMemberController', ['$log', '$scope', '$parse', 'AuthService', 'MemberService', function ($log, $scope, $parse, $authService, $memberService) {
+module.controller('addmembers.AddMemberController', ['$log', '$scope', '$parse', 'MemberService', function ($log, $scope, $parse, $memberService) {
 
     $scope.errors = [];
     $scope.response = [];