Skip to content
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

Jump to bottom

HMAC API keys #5321

Merged
merged 2 commits into from
Oct 25, 2024
Merged

HMAC API keys #5321

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
de20e83
Rename ENV.AIRBITZ_API_KEY to ENV.EDGE_API_KEY
swansontec Oct 23, 2024
aa63545
Add the optional Edge API secret
swansontec Oct 23, 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
2 changes: 1 addition & 1 deletion scripts/makeNativeHeaders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ function makeNativeHeaders() {
// Grab the API key:
let apiKey = 'Error: Set up env.json & re-run scripts/makeNativeHeaders.js'
try {
apiKey = require('../env.json').AIRBITZ_API_KEY
apiKey = require('../env.json').EDGE_API_KEY
} catch (e) {
console.log(apiKey)
}
Expand Down
6 changes: 3 additions & 3 deletions src/actions/NotificationActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export function registerNotificationsV2(changeFiat: boolean = false): ThunkActio
.catch(() => '')

const body = {
apiKey: ENV.AIRBITZ_API_KEY,
apiKey: ENV.EDGE_API_KEY,
deviceId: state.core.context.clientId,
deviceToken,
loginId: base64.stringify(base58.parse(state.core.account.rootLoginId))
Expand Down Expand Up @@ -193,7 +193,7 @@ async function updateServerSettings(context: EdgeContext, data: DeviceUpdatePayl
.catch(() => '')

const body = {
apiKey: ENV.AIRBITZ_API_KEY,
apiKey: ENV.EDGE_API_KEY,
deviceId,
deviceToken,
data: { ...data, loginIds }
Expand Down Expand Up @@ -279,7 +279,7 @@ async function legacyGet(path: string) {
method: 'GET',
headers: {
'Content-Type': 'application/json',
'X-Api-Key': ENV.AIRBITZ_API_KEY
'X-Api-Key': ENV.EDGE_API_KEY
}
})
if (response != null && response.ok) {
Expand Down
3 changes: 2 additions & 1 deletion src/components/services/EdgeCoreManager.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ const SYNC_TEST_SERVER = 'https://sync-tester-us1.edge.app'
interface Props {}

const contextOptions: EdgeContextOptions = {
apiKey: ENV.AIRBITZ_API_KEY,
apiKey: ENV.EDGE_API_KEY,
apiSecret: ENV.EDGE_API_SECRET,
appId: '',
deviceDescription: `${getBrand()} ${getDeviceId()}`,

Expand Down
6 changes: 5 additions & 1 deletion src/envConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { asArray, asBoolean, asEither, asNumber, asObject, asOptional, asString, asValue, Cleaner } from 'cleaners'

import { asBase16 } from './util/cleaners/asHex'

function asNullable<T>(cleaner: Cleaner<T>): Cleaner<T | null> {
return function asNullable(raw) {
if (raw == null) return null
Expand Down Expand Up @@ -29,7 +31,9 @@ const asEvmApiKeys = asObject({

export const asEnvConfig = asObject({
// API keys:
AIRBITZ_API_KEY: asOptional(asString, ''),
EDGE_API_KEY: asOptional(asString, ''),
EDGE_API_SECRET: asOptional(asBase16),

COINGECKO_API_KEY: asOptional(asString, 'a0000000000000000000000000000000'),
IP_API_KEY: asOptional(asString, ''),
SENTRY_DSN_URL: asOptional(asString, 'SENTRY_DSN_URL'),
Expand Down
4 changes: 2 additions & 2 deletions src/util/PushClient/PushClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import { ENV } from '../../env'
import { base58 } from '../encoding'

const { ACTION_QUEUE, AIRBITZ_API_KEY } = ENV
const { ACTION_QUEUE, EDGE_API_KEY } = ENV
const { pushServerUri } = ACTION_QUEUE

export interface PushClient {
Expand Down Expand Up @@ -46,7 +46,7 @@ export const makePushClient = (account: EdgeAccount, clientId: string): PushClie
getPushRequestBody(payload?: LoginUpdatePayload): PushRequestBody {
const data = payload != null ? wasLoginUpdatePayload(payload) : undefined
return {
apiKey: AIRBITZ_API_KEY,
apiKey: EDGE_API_KEY,
deviceId: clientId,
loginId: base58.parse(account.rootLoginId),
data
Expand Down
Loading