Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion packages/core/auth-js/src/GoTrueAdminApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,14 @@ export default class GoTrueAdminApi {
* ```
*/
async getUserById(uid: string): Promise<UserResponse> {
validateUUID(uid)
try {
validateUUID(uid)
} catch {
return {
data: { user: null },
error: new AuthInvalidCredentialsError('Invalid UUID format') as AuthError,
}
}

try {
return await _request(this.fetch, 'GET', `${this.url}/admin/users/${uid}`, {
Expand Down
4 changes: 4 additions & 0 deletions packages/core/auth-js/src/GoTrueClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4462,6 +4462,10 @@ export default class GoTrueClient {
try {
const { data, error } = await this.getUser()
if (error) throw error
const { data, error } = await this.getUser()
if (error) throw error
if (!data.user)
return this._returnResult({ data: null, error: new AuthSessionMissingError() })
return this._returnResult({ data: { identities: data.user.identities ?? [] }, error: null })
} catch (error) {
if (isAuthError(error)) {
Expand Down
7 changes: 5 additions & 2 deletions packages/core/storage-js/src/lib/common/BaseApiClient.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ErrorNamespace, isStorageError, StorageError } from './errors'
import { ErrorNamespace, isStorageError, StorageError, StorageUnknownError } from './errors'
import { Fetch } from './fetch'
import { normalizeHeaders, setHeader as setHeaderUtil } from './headers'
import { resolveFetch } from './helpers'
Expand Down Expand Up @@ -98,7 +98,10 @@ export default abstract class BaseApiClient<TError extends StorageError = Storag
if (isStorageError(error)) {
return { data: null, error: error as TError }
}
throw error
return {
data: null,
error: new StorageUnknownError(_getErrorMessage(error), error) as unknown as TError,
}
}
}
}