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.

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

chore(frontend): remix v2 upgrade #2349

Merged
merged 44 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
094e6f0
chore(frontend): update error boundaries to v2
BlairCurrey Jan 18, 2024
28d892b
chore(frontend): update meta to v2
BlairCurrey Jan 18, 2024
ef8760a
chore(frontend): update headers to v2
BlairCurrey Jan 18, 2024
6228d2c
chore(frontend): update form method to v2
BlairCurrey Jan 18, 2024
ca9ad2c
chore(frontend): update to v2 dev server
BlairCurrey Jan 18, 2024
38cfb94
chore(frontend): update server module format to v2
BlairCurrey Jan 18, 2024
6ded4de
feat(frontend): typecheck cmd
BlairCurrey Jan 19, 2024
1506658
fix(frontend): type only import
BlairCurrey Jan 19, 2024
00f4874
feat(frontend): ugprade remix to v2
BlairCurrey Jan 19, 2024
85b386a
feat: add frontend typecheck to ci
BlairCurrey Jan 19, 2024
3b32e7b
chore(MASE): upgrade routes to remix v2
BlairCurrey Jan 19, 2024
d45879b
chore(MASE): upgrade module format to v2
BlairCurrey Jan 19, 2024
91c22ca
chore(MASE): update to v2 dev server
BlairCurrey Jan 19, 2024
95870de
chore(MASE): update headers to v2
BlairCurrey Jan 19, 2024
b7e53ea
chore(MASE): update form method to v2
BlairCurrey Jan 19, 2024
47ee050
chore(MASE): update meta to v2
BlairCurrey Jan 19, 2024
adda951
chore(MASE): update error/catch boundary to v2
BlairCurrey Jan 19, 2024
3beabe9
feat(MASE): upgrade remix to v2
BlairCurrey Jan 19, 2024
3d115f3
fix(MASE): ts errors
BlairCurrey Jan 19, 2024
50d51c6
feat(MASE): add typecheck cmd to ci
BlairCurrey Jan 19, 2024
37f5fa8
fix(frontend, MASE): remix server start
BlairCurrey Jan 22, 2024
1a3bacb
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 22, 2024
32e29c1
fix(MASE): eslint
BlairCurrey Jan 22, 2024
29c4a24
refactor(MASE): parseQueryString to URLSearchParams
BlairCurrey Jan 22, 2024
9969315
Update .github/workflows/lint_test_build.yml
BlairCurrey Jan 23, 2024
0c660ae
fix(frontend,MASE): update entry.server request handlers
BlairCurrey Jan 23, 2024
8250581
chore(MASE): format
BlairCurrey Jan 23, 2024
41673bb
chore(MASE): rm unused quotes route
BlairCurrey Jan 23, 2024
f7149aa
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 24, 2024
632ad8c
Revert "Merge branch 'main' into bc/1464/remix-v2-updates"
BlairCurrey Jan 24, 2024
7a6ad8b
chore: cherry pick merge commit after reverting in f7149aa
BlairCurrey Jan 24, 2024
6b72997
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 24, 2024
fb4e5b7
fix(frontend,MASE): mobile view
BlairCurrey Jan 24, 2024
dab6502
fix(frontend): no flash on mobile
BlairCurrey Jan 24, 2024
2db091c
refactor: rework new cookie secure env var
BlairCurrey Jan 25, 2024
b35dc09
fix: move env var declaration from dockerfile to compose
BlairCurrey Jan 25, 2024
a51f877
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 25, 2024
58fb5e4
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 25, 2024
93c8318
feat(backend): upgrade Rafiki to open payments package v6.5 (#2337)
sabineschaller Jan 23, 2024
230d57e
chore(deps): update dependency autoprefixer to ^10.4.17 (#2352)
renovate[bot] Jan 23, 2024
e358d16
chore: update lockfile
BlairCurrey Jan 25, 2024
05f65f6
chore: rm extra space
BlairCurrey Jan 25, 2024
eaaee0e
chore: rm unnecessary eslint ignore
BlairCurrey Jan 25, 2024
455ebb8
Merge branch 'main' into bc/1464/remix-v2-updates
BlairCurrey Jan 25, 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 localenv/cloud-nine-wallet/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ services:
ports:
- '3030:80'
environment:
NODE_ENV: ${NODE_ENV:-development}
LOG_LEVEL: debug
PORT: 80
SEED_FILE_LOCATION: /workspace/seed.yml
Expand Down Expand Up @@ -115,6 +114,7 @@ services:
PORT: 3010
GRAPHQL_URL: http://cloud-nine-wallet-backend:3001/graphql
OPEN_PAYMENTS_URL: https://cloud-nine-wallet-backend/
ENABLE_INSECURE_MESSAGE_COOKIE: true
depends_on:
- cloud-nine-backend

Expand Down
2 changes: 1 addition & 1 deletion localenv/happy-life-bank/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ services:
ports:
- '3031:80'
environment:
NODE_ENV: development
LOG_LEVEL: debug
PORT: 80
SEED_FILE_LOCATION: /workspace/seed.yml
Expand Down Expand Up @@ -83,6 +82,7 @@ services:
PORT: 4010
GRAPHQL_URL: http://happy-life-bank-backend:3001/graphql
OPEN_PAYMENTS_URL: https://happy-life-bank-backend/
ENABLE_INSECURE_MESSAGE_COOKIE: true
depends_on:
- cloud-nine-admin
- happy-life-backend
Expand Down
2 changes: 1 addition & 1 deletion localenv/mock-account-servicing-entity/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ COPY --from=builder /home/rafiki/localenv/mock-account-servicing-entity/public .

WORKDIR /home/rafiki/localenv/mock-account-servicing-entity

CMD ["sh", "-c", "NODE_ENV=production ./node_modules/.bin/remix-serve ./build/index.js"]
CMD ["sh", "./node_modules/.bin/remix-serve", "./build/index.js"]
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default function handleRequest(
// Log streaming rendering errors from inside the shell. Don't log
// errors encountered during initial shell rendering since they'll
// reject and get logged in handleDocumentRequest.
if(shellRendered) {
if (shellRendered) {
console.error(error)
}
}
Expand Down
2 changes: 1 addition & 1 deletion localenv/mock-account-servicing-entity/app/root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
export const meta: MetaFunction = () => [
{ charset: 'utf-8' },
{ title: 'Mock Account Servicing Entity' },
{ viewport: 'width=device-width,initial-scale=1' }
{ name: 'viewport', content: 'width=device-width,initial-scale=1' }
]

export const links: LinksFunction = () => {
Expand Down
66 changes: 0 additions & 66 deletions localenv/mock-account-servicing-entity/app/routes/quotes.ts

This file was deleted.

154 changes: 151 additions & 3 deletions openapi/resource-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ servers:
- url: 'https://ilp.rafiki.money'
description: 'Server for wallet address subresources (ie https://ilp.rafiki.money/alice)'
- url: 'https://ilp.rafiki.money/.well-known/pay'
description: 'Server for when the wallet address has no pathname (ie https://ilp.rafiki.money)'
description: 'Server for when Payment Pointer has no pathname (ie https://ilp.rafiki.money)'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this an old version maybe?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think just need to remerge main in?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch... lost it on a reverted merge. will fix

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

tags:
- name: wallet-address
description: wallet address operations
Expand All @@ -42,6 +42,55 @@ tags:
- name: quote
description: quote operations
paths:
/:
get:
summary: Get a Wallet Address
tags:
- wallet-address
responses:
'200':
description: Wallet Address Found
content:
application/json:
schema:
$ref: '#/components/schemas/wallet-address'
examples:
Get wallet address for $ilp.rafiki.money/alice:
value:
id: 'https://ilp.rafiki.money/alice'
publicName: Alice
assetCode: USD
assetScale: 2
authServer: 'https://auth.rafiki.money'
'404':
description: Wallet Address Not Found
operationId: get-wallet-address
description: |-
Retrieve the public information of the Wallet Address.

This end-point should be open to anonymous requests as it allows clients to verify a Wallet Address URL and get the basic information required to construct new transactions and discover the grant request URL.

The content should be slow changing and cacheable for long periods. Servers SHOULD use cache control headers.
security: []
x-internal: false
/jwks.json:
get:
summary: Get the keys bound to a Wallet Address
tags:
- wallet-address
responses:
'200':
description: JWKS Document Found
content:
application/json:
schema:
$ref: '#/components/schemas/json-web-key-set'
examples: {}
'404':
description: JWKS Document Not Found
operationId: get-wallet-address-keys
description: Retrieve the public keys of the Wallet Address.
security: []
/incoming-payments:
post:
summary: Create an Incoming Payment
Expand Down Expand Up @@ -102,8 +151,6 @@ paths:
metadata:
type: object
description: Additional metadata associated with the incoming payment. (Optional)
required:
- walletAddress
examples:
Create incoming payment for $25 to pay invoice INV2022-02-0137:
value:
Expand Down Expand Up @@ -768,6 +815,62 @@ paths:
- $ref: '#/components/parameters/id'
components:
schemas:
wallet-address:
title: Wallet Address
type: object
description: A **wallet address** resource is the root of the API and contains the public details of the financial account represented by the Wallet Address that is also the service endpoint URL.
additionalProperties: true
examples:
- id: 'https://ilp.rafiki.money/alice'
publicName: Alice
assetCode: USD
assetScale: 2
authServer: 'https://auth.rafiki.money'
properties:
id:
type: string
format: uri
description: The URL identifying the wallet address.
readOnly: true
publicName:
type: string
description: A public name for the account. This should be set by the account holder with their provider to provide a hint to counterparties as to the identity of the account holder.
readOnly: true
assetCode:
$ref: ./schemas.yaml#/components/schemas/assetCode
assetScale:
$ref: ./schemas.yaml#/components/schemas/assetScale
authServer:
type: string
format: uri
description: The URL of the authorization server endpoint for getting grants and access tokens for this wallet address.
readOnly: true
required:
- id
- assetCode
- assetScale
- authServer
json-web-key-set:
title: JSON Web Key Set document
type: object
description: 'A JSON Web Key Set document according to [rfc7517](https://datatracker.ietf.org/doc/html/rfc7517) listing the keys associated with this wallet address. These keys are used to sign requests made by this wallet address.'
additionalProperties: false
properties:
keys:
type: array
items:
$ref: '#/components/schemas/json-web-key'
readOnly: true
required:
- keys
examples:
- keys:
- kid: key-1
alg: EdDSA
use: sig
kty: OKP
crv: Ed25519
x: 11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo
incoming-payment:
title: Incoming Payment
description: 'An **incoming payment** resource represents a payment that will be, is currently being, or has been received by the account.'
Expand Down Expand Up @@ -1082,6 +1185,51 @@ components:
- hasNextPage
- hasPreviousPage
additionalProperties: false
json-web-key:
type: object
properties:
kid:
type: string
alg:
type: string
description: 'The cryptographic algorithm family used with the key. The only allowed value is `EdDSA`. '
enum:
- EdDSA
use:
type: string
enum:
- sig
kty:
type: string
enum:
- OKP
crv:
type: string
enum:
- Ed25519
x:
type: string
pattern: '^[a-zA-Z0-9-_]+$'
description: The base64 url-encoded public key.
required:
- kid
- alg
- kty
- crv
- x
title: Ed25519 Public Key
description: A JWK representation of an Ed25519 Public Key
examples:
- kid: key-1
use: sig
kty: OKP
crv: Ed25519
x: 11qYAYKxCrfVS_7TyWQHOg7hcvPapiMlrwIaaPcHURo
- kid: '2022-09-02'
use: sig
kty: OKP
crv: Ed25519
x: oy0L_vTygNE4IogRyn_F5GmHXdqYVjIXkWs2jky7zsI
payment-method:
type: string
enum:
Expand Down
Loading
Loading