Skip to content

feat: support OAuth2 access tokens in addition to PATs #371

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

Open
rvetere wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −6
Open

feat: support OAuth2 access tokens in addition to PATs #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion cli/src/connect/figma_rest_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,22 @@ export function getApiUrl(figmaNode: string, apiUrlOverride?: string) {
return 'https://api.figma.com/v1'
}

/**
* Returns the appropriate headers for Figma API requests.
*
* Figma supports two authentication methods with different headers:
* - Personal Access Tokens (PAT): `X-Figma-Token` header
* - OAuth2 access tokens: `Authorization: Bearer` header
*
* OAuth2 tokens are detected by their `figu_` prefix.
*
* @see https://developers.figma.com/docs/rest-api/authentication/
*/
export function getHeaders(accessToken: string) {
return {
'X-Figma-Token': accessToken,
...(accessToken.startsWith('figu_')
? { Authorization: `Bearer ${accessToken}` }
: { 'X-Figma-Token': accessToken }),
'Content-Type': 'application/json',
'User-Agent': `code-connect-cli/${version}`,
}
Expand Down
7 changes: 2 additions & 5 deletions cli/src/connect/wizard/run_wizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { BaseCommand, getAccessToken, getCodeConnectObjects, getDir } from '../.
import prompts from 'prompts'
import fs from 'fs'
import { exitWithFeedbackMessage, findComponentsInDocument, parseFileKey } from '../helpers'
import { FigmaRestApi, getApiUrl } from '../figma_rest_api'
import { FigmaRestApi, getApiUrl, getHeaders } from '../figma_rest_api'
import { exitWithError, logger, success } from '../../common/logging'
import {
ReactProjectInfo,
Expand Down Expand Up @@ -105,10 +105,7 @@ async function fetchTopLevelComponentsFromFile({
) as CliDataResponse,
})
: request.get<CliDataResponse>(apiUrl, {
headers: {
'X-Figma-Token': accessToken,
'Content-Type': 'application/json',
},
headers: getHeaders(accessToken),
})
).finally(() => {
if (cmd.verbose) {
Expand Down