Merge pull request #72 from topcoder-platform/dev

Roles management - part 1

Author: ajefts

README.md

@@ -1,3 +1,4 @@
+[![CircleCI](https://circleci.com/gh/topcoder-platform/admin-app.svg?style=svg)](https://circleci.com/gh/topcoder-platform/admin-app)
 # support-admin-app
 Support application
 
@@ -27,32 +28,36 @@ 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
 
+Before executing the end-to-end (e2e) protractor tests, these environment variables should be set:
+
+| Name | Description | Default Value |
+| --- | --- | --- |
+| BUILD_ENV | Deployment configuration to be tested by e2e tests. | See [Configuration](#configuration) for possible values. Defaults to `dev`. |
+| TEST_PORT | Port from which to serve the app for e2e tests. | Defaults to `3000`. |
+
 ```npm test```
 
 ## Fallback instruction in case the npm scripts fail

bower.json

@@ -9,8 +9,6 @@
     "angular-sanitize": "~1.4.4",
     "angular-resource": "~1.4.4",
     "angular-ui-router": "~0.2.13",
-    "bootstrap": "~3.3.5",
-    "angular-bootstrap": "0.12.x",
     "angular": "~1.4.4",
     "PACE": "https://github.com/HubSpot/pace.git#~1.0.2",
     "metisMenu": "~2.0.2",
@@ -23,17 +21,16 @@
     "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",
     "moment": "~2.11.2",
     "moment-timezone": "~0.5.0",
     "ng-file-model": "https://github.com/mistralworks/ng-file-model.git#fd1889b28e279944012919574bbcaaf45c1540d6",
+    "bootstrap": "~3.3.5",
     "angular-bootstrap-multiselect": "*",
-    "bootstrap-ui-datetime-picker": "^2.4.0"
+    "bootstrap-ui-datetime-picker": "^2.4.0",
+    "angular-bootstrap": "^2.5.0"
   },
   "overrides": {
     "bootstrap": {

circle.yml

@@ -2,23 +2,38 @@
 machine:
   node:
     version: 6.8.1
-    
+
 # Add some environment variables
   environment:
-    CIRCLE_ENV: dev
-    
+
 ## Customize dependencies
 dependencies:
   pre:
     - curl -s https://raw.githubusercontent.com/chronogolf/circleci-google-chrome/master/use_chrome_stable_version.sh | bash
 
   override:
+    - rm -rf bower_components
     - npm install
 
+  post:
+    - ./node_modules/gulp/bin/gulp.js clean
+    - ./node_modules/gulp/bin/gulp.js build
+    - ./node_modules/gulp/bin/gulp.js publish
+
 compile:
   override:
-    - npm run build
-    
+##    - npm run build
+
 test:
   override:
     - npm run test
+
+deployment:
+  prod:
+    branch: master
+    commands:
+      - ./deploy.sh PROD admin.topcoder.com
+  dev:
+    branch: dev
+    commands:
+      - ./deploy.sh DEV admin.topcoder-dev.com

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"
   }
 }

deploy.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+
+echo "Deploying to S3"
+ENV=$1
+BUCKET_URL=$2
+AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
+AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
+
+# aws s3 sync dist s3://${BUCKET_URL} --acl public-read --delete
+AWS_BUCKET=$BUCKET_URL AWS_KEY=$AWS_ACCESS_KEY_ID AWS_SECRET=$AWS_SECRET_ACCESS_KEY ./node_modules/.bin/gulp publish

e2e/dashboard.spec.js

@@ -1,22 +1,11 @@
 'use strict';
 
 describe('The dashboard view', function () {
-  var page;
   var mainPage;
+  var testPort = process.env.TEST_PORT || 3000;
 
   beforeEach(function () {
-    browser.get('http://localhost:3000/');
-    page = require('./login.po');
+    browser.get('http://localhost:' + testPort + '/');
     mainPage = require('./main.po');
-    page.usernameInput.sendKeys('amy_admin');
-    page.passwordInput.sendKeys('topcoder1');
-    page.loginButton.click();
-  });
-
-  it('should find members', function() {
-    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",
@@ -46,8 +46,9 @@
   },
   "scripts": {
     "postinstall": "bower install --config.interactive=false",
+    "clean": "gulp clean",
     "build": "gulp build",
-    "start": "gulp serve",
+    "start": "gulp publish",
     "test": "gulp protractor"
   }
 }