NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower #243

bodom0015 · 2018-02-28T16:35:18Z

See:

…rom using Bower

…odules'

…board

…NDS-1127

bodom0015 · 2018-03-26T20:52:19Z

gui/ConfigModule.js

@@ -45,6 +45,9 @@ angular
 .constant('AddSpecPathSuffix', '/store/add/')
 .constant('EditSpecPathSuffix', '/store/edit/:specKey/')

+// Navigate here when clicking "Sign In"
+.constant('SigninUrl', 'https://www.local.ndslabs.org/oauth2/authorize')
+


Added to support Globus Auth

bodom0015 · 2018-03-26T20:52:38Z

gui/ConfigModule.js

            $cookies.remove('token', CookieOptions);
            $cookies.remove('namespace', CookieOptions);

            $log.debug("Routing to login...");
-            //window.location.href = LoginRoute;


Cleaning up some leftover junk

bodom0015 · 2018-03-26T20:53:21Z

gui/Dockerfile

+
+# Install app dependencies
+RUN npm install && \
+    grunt swagger-js-codegen


Add frontend dependencies during image build instead of at container startup

bodom0015 · 2018-03-26T20:54:36Z

gui/Dockerfile.ng-base

-RUN npm install -g bower grunt-cli && \
-    npm cache clean
+# Install Grunt + Gulp
+RUN npm install -g grunt-cli gulp-cli


Reworked base image:

Change base OS from Debian Jessie to Ubuntu Xenial

Update NodeJS from 6.x to 8.x (LTS)

Removed Bower from base image

bodom0015 · 2018-03-26T20:54:50Z

gui/README.md

-```
-
-An example of a typical set of UI customizations for http://www.terraref.ndslabs.org/#/ can be seen [here](https://github.com/nds-org/ndslabs/compare/terra).
-


Removed stale docs

bodom0015 · 2018-03-26T20:55:15Z

gui/bower.json

-    "angular-animate": "~1.5.0",
-    "lodash": "4.5.1"
-  }
-}


bower.json goes away and all of these dependencies move to package.json instead

bodom0015 · 2018-03-26T20:55:36Z

gui/dashboard/DashboardModule.js

@@ -123,7 +123,7 @@ angular.module('ndslabs', [ 'navbar', 'footer', 'ndslabs-services', 'ndslabs-fil
      }
    }

-    window.location.href = LoginAppPath;
+    window.location.href = '/landing/';


Logout now routes you to the LandingPage

bodom0015 · 2018-03-26T20:56:01Z

gui/dashboard/dashboard/dashboard.html

                <button id="toggleAuthBtn" class="btn btn-sm btn-default" ng-click="toggleSecure(stack)" ng-disabled="stack.status !== 'stopped' || starting[stack.id] || ((stack.key | specProperty:'authRequired') === true) || ((stack.key | specProperty:'catalog') === 'user')">
-                  <i class="fa fa-fw" ng-class="{ 'fa-lock': stack.secure, 'fa-unlock': !stack.secure }"></i> <small ng-class="{ 'text-success': stack.secure, 'text-danger': !stack.secure }">HTTP Basic Authentication {{ stack.secure === true ? 'Enabled' : 'Disabled' }}</small>
+                  <i class="fa fa-fw" ng-class="{ 'fa-lock': stack.secure, 'fa-unlock': !stack.secure }"></i> <small ng-class="{ 'text-success': stack.secure, 'text-danger': !stack.secure }">Authentication {{ stack.secure === true ? 'Enabled' : 'Disabled' }}</small>


Updated button text to remove "HTTP Basic"

bodom0015 · 2018-03-26T20:57:23Z

gui/entrypoint.sh

-bower install --allow-root --config.interactive=false && \
-grunt
+# Start ExpressJS
+node server.js


Reworked entrypoint.sh:

Removed support for GIT_DROPIN

Removed npm/bower/grunt calls (this now happens in the Dockerfile)

Added a line to read SIGNIN_URL from the new envvar

bodom0015 · 2018-03-26T20:58:04Z

gui/dashboard/index.html


    <!-- Shared Dependencies -->
-    <script src="../bower_components/angular-grid/angular-grid.js"></script>
+    <script src="../node_modules/angular-grid/angular-grid.js"></script>
    <script src="../shared/ndslabs-api.js"></script>
    <script src="../shared/services.js"></script>
    <script src="../shared/filters.js"></script>


../bower_components/ -> ../node_modules/

bodom0015 · 2018-03-26T20:58:32Z

gui/landing/index.html

+    <script src="../node_modules/js-yaml/dist/js-yaml.min.js"></script>
+    <script src="../node_modules/angular-swagger-ui/dist/scripts/swagger-ui.min.js"></script>
+    <script src="../node_modules/angular-swagger-ui/dist/scripts/modules/swagger-yaml-parser.min.js"></script>
+    <link rel="stylesheet" href="../node_modules/angular-swagger-ui/dist/css/swagger-ui.min.css"> 

    <!-- Shared Dependencies -->
    <script src="../shared/ndslabs-api.js"></script>


../bower_components/ -> ../node_modules/

bodom0015 · 2018-03-26T20:59:25Z

gui/landing/landing.html

@@ -44,7 +44,7 @@ <h3 class="panel-title">Already have an account?</h3>
        </div>
        <div class="panel-body">
          <p>Start using {{ productName }}!</p>
-          <a id="signInBtn" class="btn btn-default" ng-href="/login/{{ rd ? '?rd=' + rd : '' }}">Sign in here <i class="fa fa-fw fa-caret-right"></i></a>
+          <a id="signInBtn" class="btn btn-default" ng-href="{{ signinLink }}">Sign in here <i class="fa fa-fw fa-caret-right"></i></a>


Hide the "Sign Up" button if OAuth is enabled, set "Sign In" target based on SIGNIN_URL envvar

bodom0015 · 2018-03-26T21:00:03Z

gui/landing/swagger/swagger.html

@@ -13,7 +13,7 @@ <h3><i class="fa fa-fw fa-server"></i> API Reference</h3>

  <div class="row">
    <div class="col-sm-12">
-      <div swagger-ui parser="yaml" trusted-sources="true" input-type="json" input="swaggerSpec" api-explorer="true"></div>
+      <div id="swaggerUi" swagger-ui parser="yaml" trusted-sources="true" url="'/swagger.yaml'" api-explorer="true"></div>


Fixed broken Swagger UI (again), added an id for the new test case

bodom0015 · 2018-03-26T21:00:20Z

gui/login/index.html

-    <script src="../bower_components/angular-google-analytics/dist/angular-google-analytics.js"></script>
-    <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+    <script src="../node_modules/angular-google-analytics/dist/angular-google-analytics.js"></script>
+    <script src="../node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js"></script>

    <!-- Shared Dependencies -->
    <script src="../shared/ndslabs-api.js"></script>


../bower_components/ -> ../node_modules/

bodom0015 · 2018-03-26T21:01:13Z

gui/login/static/LoginController.js

+    if ($scope.enableOAuth) { return false; }
+    $window.location.href = '/login/recover' + ($rootScope.rd ? '?rd=' + $rootScope.rd : '')
+  };
+


Detect OAuth configuration in LoginPage... Redirect if odd state encountered, disable page in case redirect doesn't work.

bodom0015 · 2018-03-26T21:01:33Z

gui/login/static/signUp/SignUpController.js

+    $window.location.href = $scope.signinLink;
+    return;
+  };
+
  // To handle special characters in passwords, we must escape them in the validation regex pattern
  // See https://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript/3561711#3561711
  $scope.escapeRegex = function(pattern) {


Detect OAuth configuration in SignUpPage... Redirect if odd state encountered, disable page in case redirect doesn't work.

bodom0015 · 2018-03-26T21:02:01Z

gui/package.json

    "test": "npm run unit && npm run e2e",
    "unit": "grunt karma",
    "e2e": "grunt protractor-xvfb",
-    "ship": "grunt ship"
+    "ship": "grunt ship",
+    "start": "node server.js"


Added all dependencies from bower.json

bodom0015 · 2018-03-26T21:02:21Z

gui/server.js

@@ -51,7 +51,7 @@ app.use(bodyParser.urlencoded({ extended: false }));
 app.use(bodyParser.json());

 // AngularJS app dependencies
-app.use('/bower_components', express.static('bower_components'));
+app.use('/node_modules', express.static('node_modules'));


Server needed a rule update to serve node_modules instead of bower_components

bodom0015 · 2018-03-26T21:05:14Z

gui/shared/navbar/NavbarController.js

@@ -76,7 +78,7 @@ angular
    $cookies.remove('namespace', CookieOptions);

    // TODO: Can we avoid hard-coding this URL?
-    $window.location.href = '/login/';
+    $window.location.href = '/landing/';


Logout now routes to LandingPage, and detect OAuth support to hide the SignUp button, as well as change the target of the SignIn button

bodom0015 · 2018-03-26T21:06:09Z

gui/tests/e2e/addSpec.e2e.js


      // Enter the port number
      addSpecPage.newDockerTagNameField.sendKeys(TEST_DOCKER_IMAGE_TAG);

      // Click the Add button
      var addBtn = addSpecPage.addDockerTagBtn;
-      helpers.scrollIntoView(addBtn);
+      //helpers.scrollIntoView(addBtn);


I'm not sure why this test case was broken, but I'll need to revisit it if we find that it breaks again

bodom0015 · 2018-03-26T21:06:26Z

gui/tests/e2e/dashboard.e2e.js

-var TEXT_BASIC_AUTH_ENABLED = 'HTTP Basic Authentication Enabled';
-var TEXT_BASIC_AUTH_DISABLED = 'HTTP Basic Authentication Disabled';
+var TEXT_BASIC_AUTH_ENABLED = 'Authentication Enabled';
+var TEXT_BASIC_AUTH_DISABLED = 'Authentication Disabled';


Adjusting test case to account for new button text

bodom0015 · 2018-03-26T21:06:59Z

gui/tests/e2e/pages/console.page.js

+      helpers.expectNewTabOpen(PAGE_ROUTE, true);
+      browser.waitForAngular();
+      self.verify();
+    });


Properly handling this asynchronously - previous pattern had a race condition

bodom0015 · 2018-03-26T21:07:20Z

gui/tests/e2e/pages/swagger.page.js

@@ -22,6 +22,8 @@ var SwaggerUiPage = function() {
  /**
   * Insert public Getters here for page elements
   */
+  this.swaggerUi = element(by.css('.swagger-ui'));
+  this.apiTitle = element(by.binding('ui.infos.title'));


Adding a couple of new ids for new test case

bodom0015 · 2018-03-26T21:08:26Z

gui/tests/e2e/swagger.e2e.js

+  it('should offer a Workbench API reference', function() {
+    expect(swaggerUiPage.apiTitle.isPresent()).toBe(true);
+    expect(swaggerUiPage.apiTitle.isDisplayed()).toBe(true);
+    expect(swaggerUiPage.apiTitle.getText()).toBe(EXPECTED_API_TITLE);


EXPECTED_API_TITLE is effectively read from the name/description swagger.yml spec, so this seems to be a reasonable test of whether or not the SwaggerUI view is actually functioning

* Add version 2.0 of client-go * Stub pod and RC watching * Add kubernetes go client to KubeHelper * Get clean healthz result * Migrate more operations over to go client * Migrate GetLog to go client * Mostly complete conversion to go client * Initial fixes * Just a reformat * Removed unused PutDataset endpoint * Changed Kubernetes version to 1.5 * Reverted change to Stream() call * Migrate to mockable kubernetes Interface * Updated event handling to use go client approach * Added instructions to run apiserver out of cluster * Added support for in-cluster configuration * NDS-1172: Add -p flag to ndsctl to allow specification of password (nds-org#242) * Roll versions forward to 1.0.14 * NDS-1172: Add -p flag to ndsctl to allow specification of password * NDS-1177: Delete ingress rule before recreating it during stack modification * NDS-1219: If stack is starting, StartStack should simply return 202 again * NDS-1116: Adds oauth endpoint to apiserver (nds-org#246) * Added admin port * Added admin port * Added oauth registration method * Parameterized auth urls * NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower (nds-org#243) * Roll versions forward to 1.0.14 * Sync.. starting to refactor webui Dockerfile(s) * NDS-1127 / NDS-229: Rework Docker/Grunt build process, migrate away from using Bower * Removed bower from package.json * Removed Bower from base image * Replace static file server rule for '/bower_components' with '/node_modules' * Fix last few dependency issues from migration * Fixed SwaggerUI view (again) and added a test case * Removed the 'HTTP Basic' from 'HTTP Basic Authentication' on the dashboard * Made the SwaggerUI test case actually useful * Fixed an issue scrolling Docker image tags into view (addSpec) * Fixed race condition in consolePage.get() * Fixed erroneous comments * Removed documentation about GIT_DROPIN feature * Remove debian backports apt repo from Dockerfile * Adjusted Docker image to read in SIGNIN_URL * Adjusted Signin/Signout paths on LandingPage/Navbar * Added banner / redirect to LoginPage / SignUpPage when OAuth is enabled * Update README.md * Create simple travis script to verify basics (nds-org#247) * Update glide repos to fix sirupsen repo name change * Changed default NDSLABS_APISERVER_SERVICE_PORT to 30001 * Updated dependencies and imports * Added better defaults for debugging * Updated README to reflect current dev practices * Added insecure postman collection * Addressed review feedack * Allow user to configure nodeSelector in Workbench apiserver * Update entrypoint.sh to include new config values nodeSelectorName / nodeSelectorValue * Added new config for pvcStorageClass, new functions for Creating/Deleting PVCs in kube.go * Create 'home' PVC when namespace is created, create vol/user PVCs when stack starts * Removed references to glusterfs / HomeVolume, replaced with HomePvcSuffix * Added a test case for a stack mounting a PVC * Fixed HTTPS simple stack chaining/test case * Added helpers to Create/Delete NetworkPolicy resources and check for their existence * Improve NetworkPolicy error-handling slightly * Updated PVC support to use SubPath from home PVC, instead of creating a new PVC every time * Added new config for pvcStorageClass, new functions for Creating/Deleting PVCs in kube.go * Create 'home' PVC when namespace is created, create vol/user PVCs when stack starts * Removed references to glusterfs / HomeVolume, replaced with HomePvcSuffix * Added a test case for a stack mounting a PVC * Fixed HTTPS simple stack chaining/test case * Updated PVC support to use SubPath from home PVC, instead of creating a new PVC every time * Removed VOLUME_* variables and added HOME_PVC_SUFFIX * Removed unused VolumeType * Added default nfs storage class in entrypoint * Added nginx ingress class for GKE * Added Sphinx config * Basic install instructions * Added the volume.beta.kubernetes.io/nfs-mount-path annotation to the PersistentVolumeClaim * Updated the base containers to Debian Stretch due to 404 errors when running apt-get on golang:1.8-jessie * Check for error instead of nil * Add support for more fine-grained container security capabilities * Expand full.json example to show securityContext * Fix merge conflict, further expand error-handling in StartStack * Read subdomain_prefix from env instead of 'www' * Removed last references to Privileged * Don't re-pull dependencies if the --cache flag is passed * Moved networkpolicy creation to stack (not service) level * Gofmt * Add check for existing network policy * Added collocate spec option to support pod affinity on host * Changed network policy pod selector to support access by ILB * Disabled network policies * Temporary fix to ensure spdy installed * Implemented exec using go client * Added QPS and Burst overrides * Analytics event tracking (nds-org#296) * Low-barrier platform instrumentation/tracking using Google Analytics events * Fixed logs/console/edit/help/config event tracking * Use Catalog as default page when first logging in (nds-org#313) * Update Dashboard/Applications page names throughout, highlight current page in navbar (nds-org#314) * Catalog: Remove help icon, revise text in help link on dropdown (nds-org#315) * Catalog: Hide 'Add' button after installing once, highlight the 'View' button (nds-org#316) * Added description to Dashboard page, changed red panels to grey (nds-org#317) * Applications: Added tooltips to all buttons and columns (nds-org#318) * Replace link icon with text, add margin (nds-org#319) * Replace link icon with text, add margin * Replace link icon with text, add margin * Hide advanced features behind config flags (nds-org#320) * Hide some of the more advanced features behind environment variables * Fix default login path * Show Console by default * Added showLogs and showConfig flags * Remove unused envvar * fix bad merge * Remove debug variable * Update gui/README.md to correct Swagger codegen Fixes nds-org#312 * Hide Terms&Conditions link on signup if no 'Acceptable Use Policy' link is provided (nds-org#321) * Address SGCI Phase 2 Feedback (nds-org#324) * Hide purple boxes on landing, consistent naming for signUp * Move "See Also" from Landing to the "Help" dropdown on the navbar * Adjust hint text, make list / card buttons slightly more obvious * Highlight "Add" button, show popup when copying to clipboard, hide source when not needed * Hide "Add Application" button on Dashboard view * Increase size of Loading/Refresh icon * Upgrade AngularJS to 1.8.0 (nds-org#322) * Roll AngularJS forward to 1.7.9, update return signature for all uses of .then() * Roll AngularJS forward to 1.8.0 * Bump lodash from 4.5.1 to 4.17.19 in /gui (nds-org#325) Bumps [lodash](https://github.com/lodash/lodash) from 4.5.1 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.5.1...4.17.19) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BenGalewsky <ben@peartreestudio.net> Co-authored-by: Craig Willis <willis8@illinois.edu> Co-authored-by: BenGalewsky <BenGalewsky@users.noreply.github.com> Co-authored-by: Ben Galewsky <bengal1@illinois.ed> Co-authored-by: Kevin Coakley <kcoakley@sdsc.edu> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

… build, remove Bower (#243) * Roll versions forward to 1.0.14 * Sync.. starting to refactor webui Dockerfile(s) * NDS-1127 / NDS-229: Rework Docker/Grunt build process, migrate away from using Bower * Removed bower from package.json * Removed Bower from base image * Replace static file server rule for '/bower_components' with '/node_modules' * Fix last few dependency issues from migration * Fixed SwaggerUI view (again) and added a test case * Removed the 'HTTP Basic' from 'HTTP Basic Authentication' on the dashboard * Made the SwaggerUI test case actually useful * Fixed an issue scrolling Docker image tags into view (addSpec) * Fixed race condition in consolePage.get() * Fixed erroneous comments * Removed documentation about GIT_DROPIN feature * Remove debian backports apt repo from Dockerfile * Adjusted Docker image to read in SIGNIN_URL * Adjusted Signin/Signout paths on LandingPage/Navbar * Added banner / redirect to LoginPage / SignUpPage when OAuth is enabled

bodom0015 added 20 commits October 24, 2017 18:24

Roll versions forward to 1.0.14

38e850e

Merge branch 'master' of https://github.com/nds-org/ndslabs

2999d08

Merge branch 'master' of https://github.com/nds-org/ndslabs

002fd72

Merge branch 'master' of https://github.com/nds-org/ndslabs

8902ade

Merge branch 'master' of https://github.com/nds-org/ndslabs

6e97ef8

Merge branch 'master' of https://github.com/nds-org/ndslabs

3878f85

Merge branch 'master' of https://github.com/nds-org/ndslabs

a9d948a

Merge branch 'master' of https://github.com/nds-org/ndslabs

5bdbe3e

Sync.. starting to refactor webui Dockerfile(s)

0146ffa

NDS-1127 / NDS-229: Rework Docker/Grunt build process, migrate away f…

0ae5634

…rom using Bower

Removed bower from package.json

f94cf81

Sync

ed6dcd1

Removed Bower from base image

01e49b8

Replace static file server rule for '/bower_components' with '/node_m…

11f629a

…odules'

Fix last few dependency issues from migration

afe3432

Fixed SwaggerUI view (again) and added a test case

3d1e21d

Removed the 'HTTP Basic' from 'HTTP Basic Authentication' on the dash…

d269278

…board

Made the SwaggerUI test case actually useful

f9f1a6d

Fixed an issue scrolling Docker image tags into view (addSpec)

282ab5b

Fixed race condition in consolePage.get()

72531c5

bodom0015 changed the title ~~NDS-1127 / NDS-229: Refactor Docker build, remove Bower~~ NDS-1127 / NDS-229: Refactor webui Docker build, remove Bower Feb 28, 2018

bodom0015 added 7 commits February 28, 2018 11:33

Fixed erroneous comments

9f5157b

Removed documentation about GIT_DROPIN feature

9198235

Remove debian backports apt repo from Dockerfile

7e76a69

Adjusted Docker image to read in SIGNIN_URL

f39746e

Adjusted Signin/Signout paths on LandingPage/Navbar

3d536ee

Added banner / redirect to LoginPage / SignUpPage when OAuth is enabled

942dfce

Merge branch 'NDS-1127' of https://github.com/bodom0015/ndslabs into …

4de1999

…NDS-1127

bodom0015 changed the title ~~NDS-1127 / NDS-229: Refactor webui Docker build, remove Bower~~ NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower Mar 26, 2018

bodom0015 commented Mar 26, 2018

View reviewed changes

craig-willis merged commit eb4d003 into nds-org:master May 16, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower #243

NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower #243

bodom0015 commented Feb 28, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

bodom0015 Mar 26, 2018

		```

		An example of a typical set of UI customizations for http://www.terraref.ndslabs.org/#/ can be seen [here](https://github.com/nds-org/ndslabs/compare/terra).

NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower #243

NDS-1127 / NDS-229: Globus Auth support for UI, refactor webui Docker build, remove Bower #243

Conversation

bodom0015 commented Feb 28, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment