summaryrefslogtreecommitdiffstats
path: root/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2018-10-30 09:39:59 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2018-10-30 15:59:04 -0400
commit1c1e7f98416875f3ee78af9103865c32f95a82a0 (patch)
tree706ebddc9622f12d9be9e9650cf3a97a14ac6f75 /sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module
parent6a893bb0ae984d15076394d9225d4873ad953791 (diff)
Remove SDNR seed code
Remove SDNR seed code to resolve license issues. Code is not currently used, so it will be removed for now and a cleaned version resubmitted for Dublin release. Change-Id: I37ca0feb458012626bf448739ff2497679fcb357 Issue-ID: CCSDK-641 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module')
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/pom.xml18
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/build.config.js42
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/gulpfile.js142
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/package.json29
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.js149
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.ts63
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.custom.css11
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.js33
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.ts36
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.service.ts99
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.tpl.html50
-rw-r--r--sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/templates/userDetails.html14
12 files changed, 0 insertions, 686 deletions
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/pom.xml
deleted file mode 100644
index 95ae27b2..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>security</artifactId>
- <groupId>org.onap.sdnc.dluxapps</groupId>
- <version>0.5.1</version>
- <relativePath>../</relativePath>
- </parent>
- <groupId>org.onap.sdnc.dluxapps</groupId>
- <artifactId>security-module</artifactId>
- <name>${prefix} ${project.artifactId}</name>
- <version>0.5.1</version>
- <packaging>jar</packaging>
-
- </project>
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/build.config.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/build.config.js
deleted file mode 100644
index c8396a3f..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/build.config.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * This file/module contains all configuration for the build process.
- */
-module.exports = {
- build_dir: 'build',
- app_dir: 'app',
-
- app_files: {
- js: [
- 'src/*/**/*.js',
- '!node/**/*.*',
- '!node_modules/**/*.*',
- '!src/vendor/**/*.*'
- ],
- root_js: [
- 'src/*.js'
- ],
- less: [
- 'src/assets/less/*.less'
- ],
- img: [
- 'src/assets/img/*.*'
- ],
-
- templates: [
- 'src/*/**/*.tpl.html',
- 'src/*.tpl.html'
- ]
- },
-
- assets_files: {
- less: [],
- css: [],
- data: []
- },
-
- vendor_files: {
- js: [],
- css: [],
- fonts: []
- }
-};
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/gulpfile.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/gulpfile.js
deleted file mode 100644
index c3a15c45..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/gulpfile.js
+++ /dev/null
@@ -1,142 +0,0 @@
-var gulp = require('gulp'),
- del = require('del'),
- gutil = require('gulp-util'),
- concat = require('gulp-concat'),
- runSequence = require('run-sequence'),
- install = require("gulp-install"),
- connect = require('gulp-connect'),
- open = require('gulp-open'),
- argv = require('yargs').argv,
- less = require('gulp-less'),
- debug = require('gulp-debug'),
- replace = require('gulp-replace-task');
-
-var config = require( './build.config.js');
-
-
-/**
- * Task for cleaning build directory
- */
-gulp.task('clean', function() {
- // You can use multiple globbing patterns as you would with `gulp.src`
- return del(config.build_dir);
-});
-
-/**
- * Copy assets
- */
-gulp.task('copyAssetsCss', function () {
- return gulp.src(config.assets_files.css)
- .pipe(
- gulp.dest(
- (config.build_dir) + '/assets/css'
- )
- );
-});
-
-gulp.task('copyAssetsData', function () {
- return gulp.src(config.assets_files.data)
- .pipe(gulp.dest((config.build_dir) + '/assets/data'));
-});
-
-/**
- * Copy app files
- */
-gulp.task('copyTemplates', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying APP Template files'));
- // Copy html
- return gulp.src(config.app_files.templates)
- .pipe(gulp.dest(config.build_dir));
-});
-
-gulp.task('copyAppJs', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying APP Controller JS files'));
- return gulp.src(config.app_files.js)
- .pipe(gulp.dest(config.build_dir));
-});
-
-gulp.task('copyRootJs', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying APP Root JS files'));
- return gulp.src(config.app_files.root_js)
- .pipe(gulp.dest(config.build_dir));
-});
-
-/**
- * Compile css from less files
- */
-gulp.task('less', function () {
- gutil.log(gutil.colors.cyan('INFO :: compiling LESS file'));
- return gulp.src(config.app_files.less)
- .pipe(less())
- .pipe(gulp.dest((config.build_dir) + '/assets/css'));
-});
-
-/**
- * Copy app assets images
- */
-gulp.task('copyAppImgs', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying image files'));
- return gulp.src(config.app_files.img)
- .pipe(gulp.dest((config.build_dir) + '/assets/img'));
-
-});
-
-/**
- * Copy vendor files
- */
-gulp.task('copyVendorCss', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying VENDOR css'));
- return gulp.src(config.vendor_files.css, { cwd : 'node_modules/**' })
- .pipe(gulp.dest((config.build_dir) + '/vendor'));
-});
-
-gulp.task('copyVendorFonts', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying VENDOR fonts'));
- return gulp.src(config.vendor_files.fonts, { cwd : 'node_modules/**' })
- .pipe(gulp.dest((config.build_dir) + '/vendor'));
-});
-
-gulp.task('copyVendorJs', function () {
- gutil.log(gutil.colors.cyan('INFO :: copying VENDOR js files'));
- return gulp.src(config.vendor_files.js, { cwd : 'node_modules/**' })
- .pipe(gulp.dest((config.build_dir) + '/vendor'));
-});
-
-/**
- * Copy task aggregated
- */
-gulp.task('copy', function() {
- runSequence('less', [
- 'copyAssetsCss',
- 'copyAssetsData',
- 'copyTemplates',
- 'copyAppJs',
- 'copyRootJs',
- 'copyVendorCss',
- 'copyVendorFonts',
- 'copyAppImgs'
- ], 'copyVendorJs');
-});
-
-/**
- * Build task
- */
-gulp.task('build', function(){
- runSequence('clean', 'copy');
-});
-
-
-/**
- * Live preview main task for development
- * argument --live should be used to force build task to build only live preview
- */
-gulp.task('default', function (){
-
- if (!argv.live) {
- gutil.log(gutil.colors.red('ERROR :: --live argument must be used for live preview!'));
- }
-
- gutil.log(gutil.colors.cyan('INFO :: opening new browser tab live:' + argv.live));
-
- runSequence('build');
-});
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/package.json b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/package.json
deleted file mode 100644
index 2fb0b713..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "name": "odl-dluxapps-security",
- "version": "0.5.1",
- "main": "main.js",
- "devDependencies": {
- "gulp-bower": "0.0.13"
- },
- "dependencies": {
- "del": "^2.2.0",
- "gulp": "^3.9.1",
- "gulp-concat": "^2.6.0",
- "gulp-connect": "^5.0.0",
- "gulp-debug": "^3.0.0",
- "gulp-install": "^0.6.0",
- "gulp-less": "^3.1.0",
- "gulp-open": "^2.0.0",
- "gulp-replace-task": "^0.11.0",
- "gulp-util": "^3.0.7",
- "run-sequence": "^1.1.5"
- },
- "repository": {
- "type": "git",
- "url": "https://git.opendaylight.org/gerrit/dluxapps"
- },
- "license": "EPL",
- "keywords": [
- "odl"
- ]
-}
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.js
deleted file mode 100644
index e7f12c22..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.js
+++ /dev/null
@@ -1,149 +0,0 @@
-define("security.service", ["require", "exports", "angularAMD"], function (require, exports, angular) {
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
- var security = angular.module('app.security');
- var SecurityService = /** @class */ (function () {
- function SecurityService($q, $http, $window, env) {
- this.$q = $q;
- this.$http = $http;
- this.$window = $window;
- this.env = env;
- this.ensureCrendentials();
- }
- SecurityService.prototype.ensureCrendentials = function () {
- var credentialsDefer = this.$q.defer();
- this.credentials = credentialsDefer.promise;
- var url = this.env.getBaseURL('MD_SAL') + "/oauth2/token";
- this.$http({
- method: "POST",
- url: url,
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- data: "grant_type=password&username=" + this.$window.sessionStorage.odlUser + "&password=" + this.$window.sessionStorage.odlPass + "&scope=sdn"
- }).then(function (res) {
- credentialsDefer.resolve(res.data && res.data.access_token);
- }, function (err) {
- credentialsDefer.reject(err);
- });
- };
- Object.defineProperty(SecurityService.prototype, "token", {
- get: function () {
- return this.credentials;
- },
- enumerable: true,
- configurable: true
- });
- SecurityService.prototype.getAllUsers = function () {
- var _this = this;
- var url = this.env.getBaseURL('MD_SAL') + "/auth/v1/users";
- return this.token.then(function (token) {
- return _this.$http({
- method: "GET",
- url: url,
- headers: { 'Authorization': "Bearer " + token }
- }).then(function (result) { return result.data && result.data.users; });
- });
- };
- SecurityService.prototype.getAllRoles = function () {
- var _this = this;
- var url = this.env.getBaseURL('MD_SAL') + "/auth/v1/roles";
- return this.token.then(function (token) {
- return _this.$http({
- method: "GET",
- url: url,
- headers: { 'Authorization': "Bearer " + token }
- }).then(function (result) { return result.data && result.data.roles; });
- });
- };
- SecurityService.prototype.getUserById = function (userId) {
- var _this = this;
- var url = this.env.getBaseURL('MD_SAL') + "/auth/v1/users/" + userId;
- return this.token.then(function (token) {
- return _this.$http({
- method: "GET",
- url: url,
- headers: { 'Authorization': "Bearer " + token }
- }).then(function (result) { return result.data && result.data; });
- });
- };
- SecurityService.prototype.getRolesForDomainUser = function (userId, domain) {
- var _this = this;
- if (domain === void 0) { domain = "sdn"; }
- var url = this.env.getBaseURL('MD_SAL') + "/auth/v1/domains/" + domain + "/users/" + userId + "/roles";
- return this.token.then(function (token) {
- return _this.$http({
- method: "GET",
- url: url,
- headers: { 'Authorization': "Bearer " + token }
- }).then(function (result) { return result.data && result.data.roles; });
- });
- };
- return SecurityService;
- }());
- exports.SecurityService = SecurityService;
- security.service('securityService', ['$q', '$http', '$window', 'ENV', SecurityService]);
-});
-define( ["require", "exports", "security.service"], function (require, exports) {
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
- var security = angular.module('app.security');
- var UserDetailsCtrl = /** @class */ (function () {
- function UserDetailsCtrl($scope, $uibModalInstance, userid, roles) {
- var _this = this;
- this.$uibModalInstance = $uibModalInstance;
- this.userid = userid;
- this.roles = roles;
- this.ok = function () {
- _this.$uibModalInstance.close( /* Parameter*/);
- };
- this.cancel = function () {
- _this.$uibModalInstance.dismiss('cancel');
- };
- }
- return UserDetailsCtrl;
- }());
- security.controller('userDetailsCtrl', ['$scope', '$uibModalInstance', 'userid', 'roles', UserDetailsCtrl]);
- var SecurityCtrl = /** @class */ (function () {
- function SecurityCtrl($scope, $timeout, $q, $uibModal, $document, $mwtnCommons, securityService) {
- this.$q = $q;
- this.$uibModal = $uibModal;
- this.$document = $document;
- this.securityService = securityService;
- $scope.message = "Empty";
- $scope.users = [];
- $scope.roles = [];
- $scope.currentUser = {};
- $scope.getCurrentUserById = function (id) {
- id !== null && securityService.getRolesForDomainUser(id).then(function (roles) {
- var parentElem = angular.element($document[0].querySelector('#security'));
- var modalInstance = $uibModal.open({
- animation: true,
- ariaLabelledBy: 'modal-title',
- ariaDescribedBy: 'modal-body',
- templateUrl: 'src/app/security/templates/userDetails.html',
- controller: 'userDetailsCtrl',
- controllerAs: 'vm',
- appendTo: parentElem,
- size: 'sm',
- resolve: {
- roles: function () { return roles; },
- userid: function () { return id; },
- }
- });
- });
- };
- securityService.token.then(function (res) {
- $q.all([
- securityService.getAllUsers(),
- securityService.getAllRoles()
- ]).then(function (_a) {
- var users = _a[0], roles = _a[1];
- $scope.users = users;
- $scope.roles = roles;
- });
- });
- }
- return SecurityCtrl;
- }());
- security.controller('securityCtrl', ['$scope', '$timeout', '$q', '$uibModal', '$document', '$mwtnCommons', 'securityService', SecurityCtrl]);
-});
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"security.controller.js","sourceRoot":"","sources":["src/app/security/security.service.ts","src/app/security/security.controller.ts"],"names":[],"mappings":"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","sourcesContent":["import * as angular from 'angularAMD';\n\nconst security = angular.module('app.security');\n\ninterface IEnvService {\n  getBaseURL(port: string): string;\n}\n\nexport type User = {\n  description: string;\n  domainid: string;\n  email: string;\n  enabled: boolean;\n  password: string;\n  salt: string;\n  userid: string;\n}\n\nexport type Role = {\n  roleid: string;\n  name: string;\n  description: string;\n  domainid: string;\n}\n\nexport class SecurityService {\n  private credentials: ng.IPromise<string>;\n\n  constructor(private $q: ng.IQService, private $http: ng.IHttpService, private $window, private env: IEnvService) {\n    this.ensureCrendentials();\n  }\n\n  private ensureCrendentials() {\n    const credentialsDefer = this.$q.defer<string>();\n    this.credentials = credentialsDefer.promise;\n\n    const url = `${this.env.getBaseURL('MD_SAL')}/oauth2/token`;\n    this.$http<{ access_token: string }>({\n      method: \"POST\",\n      url: url,\n      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },\n      data: `grant_type=password&username=${this.$window.sessionStorage.odlUser}&password=${this.$window.sessionStorage.odlPass}&scope=sdn`\n    }).then(res => {\n      credentialsDefer.resolve(res.data && res.data.access_token);\n    }, err => {\n      credentialsDefer.reject(err);\n    });\n  }\n\n  public get token() {\n    return this.credentials;\n  }\n\n  public getAllUsers(): ng.IPromise<User[]> {\n    const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/users`;\n    return this.token.then(token => {\n      return this.$http<{ users: User[] }>({\n        method: \"GET\",\n        url: url,\n        headers: { 'Authorization': `Bearer ${token}` }\n      }).then(result => result.data && result.data.users)\n    });\n  }\n\n  public getAllRoles(): ng.IPromise<Role[]> {\n    const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/roles`;\n    return this.token.then(token => {\n      return this.$http<{ roles: Role[] }>({\n        method: \"GET\",\n        url: url,\n        headers: { 'Authorization': `Bearer ${token}` }\n      }).then(result => result.data && result.data.roles)\n    });\n  }\n\n  public getUserById(userId: string): ng.IPromise<User> {\n    const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/users/${userId}`;\n    return this.token.then(token => {\n      return this.$http<User>({\n        method: \"GET\",\n        url: url,\n        headers: { 'Authorization': `Bearer ${token}` }\n      }).then(result => result.data && result.data)\n    });\n  }\n\n  public getRolesForDomainUser(userId: string, domain: string= \"sdn\"): ng.IPromise<Role[]> {\n    const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/domains/${domain}/users/${userId}/roles`;\n    return this.token.then(token => {\n      return this.$http<{ roles: Role[] }>({\n        method: \"GET\",\n        url: url,\n        headers: { 'Authorization': `Bearer ${token}` }\n      }).then(result => result.data && result.data.roles)\n    });\n  }\n}\n\nsecurity.service('securityService', ['$q', '$http', '$window', 'ENV', SecurityService]);","declare var angular: angular.IAngularStatic; \n\nimport { SecurityService, Role } from \"./security.service\"; \n\nimport \"./security.service\";\n\nconst security = angular.module('app.security');\n\nclass UserDetailsCtrl {\n  constructor($scope, private $uibModalInstance, public userid: string, public roles: Role[]) {\n\n  }\n\n  public ok = () => {\n    this.$uibModalInstance.close(/* Parameter*/);\n  };\n\n  public cancel = () => {\n    this.$uibModalInstance.dismiss('cancel');\n  };\n}\n\nsecurity.controller('userDetailsCtrl', ['$scope', '$uibModalInstance', 'userid', 'roles', UserDetailsCtrl]);\n\nclass SecurityCtrl {\n  constructor($scope, $timeout, private $q: ng.IQService, private $uibModal, private $document : ng.IDocumentService,  $mwtnCommons, private securityService: SecurityService) {\n    $scope.message = \"Empty\";\n    $scope.users = [];\n    $scope.roles = [];\n    $scope.currentUser = {};\n\n    $scope.getCurrentUserById = function (id: string) {\n      id !== null && securityService.getRolesForDomainUser(id).then(roles => {\n        const parentElem = angular.element($document[0].querySelector('#security'));\n        const modalInstance = $uibModal.open({\n          animation: true,\n          ariaLabelledBy: 'modal-title',\n          ariaDescribedBy: 'modal-body',\n          templateUrl: 'src/app/security/templates/userDetails.html',\n          controller: 'userDetailsCtrl',\n          controllerAs: 'vm',\n          appendTo: parentElem,\n          size: 'sm',\n          resolve: {\n            roles: () => roles,\n            userid: () => id,\n          }\n        })\n      })\n    };  \n\n    securityService.token.then(res => {\n      $q.all([\n        securityService.getAllUsers(),\n        securityService.getAllRoles()]).then(([users, roles]) => {\n          $scope.users = users;\n          $scope.roles = roles;\n      })\n    });\n  }\n}\n\nsecurity.controller('securityCtrl', ['$scope', '$timeout', '$q', '$uibModal','$document', '$mwtnCommons', 'securityService', SecurityCtrl ]);"]} \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.ts b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.ts
deleted file mode 100644
index 49315319..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.controller.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-declare var angular: angular.IAngularStatic;
-
-import { SecurityService, Role } from "./security.service";
-
-import "./security.service";
-
-const security = angular.module('app.security');
-
-class UserDetailsCtrl {
- constructor($scope, private $uibModalInstance, public userid: string, public roles: Role[]) {
-
- }
-
- public ok = () => {
- this.$uibModalInstance.close(/* Parameter*/);
- };
-
- public cancel = () => {
- this.$uibModalInstance.dismiss('cancel');
- };
-}
-
-security.controller('userDetailsCtrl', ['$scope', '$uibModalInstance', 'userid', 'roles', UserDetailsCtrl]);
-
-class SecurityCtrl {
- constructor($scope, $timeout, private $q: ng.IQService, private $uibModal, private $document : ng.IDocumentService, $mwtnCommons, private securityService: SecurityService) {
- $scope.message = "Empty";
- $scope.users = [];
- $scope.roles = [];
- $scope.currentUser = {};
-
- $scope.getCurrentUserById = function (id: string) {
- id !== null && securityService.getRolesForDomainUser(id).then(roles => {
- const parentElem = angular.element($document[0].querySelector('#security'));
- const modalInstance = $uibModal.open({
- animation: true,
- ariaLabelledBy: 'modal-title',
- ariaDescribedBy: 'modal-body',
- templateUrl: 'src/app/security/templates/userDetails.html',
- controller: 'userDetailsCtrl',
- controllerAs: 'vm',
- appendTo: parentElem,
- size: 'sm',
- resolve: {
- roles: () => roles,
- userid: () => id,
- }
- })
- })
- };
-
- securityService.token.then(res => {
- $q.all([
- securityService.getAllUsers(),
- securityService.getAllRoles()]).then(([users, roles]) => {
- $scope.users = users;
- $scope.roles = roles;
- })
- });
- }
-}
-
-security.controller('securityCtrl', ['$scope', '$timeout', '$q', '$uibModal','$document', '$mwtnCommons', 'securityService', SecurityCtrl ]); \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.custom.css b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.custom.css
deleted file mode 100644
index 67bd4579..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.custom.css
+++ /dev/null
@@ -1,11 +0,0 @@
-#security table > thead > tr > th {
- background: #ddd
-}
-
-#security table > tbody > tr > td {
- background: #ddd
-}
-
-#security table > tbody > tr:nth-child(odd) > td {
- background: #eee
-} \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.js b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.js
deleted file mode 100644
index dfd7e229..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.js
+++ /dev/null
@@ -1,33 +0,0 @@
-define( ["require", "exports"], function (require, exports) {
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.security = angular.module('app.security', ['app.core']);
- exports.security.config(function ($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider, $httpProvider, $translateProvider, $translatePartialLoaderProvider) {
- //$translatePartialLoaderProvider.addPart('app/security/locale/locale');
- NavHelperProvider.addControllerUrl('app/security/security.controller');
- NavHelperProvider.addToMenu('security', {
- "link": "#/security",
- "active": "main.security",
- "title": "Security",
- "icon": "fa fa-shield",
- "page": {
- "title": "Security",
- "description": "security"
- }
- });
- $stateProvider.state('main.security', {
- url: 'security',
- access: 2,
- views: {
- 'content': {
- templateUrl: 'src/app/security/security.tpl.html',
- controller: 'securityCtrl'
- }
- }
- });
- });
-});
-/* non ES6 export */
-// export = security;
-// export default security;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VjdXJpdHkubW9kdWxlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsic3JjL2FwcC9zZWN1cml0eS9zZWN1cml0eS5tb2R1bGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0lBR2EsUUFBQSxRQUFRLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO0lBRXJFLGdCQUFRLENBQUMsTUFBTSxDQUFDLFVBQVUsY0FBYyxFQUFFLGdCQUFnQixFQUFFLG1CQUFtQixFQUFFLFFBQVEsRUFBRSxpQkFBaUIsRUFBRSxhQUFhLEVBQUUsa0JBQWtCLEVBQUUsK0JBQStCO1FBRTlLLHdFQUF3RTtRQUV4RSxpQkFBaUIsQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQyxDQUFDO1FBQ3ZFLGlCQUFpQixDQUFDLFNBQVMsQ0FBQyxVQUFVLEVBQUU7WUFDdEMsTUFBTSxFQUFFLFlBQVk7WUFDcEIsUUFBUSxFQUFFLGVBQWU7WUFDekIsT0FBTyxFQUFFLFVBQVU7WUFDbkIsTUFBTSxFQUFFLGVBQWU7WUFDdkIsTUFBTSxFQUFFO2dCQUNOLE9BQU8sRUFBRSxVQUFVO2dCQUNuQixhQUFhLEVBQUUsVUFBVTthQUMxQjtTQUNGLENBQUMsQ0FBQztRQUVILGNBQWMsQ0FBQyxLQUFLLENBQUMsZUFBZSxFQUFFO1lBQ3BDLEdBQUcsRUFBRSxVQUFVO1lBQ2YsTUFBTSxFQUFFLENBQUM7WUFDVCxLQUFLLEVBQUU7Z0JBQ0wsU0FBUyxFQUFFO29CQUNULFdBQVcsRUFBRSxvQ0FBb0M7b0JBQ2pELFVBQVUsRUFBRSxjQUFjO2lCQUMzQjthQUNGO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7O0FBRUgsb0JBQW9CO0FBQ3BCLHFCQUFxQjtBQUNyQiwyQkFBMkIiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBpbXBvcnQgKiBhcyBhbmd1bGFyIGZyb20gJ2FuZ3VsYXJBTUQnO1xuZGVjbGFyZSB2YXIgYW5ndWxhcjogYW5ndWxhci5JQW5ndWxhclN0YXRpYzsgXG5cbmV4cG9ydCBjb25zdCBzZWN1cml0eSA9IGFuZ3VsYXIubW9kdWxlKCdhcHAuc2VjdXJpdHknLCBbJ2FwcC5jb3JlJ10pO1xuXG5zZWN1cml0eS5jb25maWcoZnVuY3Rpb24gKCRzdGF0ZVByb3ZpZGVyLCAkY29tcGlsZVByb3ZpZGVyLCAkY29udHJvbGxlclByb3ZpZGVyLCAkcHJvdmlkZSwgTmF2SGVscGVyUHJvdmlkZXIsICRodHRwUHJvdmlkZXIsICR0cmFuc2xhdGVQcm92aWRlciwgJHRyYW5zbGF0ZVBhcnRpYWxMb2FkZXJQcm92aWRlcikge1xuXG4gIC8vJHRyYW5zbGF0ZVBhcnRpYWxMb2FkZXJQcm92aWRlci5hZGRQYXJ0KCdhcHAvc2VjdXJpdHkvbG9jYWxlL2xvY2FsZScpO1xuXG4gIE5hdkhlbHBlclByb3ZpZGVyLmFkZENvbnRyb2xsZXJVcmwoJ2FwcC9zZWN1cml0eS9zZWN1cml0eS5jb250cm9sbGVyJyk7XG4gIE5hdkhlbHBlclByb3ZpZGVyLmFkZFRvTWVudSgnc2VjdXJpdHknLCB7XG4gICAgXCJsaW5rXCI6IFwiIy9zZWN1cml0eVwiLFxuICAgIFwiYWN0aXZlXCI6IFwibWFpbi5zZWN1cml0eVwiLFxuICAgIFwidGl0bGVcIjogXCJTZWN1cml0eVwiLFxuICAgIFwiaWNvblwiOiBcImZhICBmYS1zaGllbGRcIiwgIC8vIEFkZCBuYXZpZ2F0aW9uIGljb24gY3NzIGNsYXNzIGhlcmVcbiAgICBcInBhZ2VcIjoge1xuICAgICAgXCJ0aXRsZVwiOiBcIlNlY3VyaXR5XCIsXG4gICAgICBcImRlc2NyaXB0aW9uXCI6IFwic2VjdXJpdHlcIlxuICAgIH1cbiAgfSk7XG5cbiAgJHN0YXRlUHJvdmlkZXIuc3RhdGUoJ21haW4uc2VjdXJpdHknLCB7XG4gICAgdXJsOiAnc2VjdXJpdHknLFxuICAgIGFjY2VzczogMixcbiAgICB2aWV3czoge1xuICAgICAgJ2NvbnRlbnQnOiB7XG4gICAgICAgIHRlbXBsYXRlVXJsOiAnc3JjL2FwcC9zZWN1cml0eS9zZWN1cml0eS50cGwuaHRtbCcsXG4gICAgICAgIGNvbnRyb2xsZXI6ICdzZWN1cml0eUN0cmwnXG4gICAgICB9XG4gICAgfVxuICB9KTtcbn0pO1xuXG4vKiBub24gRVM2IGV4cG9ydCAqL1xuLy8gZXhwb3J0ID0gc2VjdXJpdHk7XG4vLyBleHBvcnQgZGVmYXVsdCBzZWN1cml0eTsiXX0= \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.ts b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.ts
deleted file mode 100644
index e06ae9ac..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.module.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// import * as angular from 'angularAMD';
-declare var angular: angular.IAngularStatic;
-
-export const security = angular.module('app.security', ['app.core']);
-
-security.config(function ($stateProvider, $compileProvider, $controllerProvider, $provide, NavHelperProvider, $httpProvider, $translateProvider, $translatePartialLoaderProvider) {
-
- //$translatePartialLoaderProvider.addPart('app/security/locale/locale');
-
- NavHelperProvider.addControllerUrl('app/security/security.controller');
- NavHelperProvider.addToMenu('security', {
- "link": "#/security",
- "active": "main.security",
- "title": "Security",
- "icon": "fa fa-shield", // Add navigation icon css class here
- "page": {
- "title": "Security",
- "description": "security"
- }
- });
-
- $stateProvider.state('main.security', {
- url: 'security',
- access: 2,
- views: {
- 'content': {
- templateUrl: 'src/app/security/security.tpl.html',
- controller: 'securityCtrl'
- }
- }
- });
-});
-
-/* non ES6 export */
-// export = security;
-// export default security; \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.service.ts b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.service.ts
deleted file mode 100644
index c881c53f..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.service.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import * as angular from 'angularAMD';
-
-const security = angular.module('app.security');
-
-interface IEnvService {
- getBaseURL(port: string): string;
-}
-
-export type User = {
- description: string;
- domainid: string;
- email: string;
- enabled: boolean;
- password: string;
- salt: string;
- userid: string;
-}
-
-export type Role = {
- roleid: string;
- name: string;
- description: string;
- domainid: string;
-}
-
-export class SecurityService {
- private credentials: ng.IPromise<string>;
-
- constructor(private $q: ng.IQService, private $http: ng.IHttpService, private $window, private env: IEnvService) {
- this.ensureCrendentials();
- }
-
- private ensureCrendentials() {
- const credentialsDefer = this.$q.defer<string>();
- this.credentials = credentialsDefer.promise;
-
- const url = `${this.env.getBaseURL('MD_SAL')}/oauth2/token`;
- this.$http<{ access_token: string }>({
- method: "POST",
- url: url,
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- data: `grant_type=password&username=${this.$window.sessionStorage.odlUser}&password=${this.$window.sessionStorage.odlPass}&scope=sdn`
- }).then(res => {
- credentialsDefer.resolve(res.data && res.data.access_token);
- }, err => {
- credentialsDefer.reject(err);
- });
- }
-
- public get token() {
- return this.credentials;
- }
-
- public getAllUsers(): ng.IPromise<User[]> {
- const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/users`;
- return this.token.then(token => {
- return this.$http<{ users: User[] }>({
- method: "GET",
- url: url,
- headers: { 'Authorization': `Bearer ${token}` }
- }).then(result => result.data && result.data.users)
- });
- }
-
- public getAllRoles(): ng.IPromise<Role[]> {
- const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/roles`;
- return this.token.then(token => {
- return this.$http<{ roles: Role[] }>({
- method: "GET",
- url: url,
- headers: { 'Authorization': `Bearer ${token}` }
- }).then(result => result.data && result.data.roles)
- });
- }
-
- public getUserById(userId: string): ng.IPromise<User> {
- const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/users/${userId}`;
- return this.token.then(token => {
- return this.$http<User>({
- method: "GET",
- url: url,
- headers: { 'Authorization': `Bearer ${token}` }
- }).then(result => result.data && result.data)
- });
- }
-
- public getRolesForDomainUser(userId: string, domain: string= "sdn"): ng.IPromise<Role[]> {
- const url = `${this.env.getBaseURL('MD_SAL')}/auth/v1/domains/${domain}/users/${userId}/roles`;
- return this.token.then(token => {
- return this.$http<{ roles: Role[] }>({
- method: "GET",
- url: url,
- headers: { 'Authorization': `Bearer ${token}` }
- }).then(result => result.data && result.data.roles)
- });
- }
-}
-
-security.service('securityService', ['$q', '$http', '$window', 'ENV', SecurityService]); \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.tpl.html b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.tpl.html
deleted file mode 100644
index ea08892b..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/security.tpl.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div id="security">
- <h2>Users</h2>
- <table class="table">
- <thead>
- <tr>
- <th>UserID</th>
- <th>Name</th>
- <th>Description</th>
- <th>Enabled</th>
- <th>eMail</th>
- <th>Domain</th>
- <th>Actions</th>
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="user in users">
- <td>{{user.userid}}</td>
- <td>{{user.name}}</td>
- <td>{{user.description}}</td>
- <td>{{user.enabled}}</td>
- <td>{{user.email}}</td>
- <td>{{user.domainid}}</td>
- <td>
- <button class="btn btn-sm btn-success"
- ng-click="getCurrentUserById(user.userid)">Info</button></td>
- </tr>
- </tbody>
- </table>
-<h2>Roles</h2>
-<table class="table">
- <thead>
- <tr>
- <th>RoleID</th>
- <th>Name</th>
- <th>Description</th>
- <th>Domain</th>
- <!-- <th>Actions</th> -->
- </tr>
- </thead>
- <tbody>
- <tr ng-repeat="role in roles">
- <td>{{role.roleid}}</td>
- <td>{{role.name}}</td>
- <td>{{role.description}}</td>
- <td>{{role.domainid}}</td>
- <!-- <td><button class="btn btn-sm btn-success">Info</button></td> -->
- </tr>
- </tbody>
-</table>
-</div> \ No newline at end of file
diff --git a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/templates/userDetails.html b/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/templates/userDetails.html
deleted file mode 100644
index 5589263b..00000000
--- a/sdnr/wireless-transport/code-Carbon-SR1/ux/security/security-module/src/main/resources/security/src/templates/userDetails.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="modal-header">
- <h3 class="modal-title" id="modal-title" style="color: #333;">{{ vm.userid }}</h3>
-</div>
-<div class="modal-body" id="modal-body">
- <div><b>Roles</b></div>
- <ul>
- <li ng-repeat="role in vm.roles">{{ role.name }}</li>
- </ul>
-
-</div>
-<div class="modal-footer">
- <button class="btn btn-primary" type="button" ng-click="vm.ok()">OK</button>
- <button class="btn btn-warning" type="button" ng-click="vm.cancel()">Cancel</button>
-</div> \ No newline at end of file