Skip to content

Commit 6f72bf7

Browse files
golobitchgolobitch
committed
chore(backend): format
1 parent eeb1f4c commit 6f72bf7

File tree

9 files changed

+79
-62
lines changed

9 files changed

+79
-62
lines changed

‎packages/backend/migrations/20250301103930_rename_wallet_address_url_to_address.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* @returns { Promise<void> }
44
*/
55
exports.up = function (knex) {
6-
return knex.schema.alterTable('walletAddresses', (table) => {
7-
table.renameColumn('url', 'address')
8-
})
6+
return knex.schema.alterTable('walletAddresses', (table) => {
7+
table.renameColumn('url', 'address')
8+
})
99
}
1010

1111
/**
1212
* @param { import("knex").Knex } knex
1313
* @returns { Promise<void> }
1414
*/
1515
exports.down = function (knex) {
16-
return knex.schema.alterTable('walletAddresses', (table) => {
17-
table.renameColumn('address', 'url')
18-
})
16+
return knex.schema.alterTable('walletAddresses', (table) => {
17+
table.renameColumn('address', 'url')
18+
})
1919
}

‎packages/backend/migrations/20250301203110_unique_tenant_settings_key.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
* @returns { Promise<void> }
44
*/
55
exports.up = function (knex) {
6-
return knex.schema.alterTable('tenantSettings', function(table) {
7-
table.unique(['tenantId', 'key']);
8-
});
6+
return knex.schema.alterTable('tenantSettings', function (table) {
7+
table.unique(['tenantId', 'key'])
8+
})
99
}
1010

1111
/**
1212
* @param { import("knex").Knex } knex
1313
* @returns { Promise<void> }
1414
*/
1515
exports.down = function (knex) {
16-
return knex.schema.alterTable('tenantSettings', function(table) {
17-
table.dropUnique(['tenantId', 'key']);
18-
});
16+
return knex.schema.alterTable('tenantSettings', function (table) {
17+
table.dropUnique(['tenantId', 'key'])
18+
})
1919
}

‎packages/backend/src/open_payments/wallet_address/errors.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export enum WalletAddressError {
55
UnknownAsset = 'UnknownAsset',
66
UnknownWalletAddress = 'UnknownWalletAddress',
77
DuplicateWalletAddress = 'DuplicateWalletAddress',
8-
WalletAddressSettingNotFound = 'WalletAddressSettingNotFound',
8+
WalletAddressSettingNotFound = 'WalletAddressSettingNotFound'
99
}
1010

1111
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types

‎packages/backend/src/open_payments/wallet_address/service.test.ts‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe('Open Payments Wallet Address Service', (): void => {
6060
})
6161

6262
describe('Create or Get Wallet Address3', (): void => {
63-
let tenantId: string;
63+
let tenantId: string
6464
let options: CreateOptions
6565

6666
beforeEach(async (): Promise<void> => {
@@ -70,7 +70,10 @@ describe('Open Payments Wallet Address Service', (): void => {
7070
await createTenantSettings(deps, {
7171
tenantId: tenantId,
7272
setting: [
73-
{ key: TenantSettingKeys.WALLET_ADDRESS_URL.name, value: 'https://alice.me' }
73+
{
74+
key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
75+
value: 'https://alice.me'
76+
}
7477
]
7578
})
7679

@@ -101,28 +104,31 @@ describe('Open Payments Wallet Address Service', (): void => {
101104
)
102105

103106
test.each`
104-
setting | address | generated
105-
${'https://alice.me/ilp'} | ${'https://alice.me/ilp/test'} | ${'https://alice.me/ilp/test'}
106-
${'https://alice.me/ilp'} | ${'test'} | ${'https://alice.me/ilp/test'}
107-
${'https://alice.me/ilp'} | ${'/test'} | ${'https://alice.me/ilp/test'}
108-
${'https://alice.me/ilp/'} | ${'test'} | ${'https://alice.me/ilp/test'}
109-
${'https://alice.me/ilp/'} | ${'/test'} | ${'https://alice.me/ilp/test'}
110-
`('should create address $generated with address $address and setting $setting', async ({ setting, address, generated }): Promise<void> => {
111-
await createTenantSettings(deps, {
112-
tenantId: tenantId,
113-
setting: [
114-
{ key: TenantSettingKeys.WALLET_ADDRESS_URL.name, value: setting }
115-
]
116-
})
107+
setting | address | generated
108+
${'https://alice.me/ilp'} | ${'https://alice.me/ilp/test'} | ${'https://alice.me/ilp/test'}
109+
${'https://alice.me/ilp'} | ${'test'} | ${'https://alice.me/ilp/test'}
110+
${'https://alice.me/ilp'} | ${'/test'} | ${'https://alice.me/ilp/test'}
111+
${'https://alice.me/ilp/'} | ${'test'} | ${'https://alice.me/ilp/test'}
112+
${'https://alice.me/ilp/'} | ${'/test'} | ${'https://alice.me/ilp/test'}
113+
`(
114+
'should create address $generated with address $address and setting $setting',
115+
async ({ setting, address, generated }): Promise<void> => {
116+
await createTenantSettings(deps, {
117+
tenantId: tenantId,
118+
setting: [
119+
{ key: TenantSettingKeys.WALLET_ADDRESS_URL.name, value: setting }
120+
]
121+
})
117122

118-
const walletAddress = await walletAddressService.create({
119-
...options,
120-
address
121-
})
123+
const walletAddress = await walletAddressService.create({
124+
...options,
125+
address
126+
})
122127

123-
assert.ok(!isWalletAddressError(walletAddress))
124-
expect(walletAddress.address).toEqual(generated)
125-
})
128+
assert.ok(!isWalletAddressError(walletAddress))
129+
expect(walletAddress.address).toEqual(generated)
130+
}
131+
)
126132

127133
test('Cannot create wallet address with unknown asset', async (): Promise<void> => {
128134
await expect(

‎packages/backend/src/open_payments/wallet_address/service.ts‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -170,37 +170,38 @@ async function createWalletAddress(
170170
deps: ServiceDependencies,
171171
options: CreateOptions
172172
): Promise<WalletAddress | WalletAddressError> {
173-
const found = await deps.tenantSettingService.get({
173+
const found = (await deps.tenantSettingService.get({
174174
tenantId: options.tenantId,
175175
key: TenantSettingKeys.WALLET_ADDRESS_URL.name
176-
}) as TenantSetting[];
176+
})) as TenantSetting[]
177177

178178
if (!found || found.length === 0) {
179-
return WalletAddressError.WalletAddressSettingNotFound;
179+
return WalletAddressError.WalletAddressSettingNotFound
180180
}
181181

182-
const tenantWalletAddressUrl = new URL(found[0].value);
183-
184-
let tenantBaseUrl = tenantWalletAddressUrl.toString();
182+
const tenantWalletAddressUrl = new URL(found[0].value)
183+
184+
let tenantBaseUrl = tenantWalletAddressUrl.toString()
185185
if (!tenantWalletAddressUrl.pathname.endsWith('/')) {
186-
tenantBaseUrl = tenantWalletAddressUrl.origin + tenantWalletAddressUrl.pathname + '/'
186+
tenantBaseUrl =
187+
tenantWalletAddressUrl.origin + tenantWalletAddressUrl.pathname + '/'
187188
}
188189

189190
const isValidUrl = (str: string): boolean => {
190191
try {
191-
new URL(str);
192-
return true;
192+
new URL(str)
193+
return true
193194
} catch {
194-
return false;
195+
return false
195196
}
196-
};
197+
}
197198

198-
let finalWalletAddressUrl: string;
199+
let finalWalletAddressUrl: string
199200
if (isValidUrl(options.address)) {
200201
// in case that client provided full url, verify that it starts with the tenant's URL
201-
const walletAddressUrl = new URL(options.address);
202+
const walletAddressUrl = new URL(options.address)
202203
if (!walletAddressUrl.href.startsWith(tenantWalletAddressUrl.href)) {
203-
return WalletAddressError.InvalidUrl;
204+
return WalletAddressError.InvalidUrl
204205
}
205206
finalWalletAddressUrl = walletAddressUrl.toString()
206207
} else {
@@ -212,10 +213,10 @@ async function createWalletAddress(
212213
}
213214
finalWalletAddressUrl = tenantBaseUrl + relativePath
214215
} catch (err) {
215-
return WalletAddressError.InvalidUrl;
216+
return WalletAddressError.InvalidUrl
216217
}
217218
}
218-
219+
219220
if (!isValidWalletAddressUrl(finalWalletAddressUrl)) {
220221
return WalletAddressError.InvalidUrl
221222
}

‎packages/backend/src/tenants/service.test.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ describe('Tenant Service', (): void => {
156156
idpConsentUrl: faker.internet.url(),
157157
idpSecret: 'test-idp-secret',
158158
settings: [
159-
{ key: TenantSettingKeys.WALLET_ADDRESS_URL.name, value: walletAddressUrl }
159+
{
160+
key: TenantSettingKeys.WALLET_ADDRESS_URL.name,
161+
value: walletAddressUrl
162+
}
160163
]
161164
}
162165

‎packages/backend/src/tenants/service.ts‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ async function createTenant(
8484
): Promise<Tenant> {
8585
const trx = await deps.knex.transaction()
8686
try {
87-
const { email, apiSecret, publicName, idpSecret, idpConsentUrl, settings } = options
87+
const { email, apiSecret, publicName, idpSecret, idpConsentUrl, settings } =
88+
options
8889
const tenant = await Tenant.query(trx).insertAndFetch({
8990
email,
9091
publicName,
@@ -99,13 +100,18 @@ async function createTenant(
99100
idpConsentUrl
100101
})
101102

102-
const createInitialTenantSettingsOptions = { tenantId: tenant.id, setting: TenantSetting.default() } ;
103+
const createInitialTenantSettingsOptions = {
104+
tenantId: tenant.id,
105+
setting: TenantSetting.default()
106+
}
103107
if (settings) {
104-
createInitialTenantSettingsOptions.setting = createInitialTenantSettingsOptions.setting.concat(settings)
108+
createInitialTenantSettingsOptions.setting =
109+
createInitialTenantSettingsOptions.setting.concat(settings)
105110
}
106-
107-
await deps.tenantSettingService.create(createInitialTenantSettingsOptions, { trx }
108-
)
111+
112+
await deps.tenantSettingService.create(createInitialTenantSettingsOptions, {
113+
trx
114+
})
109115

110116
await trx.commit()
111117

‎packages/backend/src/tenants/settings/service.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,11 @@ async function createTenantSetting(
129129
return []
130130
}
131131

132-
return TenantSetting
133-
.query(extra?.trx ?? deps.knex)
132+
return TenantSetting.query(extra?.trx ?? deps.knex)
134133
.insert(dataToUpsert)
135134
.onConflict(['tenantId', 'key'])
136135
.merge()
137-
.returning('*');
136+
.returning('*')
138137
}
139138

140139
async function getTenantSettingPageForTenant(

‎packages/backend/src/tests/walletAddress.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ export async function createWalletAddress(
3636
assetId:
3737
options.assetId || (await createAsset(deps, undefined, tenantIdToUse)).id,
3838
tenantId: tenantIdToUse,
39-
address: options.address || `https://${faker.internet.domainName()}/.well-known/pay`
39+
address:
40+
options.address ||
41+
`https://${faker.internet.domainName()}/.well-known/pay`
4042
})) as MockWalletAddress
4143
if (isWalletAddressError(walletAddressOrError)) {
4244
throw new Error(walletAddressOrError)

0 commit comments

Comments
 (0)