+
+
+
+
diff --git a/client/galaxy/scripts/components/User/CloudAuth/CredentialForm.vue b/client/galaxy/scripts/components/User/CloudAuth/CredentialForm.vue
new file mode 100644
index 00000000000..e2d41821abf
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/CredentialForm.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/galaxy/scripts/components/User/CloudAuth/index.js b/client/galaxy/scripts/components/User/CloudAuth/index.js
new file mode 100644
index 00000000000..3e5bd9184df
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/index.js
@@ -0,0 +1 @@
+export { default as CloudAuth } from "./CloudAuth.vue";
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/AwsConfig.js b/client/galaxy/scripts/components/User/CloudAuth/model/AwsConfig.js
new file mode 100644
index 00000000000..11004e28e62
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/AwsConfig.js
@@ -0,0 +1,27 @@
+import { safeAssign } from "utils/safeAssign";
+import { BaseModel } from "./BaseModel";
+
+export class AwsConfig extends BaseModel {
+ constructor(props = {}) {
+ super();
+ this.role_arn = "";
+ safeAssign(this, props);
+ this.updateState();
+ }
+}
+
+AwsConfig.setValidator(function(model) {
+ let errors = {};
+ if (!model.role_arn.length) {
+ errors.role_arn = "Missing role_arn";
+ }
+ return errors;
+});
+
+AwsConfig.fields = {
+ "role_arn": {
+ label: "Role ARN",
+ description: "The Amazon resource name (ARN) of the role to be assumed by Galaxy.",
+ placeholder: "arn:aws:iam::XXXXXXXXXXXX:role/XXXXXXXXXXX"
+ }
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.js b/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.js
new file mode 100644
index 00000000000..296a31a5a42
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.js
@@ -0,0 +1,60 @@
+import { safeAssign } from "utils/safeAssign";
+import { BaseModel } from "./BaseModel";
+
+export class AzureConfig extends BaseModel {
+ constructor(props = {}) {
+ super();
+ this.tenant_id = "";
+ this.client_id = "";
+ this.client_secret = "";
+ safeAssign(this, props);
+ this.updateState();
+ }
+}
+
+AzureConfig.setValidator(function(model) {
+ let errors = {};
+
+ if (model.tenant_id.length < 36) {
+ errors.tenant_id = "Tenant ID too short";
+ }
+ if (!model.tenant_id) {
+ errors.tenant_id = "Missing Tenant ID";
+ }
+
+ if (model.client_id.length < 36) {
+ errors.client_id = "Client ID too short";
+ }
+ if (!model.client_id) {
+ errors.client_id = "Missing client ID";
+ }
+
+ if (!model.client_secret) {
+ errors.client_secret = "Missing secret";
+ }
+
+ return errors;
+});
+
+AzureConfig.fields = {
+ "tenant_id": {
+ label: "Tenant ID",
+ mask: "********-****-****-****-************",
+ placeholder: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+ maxlength: 36,
+ description: "Your Tenant ID (or Directory ID) on Azure."
+ },
+ "client_id": {
+ label: "Client ID",
+ mask: "********-****-****-****-************",
+ placeholder: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+ maxlength: 36,
+ description: "The Client ID (or Application ID) you defined for Galaxy on your Azure directory."
+ },
+ "client_secret": {
+ label: "Client Secret",
+ mask: "",
+ placeholder: "Client Secret",
+ description: "A secret string you obtained from Azure portal that Galaxy can use to prove its identity when requesting tokens to access your resources."
+ }
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.test.js b/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.test.js
new file mode 100644
index 00000000000..372382e406e
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/AzureConfig.test.js
@@ -0,0 +1,21 @@
+import { AzureConfig } from "./AzureConfig";
+
+describe("AzureConfig", () => {
+
+ it("should instantiate", () => {
+ let instance = new AzureConfig();
+ assert(instance);
+ assert(!instance.dirty);
+ assert(!instance.valid);
+ })
+
+ it("should validate client_secret", () => {
+ let instance = new AzureConfig();
+ instance.tenant_id = "abc";
+ instance.client_secret = "abc";
+ assert(instance.fieldValid("client_secret"));
+ assert(!instance.fieldValid("tenant_id"));
+ assert(!instance.fieldValid("client_id"));
+ })
+
+})
\ No newline at end of file
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/BaseModel.js b/client/galaxy/scripts/components/User/CloudAuth/model/BaseModel.js
new file mode 100644
index 00000000000..ed8d0cdd2f3
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/BaseModel.js
@@ -0,0 +1,109 @@
+const lastState = new WeakMap();
+const validators = new WeakMap();
+const transients = new WeakMap();
+const counter = new WeakMap();
+
+// Helps with Vue for-loop keys
+let instanceCounter = 0;
+
+export class BaseModel {
+
+ constructor() {
+ counter.set(this, instanceCounter++);
+ }
+
+
+ /* object ID */
+
+ get counter() {
+ return counter.get(this);
+ }
+
+
+ /* Dirty state tracking */
+
+ get dirty() {
+ return lastState.get(this) != this.state;
+ }
+
+ get clean() {
+ return !this.dirty;
+ }
+
+ get state() {
+ // build state JSON ignoring transient fields
+ let tFields = this.transientFields;
+ return JSON.stringify(this, function(key) {
+ if (!tFields.has(key)) {
+ return this[key];
+ }
+ return undefined;
+ });
+ }
+
+ get lastState() {
+ return lastState.get(this);
+ }
+
+ get transientFields() {
+ let key = this.constructor;
+ if (!transients.has(key)) {
+ transients.set(key, new Set());
+ }
+ return transients.get(key);
+ }
+
+ updateState() {
+ lastState.set(this, this.state);
+ }
+
+ // Setting a property name as transient for a class means its
+ // state will be caclulated without regard to that propety
+ static setTransient(...fieldNames) {
+
+ let klass = this; // this will be a class
+ if (!transients.has(klass)) {
+ transients.set(klass, new Set());
+ }
+
+ let fields = transients.get(klass);
+ fieldNames.forEach(fieldName => fields.add(fieldName))
+ transients.set(klass, fields);
+ }
+
+
+
+ /* Validation */
+
+ get valid() {
+ return Object.keys(this.validationErrors).length == 0;
+ }
+
+ get validationErrors() {
+ return this.constructor.validate(this);
+ }
+
+ errorMessage(field) {
+ if (field in this.validationErrors) {
+ return this.validationErrors[field];
+ }
+ return "errmessage";
+ }
+
+ fieldValid(fieldName) {
+ return !(fieldName in this.validationErrors);
+ }
+
+ static validate(model) {
+ if (validators.has(this)) {
+ let validator = validators.get(this);
+ return validator(model);
+ }
+ throw new Error("Missing validator");
+ }
+
+ static setValidator(validationFunction) {
+ validators.set(this, validationFunction);
+ }
+
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/Credential.js b/client/galaxy/scripts/components/User/CloudAuth/model/Credential.js
new file mode 100644
index 00000000000..1ea556aee4b
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/Credential.js
@@ -0,0 +1,111 @@
+import { safeAssign } from "utils/safeAssign";
+import { ResourceProviders } from "./ResourceProviders";
+import { BaseModel } from "./BaseModel";
+
+export class Credential extends BaseModel {
+
+ constructor(props = {}) {
+ super();
+
+ this.id = null;
+ this.description = "";
+ this.authn_id = null; // identity provider
+ this.provider = null; // resource provider
+
+ // transient props, exclude from state
+ this.expanded = false;
+ this.loading = false;
+
+ // populate props
+ let options = Object.assign({}, Credential.defaults, props);
+ safeAssign(this, options);
+
+ // init nested config
+ this.config = new this.configClass(options.config);
+
+ // initialize state
+ this.updateState();
+ }
+
+ get title() {
+ return this.description.length ? this.description : this.provider;
+ }
+
+ get valid() {
+ return super.valid && this.config.valid;
+ }
+
+
+ // Alias for provider also changes config object when updated
+ // Set this when updating in the UI
+
+ get resourceProvider() {
+ return this.provider;
+ }
+
+ set resourceProvider(newProvider) {
+ this.provider = newProvider;
+ this.config = new this.configClass({});
+ }
+
+
+ // Polymorphic config class
+
+ get configClass() {
+ return ResourceProviders.get(this.provider).klass;
+ }
+
+
+ // Methods
+
+ filter(searchText = "") {
+ // TODO: better text filtering
+ return searchText.length
+ ? this.title.includes(searchText) : true;
+ }
+
+
+ // Statics
+
+ static get defaults() {
+ return {
+ authn_id: null,
+ provider: 'aws',
+ expanded: false
+ };
+ }
+
+ static create(props = {}) {
+ return new Credential(props);
+ }
+}
+
+/**
+ * Transient fields do not factor into the state
+ * for purposes of dirty tracking
+ */
+Credential.setTransient("expanded", "loading");
+
+/**
+ * A validator function's job is to return an object
+ * where the keys are field names and the values are
+ * error messages.
+ */
+Credential.setValidator(function(model) {
+
+ let errors = {};
+
+ if (!model.provider) {
+ errors.provider = "Provider must be set";
+ }
+
+ if (!model.authn_id) {
+ errors.authn_id = "Please pick an identity provider";
+ }
+
+ if (!model.config.valid) {
+ errors.config = "Invalid config object";
+ }
+
+ return errors;
+})
\ No newline at end of file
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/Credential.test.js b/client/galaxy/scripts/components/User/CloudAuth/model/Credential.test.js
new file mode 100644
index 00000000000..18789cb7372
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/Credential.test.js
@@ -0,0 +1,114 @@
+import { Credential } from "./Credential";
+import { ResourceProviders } from "./ResourceProviders";
+
+describe("Credential model", () => {
+
+ describe("basic model props", () => {
+
+ it("should exist", () => {
+ assert(Credential);
+ })
+
+ it("should build with defaults", () => {
+ let instance = new Credential();
+ assert(instance);
+ })
+
+ it("should build with props", () => {
+ let description = "i am the test description";
+ let props = { description };
+ let instance = new Credential(props);
+ assert(instance);
+ assert(instance.description == description);
+ })
+
+ it("default config object should be AWS", () => {
+ let instance = new Credential();
+ assert('role_arn' in instance.config, "Missing role_arn prop");
+ assert(instance.config.constructor.name == "AwsConfig");
+ })
+
+ it("should load a different config object given the right provider", () => {
+ let provider = 'azure';
+ let props = { provider };
+ let instance = new Credential(props);
+ assert(instance.provider == provider);
+ assert(instance.config.constructor.name == "AzureConfig");
+ })
+
+ it("should dynamically switch config objects as resourceProvider is changed", () => {
+ let instance = new Credential();
+ assert(instance.provider == 'aws', "Should default to AWS config' ");
+ instance.resourceProvider = 'azure';
+ assert(instance.config.constructor.name == "AzureConfig", "Should have been AzureConfig");
+ instance.resourceProvider = 'aws';
+ assert(instance.config.constructor.name == "AwsConfig", "Should be AWS Config again");
+ })
+ })
+
+ describe("dirty state", () => {
+
+ it("should flag as dirty when a prop is changed", () => {
+ let instance = new Credential();
+ instance.description = "foo";
+ assert(instance.dirty);
+ })
+
+ it("should flag as clean when a prop is restored", () => {
+ let instance = new Credential();
+ instance.description = 'foo';
+ assert(instance.dirty);
+ instance.description = "";
+ assert(!instance.dirty);
+ })
+
+ it("should not flag as dirty when a transient prop is changed", () => {
+ let instance = new Credential();
+ instance.loading = true;
+ assert(!instance.dirty);
+ })
+
+ })
+
+ describe("validation", () => {
+
+ it("a new object should be invalid", () => {
+ let instance = new Credential();
+ assert(!instance.valid);
+ })
+
+ it("it should become valid when props are assigned", () => {
+ let instance = new Credential();
+ instance.authn_id = "floob";
+ instance.resourceProvider = 'aws';
+ instance.config.role_arn = "abc";
+ assert(instance.valid);
+ })
+
+ it("it should be valid when initialized with correct props", () => {
+ let props = {
+ authn_id: "asdfasdf",
+ provider: 'aws',
+ config: {
+ role_arn: "floobar"
+ }
+ }
+ let instance = new Credential(props);
+ assert(instance.valid);
+ })
+
+ it("should be invalid when bad props assigned", () => {
+ let props = {
+ authn_id: "asdfasdf",
+ provider: 'aws',
+ config: {
+ role_arn: ""
+ }
+ }
+ let instance = new Credential(props);
+ assert(!instance.valid);
+ })
+
+ })
+
+})
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/IdentityProvider.js b/client/galaxy/scripts/components/User/CloudAuth/model/IdentityProvider.js
new file mode 100644
index 00000000000..b78538bdb82
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/IdentityProvider.js
@@ -0,0 +1,30 @@
+import { safeAssign } from "utils/safeAssign";
+
+export class IdentityProvider {
+
+ constructor(props = {}) {
+ this.id = "";
+ this.provider = "";
+ safeAssign(this, props);
+ }
+
+ // Aliases
+
+ get authn_id() {
+ return this.id;
+ }
+
+ get text() {
+ return this.provider;
+ }
+
+ get value() {
+ return this.id;
+ }
+
+ // Statics
+
+ static create(props = {}) {
+ return new IdentityProvider(props);
+ }
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/ResourceProviders.js b/client/galaxy/scripts/components/User/CloudAuth/model/ResourceProviders.js
new file mode 100644
index 00000000000..965e254b2f1
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/ResourceProviders.js
@@ -0,0 +1,14 @@
+import { AwsConfig } from "./AwsConfig";
+import { AzureConfig } from "./AzureConfig";
+
+export const ResourceProviders = new Map();
+
+ResourceProviders.set("aws", {
+ klass: AwsConfig,
+ label: "Amazon Web Services (AWS)"
+});
+
+ResourceProviders.set("azure", {
+ klass: AzureConfig,
+ label: "Microsoft Azure"
+});
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/index.js b/client/galaxy/scripts/components/User/CloudAuth/model/index.js
new file mode 100644
index 00000000000..9f9f76db4a7
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/index.js
@@ -0,0 +1,3 @@
+export { Credential } from "./Credential";
+export { IdentityProvider } from "./IdentityProvider";
+export { ResourceProviders } from "./ResourceProviders";
\ No newline at end of file
diff --git a/client/galaxy/scripts/components/User/CloudAuth/model/service.js b/client/galaxy/scripts/components/User/CloudAuth/model/service.js
new file mode 100644
index 00000000000..f16a2ce21bb
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/model/service.js
@@ -0,0 +1,78 @@
+/**
+ * Data retrieval/storage for the auth keys
+ */
+
+import axios from "axios";
+import { Credential, IdentityProvider } from "./index";
+import { getRootFromIndexLink } from "onload";
+
+const getUrl = path => getRootFromIndexLink() + path;
+
+export async function listCredentials() {
+ let url = getUrl("api/cloud/authz");
+ let response = await axios.get(url);
+ if (response.status != 200) {
+ throw new Error("Bad mojo");
+ }
+ return response.data.map(Credential.create);
+}
+
+export async function getCredential(id) {
+ let url = getUrl("api/cloud/authz/${id}");
+ let response = await axios.get(url);
+ if (response.status != 200) {
+ throw new Error("Bad load");
+ }
+ return Credential.create(response.data);
+}
+
+export async function saveCredential(newItem) {
+ let model = Credential.create(newItem);
+ let response = await saveOrUpdate(model);
+ if (response.status != 200) {
+ throw new Error("bad save");
+ }
+ return Credential.create(response.data);
+}
+
+async function saveOrUpdate(model) {
+ return model.id
+ ? axios.put(getUrl(`api/cloud/authz/${model.id}`), model)
+ : axios.post(getUrl("api/cloud/authz"), model);
+}
+
+export async function deleteCredential(doomed) {
+ let model = Credential.create(doomed);
+ if (model.id) {
+ let url = getUrl(`api/cloud/authz/${doomed.id}`);
+ let response = await axios.delete(url);
+ if (response.status != 200) {
+ throw new Error("Bad delete");
+ }
+ }
+ return model;
+}
+
+// Memoize results (basically never changes)
+
+let identityProviders;
+
+export async function getIdentityProviders() {
+ if (!identityProviders) {
+ let url = getUrl("authnz");
+ let response = await axios.get(url);
+ if (response.status != 200) {
+ throw new Error("Unable to load identity providers");
+ }
+ identityProviders = response.data.map(IdentityProvider.create);
+ }
+ return identityProviders;
+}
+
+export default {
+ listCredentials,
+ getCredential,
+ saveCredential,
+ deleteCredential,
+ getIdentityProviders
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/operations.scss b/client/galaxy/scripts/components/User/CloudAuth/operations.scss
new file mode 100644
index 00000000000..305de4851ed
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/operations.scss
@@ -0,0 +1,30 @@
+/**
+I put the styles for this little icon menu in its own file because
+I think this should probably become its own general component
+
+TODO: Build operations menu component for reuse wherever we do little
+icon doodads
+*/
+
+// TODO: Show this to Sam, this is what I need to import
+// to use ml-2 because our own base.scss is not importable
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/mixins";
+@import "~bootstrap/scss/utilities/spacing";
+
+@import "scss/theme/blue.scss";
+@import "scss/mixins";
+
+
+.operations {
+ margin-bottom: 0;
+
+ ul {
+ @include list_reset();
+ display: flex;
+ li:not(:first-child) {
+ @extend .ml-2; // terrible
+ }
+ }
+}
diff --git a/client/galaxy/scripts/components/User/CloudAuth/testdata/listCredentials.json b/client/galaxy/scripts/components/User/CloudAuth/testdata/listCredentials.json
new file mode 100644
index 00000000000..f4c6028668d
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/testdata/listCredentials.json
@@ -0,0 +1,17 @@
+[
+ {
+ "authn_id": "f2db41e1fa331b3e",
+ "user_id": "f2db41e1fa331b3e",
+ "deleted": "True",
+ "last_update": "2019-03-27 10:08:27.711092",
+ "last_activity": "2019-03-27 10:08:27.711104",
+ "create_time": "2019-03-27 17:08:27.712045",
+ "provider": "aws",
+ "model_class": "CloudAuthz",
+ "config": {
+ "role_arn": "arn:sws:idm::347162595"
+ },
+ "description": "floob",
+ "id": "a799d38679e985db"
+ }
+]
\ No newline at end of file
diff --git a/client/galaxy/scripts/components/User/CloudAuth/testdata/mount.html b/client/galaxy/scripts/components/User/CloudAuth/testdata/mount.html
new file mode 100644
index 00000000000..4bfc953e16c
--- /dev/null
+++ b/client/galaxy/scripts/components/User/CloudAuth/testdata/mount.html
@@ -0,0 +1,39 @@
+
Cloud
+Auth Keys
+
Lorem ipsum dolor sit amet, consectetur
+adipiscing elit.
+Fusce vehicula placerat ante et tincidunt. Donec congue
+pellentesque tortor sagittis feugiat. Duis rhoncus arcu
+id erat ultrices egestas. Suspendisse rutrum ipsum id
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ Fusce vehicula placerat ante et tincidunt. Donec congue
+ pellentesque tortor sagittis feugiat. Duis rhoncus arcu
+ id erat ultrices egestas. Suspendisse rutrum ipsum id