[ENG-5155] Pretend check addon auth credentials in mirage (#2172)

* Pretend check addon auth credentials in mirage * Reset connectAccountError flag better * Update mirage credential validations * Use color variable
CenterForOpenScience · Mar 20, 2024 · f6e690b · f6e690b
1 parent d7be8fa
commit f6e690b
Show file tree

Hide file tree

Showing 6 changed files with 113 additions and 1 deletion.
diff --git a/lib/osf-components/addon/components/addons-service/account-setup-manager/styles.scss b/lib/osf-components/addon/components/addons-service/account-setup-manager/styles.scss
@@ -10,3 +10,7 @@
 .repo-select {
     width: 250px;
 }
+
+.connect-error {
+    color: $brand-danger;
+}
diff --git a/lib/osf-components/addon/components/addons-service/account-setup-manager/template.hbs b/lib/osf-components/addon/components/addons-service/account-setup-manager/template.hbs
@@ -59,6 +59,11 @@
                 </label>
                 {{field.postText}}
             {{/each}}
+            {{#if @manager.connectAccountError}}
+                <p local-class='connect-error'>
+                    {{t 'addons.accountCreate.error'}}
+                </p>
+            {{/if}}
             <Button
                 data-test-addon-connect-account-button
                 data-analytics-name='Connect Account'

diff --git a/lib/osf-components/addon/components/addons-service/manager/component.ts b/lib/osf-components/addon/components/addons-service/manager/component.ts
@@ -85,6 +85,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
         secretKey: '',
         repo: '',
     };
+    @tracked connectAccountError = false;
 
     @action
     filterByAddonType(type: FilterTypes) {
@@ -161,6 +162,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
             this.clearCredentials();
             this.pageMode = PageMode.CONFIGURE;
         } catch (e) {
+            this.connectAccountError = true;
             const errorMessage = this.intl.t('addons.accountCreate.error');
             captureException(e, { errorMessage });
             this.toast.error(getApiErrorMessage(e), errorMessage);
@@ -192,6 +194,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
 
     @action
     clearCredentials() {
+        this.connectAccountError = false;
         this.credentialsObject = {
             url: '',
             username: '',

diff --git a/lib/osf-components/addon/components/addons-service/manager/template.hbs b/lib/osf-components/addon/components/addons-service/manager/template.hbs
@@ -18,6 +18,7 @@
     chooseExistingAccount=this.chooseExistingAccount
     createNewAccount=this.createNewAccount
     connectAccount=this.connectAccount
+    connectAccountError=this.connectAccountError
     credentialsObject=this.credentialsObject
     onCredentialsInput=this.onCredentialsInput
     confirmAccountSetup=this.confirmAccountSetup

diff --git a/mirage/config.ts b/mirage/config.ts
@@ -547,8 +547,11 @@ export default function(this: Server) {
     this.get('/resource-references/:nodeGuid/configured-computing-addons',
         addons.resourceConfiguredComputingAddonList);
     this.resource('authorized-storage-accounts', { except: ['index'] });
+    this.post('authorized-storage-accounts', addons.createAuthorizedStorageAccount);
     this.resource('authorized-citation-accounts', { except: ['index'] });
+    this.post('authorized-citation-accounts', addons.createAuthorizedCitationAccount);
     this.resource('authorized-computing-accounts', { except: ['index'] });
+    this.post('authorized-computing-accounts', addons.createAuthorizedComputingAccount);
     this.resource('configured-storage-addons', { only: ['show', 'update', 'delete'] });
     this.resource('configured-citation-addons', { only: ['show', 'update', 'delete'] });
     this.resource('configured-computing-addons', { only: ['show', 'update', 'delete'] });

diff --git a/mirage/views/addons.ts b/mirage/views/addons.ts
@@ -2,14 +2,30 @@ import { HandlerContext, ModelInstance, NormalizedRequestAttrs, Request, Respons
 
 import AuthorizedCitationAccountModel from 'ember-osf-web/models/authorized-citation-account';
 import AuthorizedComputingAccountModel from 'ember-osf-web/models/authorized-computing-account';
-import AuthorizedStorageAccountModel from 'ember-osf-web/models/authorized-storage-account';
+import AuthorizedStorageAccountModel, { AddonCredentialFields } from 'ember-osf-web/models/authorized-storage-account';
+import ExternalStorageServiceModel, { CredentialsFormat } from 'ember-osf-web/models/external-storage-service';
+import ExternalCitationServiceModel from 'ember-osf-web/models/external-citation-service';
+import ExternalComputingServiceModel from 'ember-osf-web/models/external-computing-service';
 import FileProviderModel from 'ember-osf-web/models/file-provider';
 
 import { MirageConfiguredComputingAddon } from '../serializers/configured-computing-addon';
 import { MirageConfiguredCitationAddon } from '../serializers/configured-citation-addon';
 import { MirageConfiguredStorageAddon } from '../serializers/configured-storage-addon';
 import { filter, process } from './utils';
 
+interface MirageAuthorizedStorageAccount extends AuthorizedStorageAccountModel {
+    configuringUserId: string;
+    storageProviderId: string;
+}
+interface MirageAuthorizedCitationAccount extends AuthorizedCitationAccountModel {
+    configuringUserId: string;
+    citationServiceId: string;
+}
+interface MirageAuthorizedComputingAccount extends AuthorizedComputingAccountModel {
+    configuringUserId: string;
+    computingServiceId: string;
+}
+
 // This is the handler for the unofficial node/addons endpoint
 // It is only being used by the file-action-menu component to determine if a node has the BoA addon enabled
 // It is not being used by the official OSF API
@@ -204,3 +220,83 @@ export function createConfiguredComputingAddon(this: HandlerContext, schema: Sch
 
     return configuredComputingAddon;
 }
+
+export async function createAuthorizedStorageAccount(this: HandlerContext, schema: Schema) {
+    const attrs = this.normalizedRequestAttrs(
+        'authorized-storage-account',
+    ) as NormalizedRequestAttrs<MirageAuthorizedStorageAccount>;
+    const externalService = schema.externalStorageServices
+        .find(attrs.storageProviderId) as ModelInstance<ExternalStorageServiceModel>;
+    try {
+        fakeCheckCredentials(attrs.credentials!, externalService.credentialsFormat);
+    } catch (e) {
+        return new Response(403, {}, {
+            errors: [{ detail: e.message }],
+        });
+    }
+    attrs.credentials = undefined;
+    return schema.authorizedStorageAccounts.create(attrs);
+}
+
+export function createAuthorizedCitationAccount(this: HandlerContext, schema: Schema) {
+    const attrs = this.normalizedRequestAttrs(
+        'authorized-citation-account',
+    ) as NormalizedRequestAttrs<MirageAuthorizedCitationAccount>;
+    const externalService = schema.externalCitationServices
+        .find(attrs.citationServiceId) as ModelInstance<ExternalCitationServiceModel>;
+    try {
+        fakeCheckCredentials(attrs.credentials!, externalService.credentialsFormat);
+    } catch (e) {
+        return new Response(403, {}, {
+            errors: [{ detail: e.message }],
+        });
+    }
+    attrs.credentials = undefined;
+    return schema.authorizedCitationAccounts.create(attrs);
+}
+
+export function createAuthorizedComputingAccount(this: HandlerContext, schema: Schema) {
+    const attrs = this.normalizedRequestAttrs(
+        'authorized-computing-account',
+    ) as NormalizedRequestAttrs<MirageAuthorizedComputingAccount>;
+    const externalService = schema.externalComputingServices
+        .find(attrs.computingServiceId) as ModelInstance<ExternalComputingServiceModel>;
+    try {
+        fakeCheckCredentials(attrs.credentials!, externalService.credentialsFormat);
+    } catch (e) {
+        return new Response(403, {}, {
+            errors: [{ detail: e.message }],
+        });
+    }
+    attrs.credentials = undefined;
+    return schema.authorizedComputingAccounts.create(attrs);
+}
+
+function fakeCheckCredentials(credentials: AddonCredentialFields, credentialsFormat: CredentialsFormat) {
+    switch (credentialsFormat) {
+    case CredentialsFormat.REPO_TOKEN:
+        if (!credentials.token || !credentials.repo) {
+            throw new Error('Token and repo is required');
+        }
+        break;
+    case CredentialsFormat.ACCESS_SECRET_KEYS:
+        if (!credentials.accessKey || !credentials.secretKey) {
+            throw new Error('Access key and secret key is required');
+        }
+        break;
+    case CredentialsFormat.USERNAME_PASSWORD:
+        if (!credentials.username || !credentials.password) {
+            throw new Error('Username and password are required');
+        }
+        break;
+    case CredentialsFormat.URL_USERNAME_PASSWORD:
+        if (!credentials.url || !credentials.username || !credentials.password) {
+            throw new Error('URL, username, and password are required');
+        }
+        if (credentials.url.indexOf('http') < 0) {
+            throw new Error('Invalid URL');
+        }
+        break;
+    default: // no-op on OAuth or OAuth2
+    }
+}