Skip to content

[ENG-5151] Addon credentials #2170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2024
Merged

[ENG-5151] Addon credentials #2170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce4bc84
Add credentials to models; Reset credentials object
futa-ikeda Mar 18, 2024
ce291ac
Update relationship names
futa-ikeda Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/models/authorized-citation-account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';

import ExternalCitationServiceModel from './external-citation-service';
import { AddonCredentialFields } from './authorized-storage-account';
import UserReferenceModel from './user-reference';
import OsfModel from './osf-model';

export default class AuthorizedCitationAccountModel extends OsfModel {
@attr('fixstring') externalUserId!: string;
@attr('fixstring') externalUserDisplayName!: string;
@attr('fixstringarray') scopes!: string[];
@attr('object') credentials?: AddonCredentialFields; // write-only

@belongsTo('external-citation-service')
externalCitationService!: AsyncBelongsTo<ExternalCitationServiceModel> & ExternalCitationServiceModel;
citationService!: AsyncBelongsTo<ExternalCitationServiceModel> & ExternalCitationServiceModel;

@belongsTo('user-reference', { inverse: 'authorizedCitationAccounts' })
configuringUser!: AsyncBelongsTo<UserReferenceModel> & UserReferenceModel;
Expand Down
4 changes: 3 additions & 1 deletion app/models/authorized-computing-account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import { AsyncBelongsTo, attr, belongsTo } from '@ember-data/model';

import ExternalComputingService from './external-computing-service';
import { AddonCredentialFields } from './authorized-storage-account';
import UserReferenceModel from './user-reference';
import OsfModel from './osf-model';

export default class AuthorizedComputingAccount extends OsfModel {
@attr('fixstring') externalUserId!: string;
@attr('fixstring') externalUserDisplayName!: string;
@attr('fixstringarray') scopes!: string[];
@attr('object') credentials?: AddonCredentialFields; // write-only

@belongsTo('external-computing-service')
externalComputingService!: AsyncBelongsTo<ExternalComputingService> & ExternalComputingService;
computingService!: AsyncBelongsTo<ExternalComputingService> & ExternalComputingService;

@belongsTo('user-reference', { inverse: 'authorizedComputingAccounts' })
configuringUser!: AsyncBelongsTo<UserReferenceModel> & UserReferenceModel;
Expand Down
1 change: 1 addition & 0 deletions app/models/authorized-storage-account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export default class AuthorizedStorageAccountModel extends OsfModel {
@attr('fixstring') externalUserId!: string;
@attr('fixstring') externalUserDisplayName!: string;
@attr('fixstringarray') scopes!: string[];
@attr('object') credentials?: AddonCredentialFields; // write-only

@belongsTo('external-storage-service')
storageProvider!: AsyncBelongsTo<ExternalStorageServiceModel> & ExternalStorageServiceModel;
Expand Down
15 changes: 15 additions & 0 deletions lib/osf-components/addon/components/addons-service/manager/component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
.createAccountForNodeAddon).perform(this.credentialsObject);
await taskFor(this.selectedProvider.providerMap!.createConfiguredAddon).perform(newAccount);
}
this.clearCredentials();
this.pageMode = PageMode.CONFIGURE;
} catch (e) {
const errorMessage = this.intl.t('addons.accountCreate.error');
Expand Down Expand Up @@ -185,9 +186,23 @@ export default class AddonsServiceManagerComponent extends Component<Args> {
cancelSetup() {
this.pageMode = undefined;
this.selectedProvider = undefined;
this.clearCredentials();
this.selectedAccount = undefined;
}

@action
clearCredentials() {
this.credentialsObject = {
url: '',
username: '',
password: '',
token: '',
accessKey: '',
secretKey: '',
repo: '',
};
}

@action
save() {
this.cancelSetup();
Expand Down