diff --git a/examples/3-minimal-with-verify/package.json b/examples/3-minimal-with-verify/package.json
index d33180a..e1dbda4 100644
--- a/examples/3-minimal-with-verify/package.json
+++ b/examples/3-minimal-with-verify/package.json
@@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@code-wallet/client": "^1.0.0",
+ "@code-wallet/client": "^1.3.1",
"body-parser": "^1.20.2",
"ejs": "^3.1.9",
"express": "^4.18.2"
diff --git a/examples/4-minimal-with-webhook/package.json b/examples/4-minimal-with-webhook/package.json
index 734a0d1..b234dc7 100644
--- a/examples/4-minimal-with-webhook/package.json
+++ b/examples/4-minimal-with-webhook/package.json
@@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@code-wallet/client": "^1.0.0",
+ "@code-wallet/client": "^1.3.1",
"body-parser": "^1.20.2",
"ejs": "^3.1.9",
"express": "^4.18.2"
diff --git a/examples/5-example-purchase-flow/package.json b/examples/5-example-purchase-flow/package.json
index 0bf4308..f5bbda9 100644
--- a/examples/5-example-purchase-flow/package.json
+++ b/examples/5-example-purchase-flow/package.json
@@ -11,8 +11,8 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@code-wallet/client": "^1.0.0",
- "@code-wallet/library": "^1.0.0",
+ "@code-wallet/client": "^2.0.2",
+ "@code-wallet/library": "^1.3.1",
"@markdoc/markdoc": "^0.3.2",
"body-parser": "^1.20.2",
"dotenv": "^16.3.1",
diff --git a/examples/6-minimal-with-login/package.json b/examples/6-minimal-purchase-with-login/package.json
similarity index 92%
rename from examples/6-minimal-with-login/package.json
rename to examples/6-minimal-purchase-with-login/package.json
index 6250a90..7fae19d 100644
--- a/examples/6-minimal-with-login/package.json
+++ b/examples/6-minimal-purchase-with-login/package.json
@@ -11,7 +11,7 @@
"author": "",
"license": "ISC",
"dependencies": {
- "@code-wallet/client": "^1.1.2",
+ "@code-wallet/client": "^1.3.1",
"body-parser": "^1.20.2",
"ejs": "^3.1.9",
"express": "^4.18.2"
diff --git a/examples/6-minimal-with-login/server.js b/examples/6-minimal-purchase-with-login/server.js
similarity index 85%
rename from examples/6-minimal-with-login/server.js
rename to examples/6-minimal-purchase-with-login/server.js
index fddce0a..dce5cb5 100644
--- a/examples/6-minimal-with-login/server.js
+++ b/examples/6-minimal-purchase-with-login/server.js
@@ -20,11 +20,17 @@ app.get('/success/:id', async (req, res) => {
// Get the payment intent id from the URL
const intent = req.params.id;
- // Get the status of the payment intent and the user's public key
- const status = await code.paymentIntents.getStatus({ intent });
+ try {
+ // Get the status of the payment intent
+ const status = await code.getStatus({ intent });
+ const user = await code.getUserId({ intent, verifier });
- // Render the success page with the intent id and status
- res.render('success', { intent, status });
+ // Render the success page with the intent id and status
+ res.render('success', { intent, status, user });
+ } catch (e) {
+ console.log('error', e);
+ res.json({ error: e.message });
+ }
});
// This is a JSON file that Code will look for when verifying your domain. It
@@ -64,6 +70,7 @@ app.post('/create-intent', async (req, res) => {
res.send({ clientSecret });
});
+
app.listen(port, () => {
console.log(`🚀 Minimal example listening on port ${port}`)
console.log(`http://localhost:${port}`)
diff --git a/examples/6-minimal-with-login/views/index.ejs b/examples/6-minimal-purchase-with-login/views/index.ejs
similarity index 87%
rename from examples/6-minimal-with-login/views/index.ejs
rename to examples/6-minimal-purchase-with-login/views/index.ejs
index 271aa29..38a9503 100644
--- a/examples/6-minimal-with-login/views/index.ejs
+++ b/examples/6-minimal-purchase-with-login/views/index.ejs
@@ -4,7 +4,7 @@
- Code SDK - Example/6-minimal-with-login
+ Code SDK - Example/6-minimal-purchase-with-login
@@ -16,6 +16,7 @@
const hostname = window.location.protocol + "//" + window.location.host;
const { button } = code.elements.create('button', {
+ mode: 'payment',
currency: 'usd',
destination: 'E8otxw1CVX9bfyddKu3ZB3BVLa4VVF9J7CTPdnUwT9jR',
amount: 0.05,
@@ -29,7 +30,7 @@
// Wait for the button to be clicked
button.on('invoke', async () => {
- // Get a payment intent from our own server
+ // Get a payment intent clientSecret value from server.js
const res = await fetch('/create-intent', { method: 'POST' });
const { clientSecret } = await res.json();
diff --git a/examples/6-minimal-purchase-with-login/views/success.ejs b/examples/6-minimal-purchase-with-login/views/success.ejs
new file mode 100644
index 0000000..fbb3a16
--- /dev/null
+++ b/examples/6-minimal-purchase-with-login/views/success.ejs
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+ Code SDK - Example/6-minimal-purchase-with-login
+
+
+
+ Intent Id: <%= intent %>
+ Status:
<%= JSON.stringify(status, null, 2) %>
User:
<%= JSON.stringify(user, null, 2) %>
Payment Intent
Intent Id: <%= intent %>
Status:
<%= JSON.stringify(status, null, 2) %>
User:
<%= JSON.stringify(user, null, 2) %>
, M extends keyof S['methods']>(
+ service: S,
+ methodName: M & string,
+ request: proto.Request,
+ ): Promise> {
+
+ const serviceName = this.getServiceName(service);
+ const { encode, decode, send } = this.useService(service.methods[methodName]);
+
+ const payload = encode(request);
+ const req = new proto.Common.Request({
+ service: serviceName,
+ method: methodName,
+ body: payload,
+ });
+
+ const envelope = await send(req.toBinary());
+ const res = decode(envelope.body);
+ return res;
+ }
+}
+
+export {
+ Client,
+}
\ No newline at end of file
diff --git a/packages/client/src/connection.ts b/packages/client/src/connection.ts
deleted file mode 100644
index 68e49f7..0000000
--- a/packages/client/src/connection.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import {
- ErrUnexpectedError,
- ErrUnexpectedHttpStatus,
- ErrUnexpectedServerError
-} from "./errors";
-
-/**
- * Represents a connection to an endpoint with methods to perform HTTP requests.
- */
-class Connection {
- endpoint: string;
- fetch: any;
-
- /**
- * Initializes a new connection to the provided endpoint.
- *
- * @param endpoint - The URL of the endpoint to connect to.
- * @param fetch - Optional fetch function. Defaults to global fetch.
- */
- constructor(endpoint: string, fetch: Function = globalThis.fetch) {
- // The Fetch API is supported experimentally in Node 17.5+ and natively in Node 18+.
- this.endpoint = endpoint;
-
- // Ensure that the fetch function is called with the right context and
- // doesn't trigger "Illegal invocation".
- this.fetch = (...args: any) => fetch.apply(globalThis, args);
- }
-
- /**
- * Performs an HTTP GET request to the specified method with provided parameters.
- *
- * @param method - The API method to call.
- * @param params - The parameters for the method.
- * @returns The response JSON object on success.
- * @throws Will throw an error if the HTTP status is not 200 or if the server returns an error.
- */
- async get(method: string, params: any) {
- const url = `${this.endpoint}/${method}?${new URLSearchParams(params)}`;
-
- const req = await this.fetch(url, {
- method: 'GET',
- headers: { 'Content-Type': 'application/json' }
- });
-
- if (req.status !== 200) {
- const msg = await req.text();
- throw ErrUnexpectedHttpStatus(req.status, msg);
- }
-
- const json = await req.json();
- if (json.error) {
- throw ErrUnexpectedServerError(json.error);
- }
-
- if (json.success) {
- return json;
- }
-
- console.error(json);
- throw ErrUnexpectedError();
- }
-
- /**
- * Performs an HTTP POST request to the specified method with provided body data.
- *
- * @param method - The API method to call.
- * @param body - The data to be sent in the request body.
- * @returns `true` on success.
- * @throws Will throw an error if the HTTP status is not 200 or if the server returns an error.
- */
- async post(method: string, body: any) {
- const url = `${this.endpoint}/${method}`;
-
- const req = await this.fetch(url, {
- method: 'POST',
- body: JSON.stringify(body),
- headers: { 'Content-Type': 'application/json' }
- });
-
- if (req.status !== 200) {
- const msg = await req.text();
- throw ErrUnexpectedHttpStatus(req.status, msg);
- }
-
- const json = await req.json();
- if (json.error) {
- throw ErrUnexpectedServerError(json.error);
- }
-
- if (json.success) {
- return true;
- }
-
- console.error(json);
- throw ErrUnexpectedError();
- }
-}
-
-export {
- Connection,
-}
\ No newline at end of file
diff --git a/packages/client/src/errors.ts b/packages/client/src/errors.ts
index 438400f..5b2a44c 100644
--- a/packages/client/src/errors.ts
+++ b/packages/client/src/errors.ts
@@ -1,9 +1,13 @@
const ErrUnexpectedError = () => new Error("unexpected error");
-const ErrUnexpectedHttpStatus = (val: any, msg: any) => new Error(`unexpected HTTP status: ${val}, ${msg}`);
-const ErrUnexpectedServerError = (val: any) => new Error(`unexpected server error: ${val}`);
+const ErrNetworkError = (error: any) => new Error(`Network error ${error}`);
+const ErrInvalidResponse = (status:number) => new Error(`Request failed with status code ${status}`);
+const ErrIntentIdRequired = () => new Error("intent ID is required");
+const ErrSignerRequired = () => new Error("signer is required");
export {
ErrUnexpectedError,
- ErrUnexpectedHttpStatus,
- ErrUnexpectedServerError,
+ ErrIntentIdRequired,
+ ErrSignerRequired,
+ ErrNetworkError,
+ ErrInvalidResponse,
};
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 5f18e50..f7e3ca6 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,2 +1,2 @@
export * from './intents';
-export * from './connection';
\ No newline at end of file
+export * from './client';
\ No newline at end of file
diff --git a/packages/client/src/intents.ts b/packages/client/src/intents.ts
deleted file mode 100644
index ccac236..0000000
--- a/packages/client/src/intents.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import bs58 from "bs58";
-import { Buffer } from "buffer";
-import {
- IntentOptions,
- PaymentRequestIntent,
- PaymentRequestWithLoginIntent,
- PaymentRequestOptions,
- LoginRequestOptions,
- WebhookParams,
- Intent,
-} from "@code-wallet/library";
-import { Connection } from "./connection";
-
-const api = 'https://api.getcode.com/v1';
-const client = new Connection(api);
-
-/**
- * Enumeration representing the possible states of a Payment Intent.
- */
-enum PaymentIntentState {
- Pending = 'pending',
- Confirmed = 'confirmed',
-}
-
-type CreatePaymentIntentOptions = PaymentRequestOptions &
- IntentOptions &
- Partial &
- Partial;
-
-type GetStatusForIntentOptions = { intent: string };
-
-interface IntentStatus {
- status: PaymentIntentState,
- user: string | undefined,
-}
-
-/**
- * Collection of methods related to handling payment intents.
- */
-const paymentIntents = {
- /**
- * Creates a new payment intent.
- *
- * @param obj - The options for creating a payment intent.
- * @returns An object containing the client secret and intent ID.
- * @throws Will throw an error if unable to create the intent.
- */
- create: async (obj: CreatePaymentIntentOptions) => {
- obj.mode = 'payment';
-
- let intent : Intent;
- if (obj.login) {
- intent = new PaymentRequestWithLoginIntent(obj);
- } else {
- intent = new PaymentRequestIntent(obj);
- }
-
- const envelope = intent.sign();
- const body = {
- intent: envelope.intent,
- message: Buffer.from(envelope.message).toString('base64url'),
- signature: bs58.encode(envelope.signature),
- webhook: intent.options.webhook?.url,
- }
-
- await client.post('createIntent', body);
-
- return {
- clientSecret: intent.getClientSecret(),
- id: intent.getIntentId(),
- }
- },
-
- /**
- * Retrieves the status of a specified payment intent.
- *
- * @param obj - The options containing the intent ID to check status for.
- * @returns An object representing the intent's status.
- * @throws Will throw an error if unable to retrieve the intent's status.
- */
- getStatus: async (obj: GetStatusForIntentOptions) : Promise => {
- const res = await client.get('getStatus', { intent: obj.intent });
-
- let status = PaymentIntentState.Pending;
- if (res.status === 'SUBMITTED') {
- status = PaymentIntentState.Confirmed;
- }
-
- return { status, user: res.user };
- }
-}
-
-export {
- paymentIntents,
-}
\ No newline at end of file
diff --git a/packages/client/src/intents/index.ts b/packages/client/src/intents/index.ts
new file mode 100644
index 0000000..f5b2d38
--- /dev/null
+++ b/packages/client/src/intents/index.ts
@@ -0,0 +1,13 @@
+import { loginIntents } from './login';
+import { paymentIntents } from './payments';
+
+const getStatus = paymentIntents.getStatus;
+const getUserId = loginIntents.getUserId;
+
+export {
+ getStatus,
+ getUserId,
+
+ paymentIntents,
+ loginIntents,
+};
\ No newline at end of file
diff --git a/packages/client/src/intents/login.ts b/packages/client/src/intents/login.ts
new file mode 100644
index 0000000..ae3c652
--- /dev/null
+++ b/packages/client/src/intents/login.ts
@@ -0,0 +1,86 @@
+import {
+ IntentOptions,
+ IntentSigners,
+ LoginRequestOptions,
+ WebhookParams,
+ LoginRequestIntent,
+} from "@code-wallet/library";
+
+import { useClient } from "../utils/useClient";
+import { createIntent } from "../utils/createIntent";
+import {
+ GetStatusForIntentRequest,
+ GetStatusForIntentOptions,
+} from "../requests/getStatus";
+
+import { GetUserIdOptions, GetUserIdRequest } from "../requests/getUserId";
+import { ClientOptions } from "../client";
+
+/**
+ * Options for creating a login intent.
+ *
+ * Login attempts require a verifier, which is a public key that is used to
+ * verify the ownership of a domain. The verifier public key must be provided by
+ * the domain at the root level inside the /.well-known/code-payments.json file.
+ *
+ * Any intent can optionally be configured with a webhook. If a webhook is
+ * provided, the intent details will be sent to the webhook after it is
+ * confirmed.
+ */
+type CreateLoginIntentOptions = LoginRequestOptions &
+ IntentOptions &
+ IntentSigners &
+ Partial;
+
+/**
+ * Collection of methods related to handling payment intents.
+ */
+const loginIntents = {
+
+ /**
+ * Creates a new login intent.
+ *
+ * @param opt - The options for creating a login intent.
+ * @returns An object containing the client secret and intent ID.
+ * @throws Will throw an error if unable to create the intent.
+ **/
+ create: async (opt: CreateLoginIntentOptions & ClientOptions) => {
+ const client = useClient(opt);
+ const intent = new LoginRequestIntent(opt);
+
+ return await createIntent(intent, client);
+ },
+
+ /**
+ * Retrieves the status of a specified payment intent.
+ *
+ * @param opt - The options containing the intent ID to check status for.
+ * @returns An object representing the intent's status.
+ * @throws Will throw an error if unable to retrieve the intent's status.
+ */
+ getStatus: async (opt: GetStatusForIntentOptions & ClientOptions) => {
+ const client = useClient(opt);
+
+ const req = new GetStatusForIntentRequest(opt);
+ return await req.send(client);
+ },
+
+ /**
+ * Retrieves the user ID associated with a login intent.
+ *
+ * @param opt - The options containing the intent ID and verifier to retrieve the user ID for.
+ * @returns An object containing the user ID if the verifier is valid and the intent is confirmed.
+ * @throws Will throw an error if unable to retrieve the user ID for the specified intent.
+ */
+ getUserId: async (opt: GetUserIdOptions & ClientOptions) => {
+ const client = useClient(opt);
+
+ const req = new GetUserIdRequest(opt);
+ return await req.send(client);
+ }
+}
+
+
+export {
+ loginIntents,
+}
diff --git a/packages/client/src/intents/payments.ts b/packages/client/src/intents/payments.ts
new file mode 100644
index 0000000..422812a
--- /dev/null
+++ b/packages/client/src/intents/payments.ts
@@ -0,0 +1,79 @@
+import {
+ IntentOptions,
+ IntentSigners,
+ PaymentRequestIntent,
+ PaymentRequestWithLoginIntent,
+ PaymentRequestOptions,
+ LoginRequestOptions,
+ WebhookParams,
+ Intent,
+} from "@code-wallet/library";
+
+import { useClient } from "../utils/useClient";
+import { createIntent } from "../utils/createIntent";
+import {
+ GetStatusForIntentRequest,
+ GetStatusForIntentOptions
+} from "../requests/getStatus";
+import { ClientOptions } from "../client";
+
+/**
+ * Options for creating a payment intent.
+ *
+ * Payments can optionally be made with a login request. If a login request is
+ * provided, the user id can be retrieved from the intent after it is confirmed.
+ *
+ * Any intent can optionally be configured with a webhook. If a webhook is
+ * provided, the intent details will be sent to the webhook after it is
+ * confirmed.
+ */
+type CreatePaymentIntentOptions = PaymentRequestOptions &
+ IntentOptions &
+ Partial &
+ Partial &
+ Partial &
+ Partial;
+
+/**
+ * Collection of methods related to handling payment intents.
+ */
+const paymentIntents = {
+
+ /**
+ * Creates a new payment intent.
+ *
+ * @param opt - The options for creating a payment intent.
+ * @returns An object containing the client secret and intent ID.
+ * @throws Will throw an error if unable to create the intent.
+ */
+ create: async (opt: CreatePaymentIntentOptions & ClientOptions) => {
+ const connection = useClient(opt);
+
+ let intent : Intent;
+ if (opt.login) {
+ intent = new PaymentRequestWithLoginIntent(opt);
+ } else {
+ intent = new PaymentRequestIntent(opt);
+ }
+
+ return await createIntent(intent, connection);
+ },
+
+ /**
+ * Retrieves the status of a specified payment intent.
+ *
+ * @param opt - The options containing the intent ID to check status for.
+ * @returns An object representing the intent's status.
+ * @throws Will throw an error if unable to retrieve the intent's status.
+ */
+ getStatus: async (opt: GetStatusForIntentOptions & ClientOptions) => {
+ const connection = useClient(opt);
+
+ const req = new GetStatusForIntentRequest(opt);
+ return await req.send(connection);
+ }
+}
+
+export {
+ paymentIntents,
+}
diff --git a/packages/client/src/request.ts b/packages/client/src/request.ts
new file mode 100644
index 0000000..40c7cb2
--- /dev/null
+++ b/packages/client/src/request.ts
@@ -0,0 +1,37 @@
+import * as proto from '@code-wallet/rpc';
+import { Client } from './client';
+
+/**
+ * An interface for making a request to the Code Sequencer. Most requests
+ * require a signed proto message, this provides a common interface.
+ */
+export interface CodeRequest {
+ /**
+ * Validate the details of this request, and throw an error if they're invalid.
+ */
+ validate(): void;
+
+ /**
+ * Serialize this request into a minimal message for sending to the Code Sequencer.
+ */
+ toProto(): proto.AnyMessage;
+
+ /**
+ * Sign this request with the given signers.
+ *
+ * @returns A signature for this request
+ */
+ sign(): {
+ envelope: proto.AnyMessage;
+ signedBytes: Uint8Array;
+ signature: Uint8Array;
+ } | undefined;
+
+ /**
+ * Submit this request to the Code Sequencer.
+ *
+ * @param client - The connection to the Code Sequencer.
+ */
+ send(client: Client): Promise;
+}
+
\ No newline at end of file
diff --git a/packages/client/src/requests/getStatus.ts b/packages/client/src/requests/getStatus.ts
new file mode 100644
index 0000000..9d77781
--- /dev/null
+++ b/packages/client/src/requests/getStatus.ts
@@ -0,0 +1,85 @@
+import * as proto from "@code-wallet/rpc";
+import { PublicKey, } from "@code-wallet/library";
+import { CodeRequest } from "../request";
+import { Client } from "../client";
+
+/**
+ * Enumeration representing the possible states of a Payment Intent.
+ */
+export enum IntentState {
+ Pending = 'pending',
+ Confirmed = 'confirmed',
+}
+
+export interface IntentStatus {
+ status: IntentState,
+ exists: boolean,
+ intentSubmitted: boolean,
+ codeScanned: boolean,
+}
+
+export type GetStatusForIntentOptions = {
+ intent: string,
+};
+
+/**
+ * GetStatusForIntent is a request to retrieve the status of a specified intent.
+ *
+ * This is useful in the case that a browser or client fails to let your server
+ * know about the success of an intent. A webhook is recommended but you can use
+ * this in lieu of one.
+ *
+ * @throws Will throw an error if the intent ID is not provided.
+ */
+class GetStatusForIntentRequest implements CodeRequest {
+ readonly intentId : string;
+
+ constructor(opts: GetStatusForIntentOptions) {
+ this.intentId = opts.intent;
+ this.validate();
+ }
+
+ validate() {
+ if (!this.intentId) {
+ throw new Error('Intent ID is required');
+ }
+ }
+
+ toProto() {
+ const intentId = PublicKey.fromBase58(this.intentId);
+
+ return new proto.GetStatusRequest({
+ intentId: {
+ value: intentId.toBuffer(),
+ },
+ });
+ }
+
+ sign() {
+ // This request doesn't need to be signed.
+ return undefined;
+ }
+
+ async send(client: Client) : Promise {
+ const res = await client.send(proto.MicroPayment, 'getStatus', this.toProto());
+
+ let status = IntentState.Pending;
+ if (res.intentSubmitted) {
+ status = IntentState.Confirmed;
+ }
+
+ const { exists, codeScanned, intentSubmitted } = res;
+
+ return {
+ status,
+ exists,
+ codeScanned,
+ intentSubmitted,
+ };
+ }
+}
+
+
+export {
+ GetStatusForIntentRequest,
+}
\ No newline at end of file
diff --git a/packages/client/src/requests/getUserId.ts b/packages/client/src/requests/getUserId.ts
new file mode 100644
index 0000000..da61241
--- /dev/null
+++ b/packages/client/src/requests/getUserId.ts
@@ -0,0 +1,91 @@
+import * as proto from "@code-wallet/rpc";
+import { Keypair, PublicKey, } from "@code-wallet/library";
+import { CodeRequest, } from "../request";
+import { Client } from "../client";
+import { ErrSignerRequired } from "../errors";
+
+export type GetUserIdOptions = {
+ intent: string,
+ verifier: Keypair,
+};
+
+export type GetUserIdResponse = {
+ userId: string | undefined,
+};
+
+/**
+ * GetUserId is a request to retrieve the user ID associated with a third party
+ * app after a login intent has been confirmed.
+ *
+ * @throws Will throw an error if the intent ID is not provided.
+ */
+class GetUserIdRequest implements CodeRequest {
+ readonly intentId : string;
+ readonly signer : Keypair;
+
+ constructor(opts: GetUserIdOptions) {
+ this.intentId = opts.intent;
+ this.signer = opts.verifier;
+
+ this.validate();
+ }
+
+ validate() {
+ if (!this.intentId) {
+ return ErrSignerRequired();
+ }
+ if (!this.signer || !this.signer.sign) {
+ return ErrSignerRequired();
+ }
+ }
+
+ toProto() {
+ const intentId = PublicKey.fromBase58(this.intentId);
+ const verifier = this.signer.getPublicKey();
+
+ return new proto.GetLoginForThirdPartyAppRequest({
+ intentId: {
+ value: intentId.toBuffer(),
+ },
+ verifier: {
+ value: verifier.toBuffer(),
+ }
+ });
+ }
+
+ sign() {
+ const msg = this.toProto();
+ const sig = this.signer.sign(msg.toBinary());
+
+ // Add the signature to the message.
+ msg.signature = new proto.Common.Signature({
+ value: sig,
+ });
+
+ return {
+ envelope: msg,
+ signedBytes: msg.toBinary(),
+ signature: sig,
+ }
+ }
+
+ async send(client: Client) {
+ const { envelope } = this.sign();
+ const res = await client.send(proto.Identity, 'getLoginForThirdPartyApp', envelope);
+
+ let userId : string | undefined;
+ if (res.userId) {
+ const user = new PublicKey(res.userId.value);
+ userId = user.toBase58();
+ }
+
+ return {
+ userId,
+ };
+ }
+}
+
+
+export {
+ GetUserIdRequest,
+}
diff --git a/packages/client/src/requests/index.ts b/packages/client/src/requests/index.ts
new file mode 100644
index 0000000..e69de29
diff --git a/packages/client/src/utils/createIntent.ts b/packages/client/src/utils/createIntent.ts
new file mode 100644
index 0000000..8e29041
--- /dev/null
+++ b/packages/client/src/utils/createIntent.ts
@@ -0,0 +1,22 @@
+import { Client } from "../client";
+import { Intent, } from "@code-wallet/library";
+import * as proto from "@code-wallet/rpc";
+import { ErrUnexpectedError } from "../errors";
+
+async function createIntent(intent: Intent, client: Client) {
+ const msg = await intent.getSendMessageRequestProto()
+ const res = await client.send(proto.Messaging, 'sendMessage', msg);
+
+ if (res.result !== proto.SendMessageResponse_Result.OK) {
+ ErrUnexpectedError();
+ }
+
+ return {
+ clientSecret: intent.getClientSecret(),
+ id: intent.getIntentId(),
+ };
+}
+
+export {
+ createIntent,
+}
diff --git a/packages/client/src/utils/useClient.ts b/packages/client/src/utils/useClient.ts
new file mode 100644
index 0000000..239e2e9
--- /dev/null
+++ b/packages/client/src/utils/useClient.ts
@@ -0,0 +1,9 @@
+import { Client, ClientOptions } from "../client";
+
+const defaultEndpoint = 'https://cash.getcode.com/v1';
+
+export function useClient(opt: ClientOptions = {}) : Client {
+ const endpoint = opt.endpoint ?? defaultEndpoint;
+
+ return new Client(endpoint, opt.fetch);
+}
\ No newline at end of file
diff --git a/packages/client/test/client.test.ts b/packages/client/test/client.test.ts
new file mode 100644
index 0000000..c9500fe
--- /dev/null
+++ b/packages/client/test/client.test.ts
@@ -0,0 +1,54 @@
+import * as proto from "@code-wallet/rpc";
+import * as client from "../src/";
+
+import { Client } from "../src/";
+import { PublicKey } from "@code-wallet/library";
+import { expect } from 'chai';
+
+describe('Low level client', () => {
+
+ it('test low level getStatus api message', async () => {
+ const intentId = PublicKey.fromBase58('9sK9x3MC7yEMzfA5VRRcu2P72gCGGsF1htpeAMXae9bz')
+ const msg = new proto.GetStatusRequest({
+ intentId: {
+ value: intentId.toBuffer(),
+ }
+ })
+
+ const api = new Client('https://cash.getcode.com/v1');
+ const res = await api.send(proto.MicroPayment, 'getStatus', msg);
+
+ expect(res).to.not.be.undefined;
+ expect(res.exists).to.be.true;
+ expect(res.codeScanned).to.be.true;
+ expect(res.intentSubmitted).to.be.true;
+ });
+});
+
+describe('High level client', () => {
+
+ it('test high level getStatus api message', async () => {
+ const res = await client.getStatus({
+ intent: '9sK9x3MC7yEMzfA5VRRcu2P72gCGGsF1htpeAMXae9bz',
+ });
+
+ expect(res).to.not.be.undefined;
+ expect(res.exists).to.be.true;
+ expect(res.codeScanned).to.be.true;
+ expect(res.intentSubmitted).to.be.true;
+ });
+
+ it('test high level create payment intent api message', async () => {
+ const res = await client.paymentIntents.create({
+ mode: 'payment',
+ amount: 100,
+ currency: 'usd',
+ destination: '9sK9x3MC7yEMzfA5VRRcu2P72gCGGsF1htpeAMXae9bz',
+ });
+
+ expect(res).to.not.be.undefined;
+ expect(res.clientSecret).to.not.be.undefined;
+ expect(res.id).to.not.be.undefined;
+ });
+
+});
\ No newline at end of file
diff --git a/packages/elements/package.json b/packages/elements/package.json
index 308086a..83e0be7 100644
--- a/packages/elements/package.json
+++ b/packages/elements/package.json
@@ -1,6 +1,6 @@
{
"name": "@code-wallet/elements",
- "version": "1.1.3",
+ "version": "1.3.1",
"license": "MIT",
"repository": {
"type": "git",
@@ -25,10 +25,10 @@
"maintained node versions"
],
"dependencies": {
- "@code-wallet/events": "^1.0.0",
- "@code-wallet/library": "^1.0.4",
- "@code-wallet/client": "^1.0.4",
- "@code-wallet/rpc": "^1.0.0",
+ "@code-wallet/events": "^1.3.1",
+ "@code-wallet/library": "^1.3.1",
+ "@code-wallet/client": "^1.3.1",
+ "@code-wallet/rpc": "^1.3.1",
"@headlessui/vue": "^1.7.7",
"@heroicons/vue": "^2.0.16"
},
diff --git a/packages/elements/src/components/elements/PaymentRequestButton.vue b/packages/elements/src/components/elements/IntentRequestButton.vue
similarity index 93%
rename from packages/elements/src/components/elements/PaymentRequestButton.vue
rename to packages/elements/src/components/elements/IntentRequestButton.vue
index bea5cd0..53c9fef 100644
--- a/packages/elements/src/components/elements/PaymentRequestButton.vue
+++ b/packages/elements/src/components/elements/IntentRequestButton.vue
@@ -6,6 +6,7 @@
const config = useConfig();
const options = inject('options');
+ const mode = options?.mode ?? 'payment';
const emit = defineEmits<{
resize: [{ width: number, height: number }];
@@ -13,7 +14,10 @@
}>();
const channel = new EventChannel();
- const url = `${config.codeSdk()}/payment-request-button/#/${channel.id}/p=${encode(options)}`;
+ const url = `${config.codeSdk()}/${mode}-request-button/#/${channel.id}/p=${encode(options)}`;
+
+ console.log('url', url);
+
const el = ref(null);
const frameWidth = ref(0);
const frameHeight = ref(0);
diff --git a/packages/elements/src/components/elements/PaymentRequestModalDesktop.vue b/packages/elements/src/components/elements/IntentRequestModalDesktop.vue
similarity index 95%
rename from packages/elements/src/components/elements/PaymentRequestModalDesktop.vue
rename to packages/elements/src/components/elements/IntentRequestModalDesktop.vue
index 20c1481..a9311b0 100644
--- a/packages/elements/src/components/elements/PaymentRequestModalDesktop.vue
+++ b/packages/elements/src/components/elements/IntentRequestModalDesktop.vue
@@ -6,6 +6,7 @@
const config = useConfig();
const options = inject('options');
+ const mode = options?.mode ?? 'payment';
const emit = defineEmits([
'codeScanned',
@@ -18,9 +19,11 @@
]);
const channel = new EventChannel();
- const url = `${config.codeSdk()}/payment-request-modal-desktop/#/${channel.id}/p=${encode(options)}`;
+ const url = `${config.codeSdk()}/${mode}-request-modal-desktop/#/${channel.id}/p=${encode(options)}`;
const el = ref(null);
+ console.log('url', url);
+
channel.on('codeScanned' , () => {
emit('codeScanned');
});
diff --git a/packages/elements/src/components/elements/PaymentRequestModalMobile.vue b/packages/elements/src/components/elements/IntentRequestModalMobile.vue
similarity index 96%
rename from packages/elements/src/components/elements/PaymentRequestModalMobile.vue
rename to packages/elements/src/components/elements/IntentRequestModalMobile.vue
index c893393..e4618ec 100644
--- a/packages/elements/src/components/elements/PaymentRequestModalMobile.vue
+++ b/packages/elements/src/components/elements/IntentRequestModalMobile.vue
@@ -6,6 +6,7 @@
const config = useConfig();
const options = inject('options');
+ const mode = options?.mode ?? 'payment';
const emit = defineEmits([
'codeScanned',
@@ -18,7 +19,7 @@
]);
const channel = new EventChannel();
- const url = `${config.codeSdk()}/payment-request-modal-mobile/#/${channel.id}/p=${encode(options)}`;
+ const url = `${config.codeSdk()}/${mode}-request-modal-mobile/#/${channel.id}/p=${encode(options)}`;
const el = ref(null);
channel.on('codeScanned' , () => {
diff --git a/packages/elements/src/components/elements/index.ts b/packages/elements/src/components/elements/index.ts
index 8f722e3..45b4c03 100644
--- a/packages/elements/src/components/elements/index.ts
+++ b/packages/elements/src/components/elements/index.ts
@@ -1,3 +1,3 @@
-export { default as PaymentRequestButton } from './PaymentRequestButton.vue'
-export { default as PaymentRequestModalDesktop } from './PaymentRequestModalDesktop.vue'
-export { default as PaymentRequestModalMobile } from './PaymentRequestModalMobile.vue'
\ No newline at end of file
+export { default as IntentRequestButton } from './IntentRequestButton.vue'
+export { default as IntentRequestModalDesktop } from './IntentRequestModalDesktop.vue'
+export { default as IntentRequestModalMobile } from './IntentRequestModalMobile.vue'
\ No newline at end of file
diff --git a/packages/elements/src/components/flows/ButtonFlow.vue b/packages/elements/src/components/flows/ButtonFlow.vue
index fea15c0..cec4ddd 100644
--- a/packages/elements/src/components/flows/ButtonFlow.vue
+++ b/packages/elements/src/components/flows/ButtonFlow.vue
@@ -1,17 +1,17 @@