${error}
`); diff --git a/src/electron/frontend/core/components/pages/uploads/UploadsPage.js b/src/electron/frontend/core/components/pages/uploads/UploadsPage.js index 64cf2557e..b38925645 100644 --- a/src/electron/frontend/core/components/pages/uploads/UploadsPage.js +++ b/src/electron/frontend/core/components/pages/uploads/UploadsPage.js @@ -25,16 +25,13 @@ import { Modal } from "../../Modal"; import { DandiResults } from "../../DandiResults.js"; import dandiGlobalSchema from "../../../../../../schemas/json/dandi/global.json"; -import { JSONSchemaInput } from "../../JSONSchemaInput.js"; -import { header } from "../../forms/utils"; - import { validateDANDIApiKey } from "../../../validation/dandi"; import * as dandi from "dandi"; import keyIcon from "../../../../assets/icons/key.svg?raw"; -import { AWARD_VALIDATION_FAIL_MESSAGE, awardNumberValidator, isStaging, validate } from "./utils"; +import { AWARD_VALIDATION_FAIL_MESSAGE, awardNumberValidator, isStaging, validate, getAPIKey } from "./utils"; import { createFormModal } from "../../forms/GlobalFormModal"; export function createDandiset(results = {}) { @@ -72,6 +69,7 @@ export function createDandiset(results = {}) { schema: dandiCreateSchema, results, validateEmptyValues: false, // Only show errors after submission + validateOnChange: async (name, parent) => { const value = parent[name]; @@ -93,6 +91,7 @@ export function createDandiset(results = {}) { { name: "Embargo your Data", properties: [["embargo_status"], ["nih_award_number"]], + link: true, }, ], }); @@ -122,7 +121,8 @@ export function createDandiset(results = {}) { token: api_key, type: staging ? "staging" : undefined, }); - await api.init(); + + await api.authorize(); const metadata = { description: form.resolved.description, @@ -173,83 +173,6 @@ export function createDandiset(results = {}) { }; } -async function getAPIKey(staging = false) { - const whichAPIKey = staging ? "development_api_key" : "main_api_key"; - const DANDI = global.data.DANDI; - let api_key = DANDI?.api_keys?.[whichAPIKey]; - - const errors = await validateDANDIApiKey(api_key, staging); - - const isInvalid = !errors || errors.length; - - if (isInvalid) { - const modal = new Modal({ - header: `${api_key ? "Update" : "Provide"} your ${header(whichAPIKey)}`, - open: true, - onClose: () => modal.remove(), - }); - - const input = new JSONSchemaInput({ - path: [whichAPIKey], - schema: dandiGlobalSchema.properties.api_keys.properties[whichAPIKey], - }); - - input.style.padding = "25px"; - - modal.append(input); - - let notification; - - const notify = (message, type) => { - if (notification) this.dismiss(notification); - return (notification = this.notify(message, type)); - }; - - modal.onClose = async () => notify("The updated DANDI API key was not set", "error"); - - api_key = await new Promise((resolve) => { - const button = new Button({ - label: "Save", - primary: true, - onClick: async () => { - const value = input.value; - if (value) { - const errors = await validateDANDIApiKey(input.value, staging); - if (!errors || !errors.length) { - modal.remove(); - - merge( - { - DANDI: { - api_keys: { - [whichAPIKey]: value, - }, - }, - }, - global.data - ); - - global.save(); - resolve(value); - } else { - notify(errors[0].message, "error"); - return false; - } - } else { - notify("Your DANDI API key was not set", "error"); - } - }, - }); - - modal.footer = button; - - document.body.append(modal); - }); - } - - return api_key; -} - export async function uploadToDandi(info, type = "project" in info ? "project" : "") { const { dandiset } = info; @@ -435,7 +358,7 @@ export class UploadsPage extends Page { error.message = "Please select at least one file or folder to upload."; }, - validateOnChange: validate, + validateOnChange: (...args) => validate.call(this, ...args), })); }) .catch((error) => html`${error}
`); diff --git a/src/electron/frontend/core/components/pages/uploads/utils.ts b/src/electron/frontend/core/components/pages/uploads/utils.ts index 1cdff2822..f82962ee7 100644 --- a/src/electron/frontend/core/components/pages/uploads/utils.ts +++ b/src/electron/frontend/core/components/pages/uploads/utils.ts @@ -1,7 +1,18 @@ import { get } from "dandi"; -import dandiUploadSchema from "../../../../../../schemas/dandi-upload.schema"; -import { html } from "lit"; +import dandiUploadSchema, { regenerateDandisets } from "../../../../../../schemas/dandi-upload.schema"; + +import { validateDANDIApiKey } from "../../../validation/dandi"; +import { Modal } from "../../Modal"; +import { header } from "../../forms/utils"; + +import { JSONSchemaInput } from "../../JSONSchemaInput"; + +import { Button } from "../../Button.js"; +import { global } from "../../../progress/index.js"; +import { merge } from "../utils"; + +import dandiGlobalSchema from "../../../../../../schemas/json/dandi/global.json"; export const isStaging = (id: string) => parseInt(id) >= 100000; @@ -13,7 +24,7 @@ function isNumeric(str: string) { } - export const validate = async (name: string, parent: any) => { + export async function validate (name: string, parent: any) { const value = parent[name] @@ -33,8 +44,13 @@ function isNumeric(str: string) { }] const staging = isStaging(value) + const type = staging ? "staging" : undefined; + const token = await getAPIKey.call(this, staging); - const dandiset = await get(value, { type: staging ? "staging" : undefined }) + const dandiset = await get(value, { + type, + token + }) if (dandiset.detail) { if (dandiset.detail.includes('Not found')) return [{ @@ -44,12 +60,13 @@ function isNumeric(str: string) { if (dandiset.detail.includes('credentials were not provided')) return [{ type: 'warning', - message: `Authentication error – This Dandiset does not appear to be linked to your account.` + message: `Authentication error – This is an embargoed Dandiset and you haven't provided the correct credentials.` }] } // NOTE: This may not be thrown anymore with the above detail checks const { enum: enumValue } = dandiUploadSchema.properties.dandiset; + if (enumValue && !enumValue.includes(value)) return [{ type: 'error', message: `No Access – This Dandiset does not belong to you.` @@ -77,3 +94,92 @@ export function awardNumberValidator(awardNumber: string): boolean { } export const AWARD_VALIDATION_FAIL_MESSAGE = 'Award number must be properly space-delimited.\n\nExample (exclude quotes):\n"1 R01 CA 123456-01A1"'; + + +// this: +export async function getAPIKey( + // this: Page, + staging = false +) { + + const whichAPIKey = staging ? "development_api_key" : "main_api_key"; + const DANDI = global.data.DANDI; + let api_key = DANDI?.api_keys?.[whichAPIKey]; + + const errors = await validateDANDIApiKey(api_key, staging); + + const isInvalid = !errors || errors.length; + + if (isInvalid) { + const modal = new Modal({ + header: `${api_key ? "Update" : "Provide"} your ${header(whichAPIKey)}`, + open: true, + onClose: () => modal.remove(), + }); + + const container = document.createElement("div"); + + const input = new JSONSchemaInput({ + path: [whichAPIKey], + schema: dandiGlobalSchema.properties.api_keys.properties[whichAPIKey], + }); + + container.append(input); + + container.style.padding = "25px"; + + modal.append(container); + + let notification; + + const notify = (message, type) => { + if (notification) this.dismiss(notification); + return (notification = this.notify(message, type)); + }; + + modal.onClose = async () => notify("The updated DANDI API key was not set", "error"); + + api_key = await new Promise((resolve) => { + const button = new Button({ + label: "Save", + primary: true, + onClick: async () => { + const value = input.value; + if (value) { + const errors = await validateDANDIApiKey(input.value, staging); + if (!errors || !errors.length) { + modal.remove(); + + merge( + { + DANDI: { + api_keys: { + [whichAPIKey]: value, + }, + }, + }, + global.data + ); + + global.save(); + resolve(value); + } else { + notify(errors[0].message, "error"); + return false; + } + } else { + notify("Your DANDI API key was not set", "error"); + } + }, + }); + + modal.footer = button; + + document.body.append(modal); + }); + + await regenerateDandisets() + } + + return api_key; +} diff --git a/src/electron/frontend/core/validation/dandi.ts b/src/electron/frontend/core/validation/dandi.ts index d64d017d8..7829b68f8 100644 --- a/src/electron/frontend/core/validation/dandi.ts +++ b/src/electron/frontend/core/validation/dandi.ts @@ -1,6 +1,7 @@ const dandiAPITokenRegex = /^[a-f0-9]{40}$/; +import { validateToken } from 'dandi' export const validateDANDIApiKey = async (apiKey: string, staging = false) => { if (apiKey) { @@ -9,11 +10,8 @@ export const validateDANDIApiKey = async (apiKey: string, staging = false) => { const authFailedError = {type: 'error', message: `Authorization failed. Make sure you're providing an API key for the ${staging ? 'staging' : 'main'} archive.`} - return fetch(`https://api${staging ? '-staging' : ''}.dandiarchive.org/api/auth/token/`, {headers: {Authorization: `token ${apiKey}`}}) - .then((res) => { - if (!res.ok) return [authFailedError] - return true - }) - .catch(() => [authFailedError]) + const isValid = validateToken({ token: apiKey, type: staging ? 'staging' : undefined }).catch(e => false) + if (!isValid) return [ authFailedError ] + return true } } diff --git a/src/schemas/dandi-create.schema.ts b/src/schemas/dandi-create.schema.ts index 8c44ce447..7b08cd927 100644 --- a/src/schemas/dandi-create.schema.ts +++ b/src/schemas/dandi-create.schema.ts @@ -1,4 +1,4 @@ -import create from './json/dandi/create_no_embargo.json' assert { type: "json" } +import create from './json/dandi/create.json' assert { type: "json" } const schema = structuredClone(create) export default schema diff --git a/src/schemas/dandi-upload.schema.ts b/src/schemas/dandi-upload.schema.ts index 41c2edab2..88cc8257e 100644 --- a/src/schemas/dandi-upload.schema.ts +++ b/src/schemas/dandi-upload.schema.ts @@ -63,7 +63,7 @@ export const updateDandisets = async (main = true) => { if (!token) return [] - return await getMine({ token, type: staging ? 'staging' : undefined }) + return await getMine({ token, type: staging ? 'staging' : undefined }, { embargoed: true }) .then((results) => results ? Promise.all(results.map(addDandiset)) : []) .catch(() => { return [] diff --git a/src/schemas/json/dandi/create_no_embargo.json b/src/schemas/json/dandi/create_no_embargo.json deleted file mode 100644 index 2e5ec3d73..000000000 --- a/src/schemas/json/dandi/create_no_embargo.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "order": [ - "title", - "archive", - "embargo_status", - "description", - "license" - ], - "properties": { - - "title": { - "type": "string", - "description": "Provide a title for this Dandiset. The title will appear in search results and at the top of the home page for this Dandiset, so make it concise and descriptive" - }, - - "archive": { - "type": "string", - "enumLabels": { - "staging": "Development Server", - "main": "Main Archive" - }, - "enum": ["main", "staging"], - "description": "Which DANDI server to upload to.