diff --git a/app/models/external-service.ts b/app/models/external-service.ts index 4e407ec41b0..cd502358795 100644 --- a/app/models/external-service.ts +++ b/app/models/external-service.ts @@ -7,7 +7,6 @@ export enum CredentialsFormat { ACCESS_SECRET_KEYS = 'ACCESS_KEY_SECRET_KEY', REPO_TOKEN = 'PERSONAL_ACCESS_TOKEN', DATAVERSE_API_TOKEN = 'DATAVERSE_API_TOKEN', - URL_USERNAME_PASSWORD = 'url_username_password', } export enum ExternalServiceCapabilities { diff --git a/lib/osf-components/addon/components/addons-service/addon-account-setup/component.ts b/lib/osf-components/addon/components/addons-service/addon-account-setup/component.ts index 91586890fa7..8f5893cc9c8 100644 --- a/lib/osf-components/addon/components/addons-service/addon-account-setup/component.ts +++ b/lib/osf-components/addon/components/addons-service/addon-account-setup/component.ts @@ -51,7 +51,7 @@ export default class AddonAccountSetupComponent extends Component { @tracked selectedRepo?: string; @tracked otherRepo?: string; - @tracked url?: string; + @tracked url?: string = this.args.account?.apiBaseUrl; @tracked newAccount?: AllAuthorizedAccountTypes; @tracked pendingOauth = false; @tracked credentialsObject: AddonCredentialFields = {}; @@ -63,7 +63,7 @@ export default class AddonAccountSetupComponent extends Component { } get showUrlField() { - return this.args.provider.credentialsFormat === CredentialsFormat.URL_USERNAME_PASSWORD; + return this.args.provider.configurableApiRoot; } otherRepoLabel = this.intl.t('addons.accountCreate.other-repo-label'); @@ -106,7 +106,7 @@ export default class AddonAccountSetupComponent extends Component { const credentials = this.credentialsObject; const t = this.intl.t.bind(this.intl); switch (this.args.provider.credentialsFormat) { - case CredentialsFormat.USERNAME_PASSWORD, CredentialsFormat.URL_USERNAME_PASSWORD: { + case CredentialsFormat.USERNAME_PASSWORD: { const passwordPostText = t('addons.accountCreate.password-post-text'); return [ { diff --git a/lib/osf-components/addon/components/addons-service/addon-account-setup/template.hbs b/lib/osf-components/addon/components/addons-service/addon-account-setup/template.hbs index a2c450405e8..9791769a082 100644 --- a/lib/osf-components/addon/components/addons-service/addon-account-setup/template.hbs +++ b/lib/osf-components/addon/components/addons-service/addon-account-setup/template.hbs @@ -93,14 +93,13 @@ {{t 'addons.accountCreate.url-label'}}
- {{t 'addons.accountCreate.owncloud-url-post-text' htmlSafe=true }} + {{t 'addons.accountCreate.url-post-text' htmlSafe=true }}
diff --git a/mirage/fixtures/external-storage-services.ts b/mirage/fixtures/external-storage-services.ts index a6d2ea348df..e58a4a2418a 100644 --- a/mirage/fixtures/external-storage-services.ts +++ b/mirage/fixtures/external-storage-services.ts @@ -122,7 +122,7 @@ export default [ { id: 'owncloud', displayName: 'ownCloud', - credentialsFormat: CredentialsFormat.URL_USERNAME_PASSWORD, + credentialsFormat: CredentialsFormat.USERNAME_PASSWORD, supportedFeatures: [ ExternalServiceCapabilities.ADD_UPDATE_FILES, ExternalServiceCapabilities.DELETE_FILES, diff --git a/mirage/views/addons.ts b/mirage/views/addons.ts index ca977b44151..ce57d70e72c 100644 --- a/mirage/views/addons.ts +++ b/mirage/views/addons.ts @@ -467,14 +467,6 @@ function fakeCheckCredentials( throw new Error('Username and password are required'); } break; - case CredentialsFormat.URL_USERNAME_PASSWORD: - if (!attrs.apiBaseUrl || !credentials.username || !credentials.password) { - throw new Error('URL, username, and password are required'); - } - if (attrs.apiBaseUrl.indexOf('http') < 0) { - throw new Error('Invalid URL'); - } - break; default: // OAuth or OAuth2 should be authorized using the address found in authUrl. Faked below for mirage return false; } diff --git a/tests/acceptance/settings/addons-test.ts b/tests/acceptance/settings/addons-test.ts index 4ec4877fe16..88134ca0194 100644 --- a/tests/acceptance/settings/addons-test.ts +++ b/tests/acceptance/settings/addons-test.ts @@ -90,7 +90,7 @@ module('Acceptance | settings | addons', hooks => { { id: 'owncloud', displayName: 'ownCloud', - credentialsFormat: CredentialsFormat.URL_USERNAME_PASSWORD, + credentialsFormat: CredentialsFormat.USERNAME_PASSWORD, supportedFeatures: [ ExternalServiceCapabilities.ADD_UPDATE_FILES, ExternalServiceCapabilities.DELETE_FILES, diff --git a/translations/en-us.yml b/translations/en-us.yml index 85941078e2c..046bfb5453a 100644 --- a/translations/en-us.yml +++ b/translations/en-us.yml @@ -312,8 +312,7 @@ addons: display-name-placeholder: 'Account name' display-name-help: 'This is help text for the display name' url-label: 'Host URL' - url-placeholder: 'owncloud.example.org' - owncloud-url-post-text: 'Only ownCloud instances supporting WebDAV and OCS v1.7 are supported.' + url-post-text: 'Please include http or https' username-label: 'Username' password-label: 'Password' username-placeholder: 'Username'