Skip to content

[STR-252] Email verification should not wait #38

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

Merged
frostbournesb merged 2 commits into from
Apr 27, 2023
Merged

[STR-252] Email verification should not wait #38

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
a0b992c
Update ver to v0.2.1, update deps, %APP_VER% var
frostbournesb Apr 20, 2023
7d487d1
check verif status on interval
frostbournesb Apr 25, 2023
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
1 change: 1 addition & 0 deletions .eslintignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ node_modules
.env
.env.*
!.env.example
/dist

# Ignore files for PNPM, NPM and YARN
pnpm-lock.yaml
Expand Down
20 changes: 9 additions & 11 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@stringpay/sdk",
"version": "0.2.0",
"version": "0.2.1",
"license": "UNLICENSED",
"main": "./src/lib/index.ts",
"types": "dist/index.d.ts",
Expand Down Expand Up @@ -28,9 +28,8 @@
"@rollup/plugin-node-resolve": "^15.0.1",
"@rollup/plugin-replace": "^5.0.0",
"@rollup/plugin-typescript": "^9.0.2",
"@sveltejs/adapter-node": "^1.0.0-next.96",
"@sveltejs/kit": "next",
"@sveltejs/package": "next",
"@sveltejs/adapter-node": "^1.2.3",
"@sveltejs/kit": "^1.15.7",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/svelte": "^3.2.2",
"@typescript-eslint/eslint-plugin": "^5.27.0",
Expand All @@ -50,13 +49,12 @@
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-dotenv": "^0.4.0",
"rollup-plugin-terser": "^7.0.2",
"svelte": "^3.44.0",
"svelte-check": "^2.7.1",
"svelte-preprocess": "^4.10.6",
"tslib": "^2.3.1",
"typescript": "^4.7.4",
"vite": "^3.1.8",
"vitest": "^0.24.3"
"svelte": "^3.58.0",
"svelte-check": "^3.2.0",
"svelte-preprocess": "^5.0.3",
"typescript": "^5.0.4",
"vite": "^4.3.1",
"vitest": "^0.30.1"
},
"type": "module",
"dependencies": {}
Expand Down
2 changes: 1 addition & 1 deletion src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>String SDK Test</title>
<script src="../dist/stringpay-v0.2.0.min.js"></script>
<script src="../dist/stringpay-%APP_VER%.min.js"></script>
%sveltekit.head%
</head>
<body>
Expand Down
8 changes: 8 additions & 0 deletions src/hooks.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { version } from '$app/environment'
import type { Handle } from '@sveltejs/kit';

export const handle: Handle = (async ({ event, resolve }) => {
return resolve(event, {
transformPageChunk: ({ html }) => html.replace('%APP_VER%', `v${version}`)
});
});
1 change: 0 additions & 1 deletion src/lib/services/apiClient.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export function createApiClient({ baseUrl, apiKey }: ApiClientOptions): ApiClien
const request = () =>
httpClient.get(`/users/${userId}/verify-email`, {
params: { email },
// timeout: 15 * 60 * 1000 // 15 minutes
});

await authInterceptor(request);
Expand Down
11 changes: 8 additions & 3 deletions src/lib/services/events.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,10 +176,15 @@ export function createEventsService(iframeUrl: string, authService: AuthService,

try {
const data = <{ userId: string; email: string }>event.data;

await apiClient.requestEmailVerification(data.userId, data.email);
sendEvent(frame, Events.RECEIVE_EMAIL_VERIFICATION, {
status: "email_verified",
});
const check = setInterval(async () => {
const { status } = await apiClient.getUserStatus(data.userId);
if (status == "email_verified") {
sendEvent(frame, Events.RECEIVE_EMAIL_VERIFICATION, { status });
clearInterval(check);
}
}, 5000);
} catch (error: any) {
sendEvent(frame, Events.RECEIVE_EMAIL_VERIFICATION, {}, error);
}
Expand Down
5 changes: 4 additions & 1 deletion svelte.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ const config = {
}),

kit: {
adapter: adapter()
adapter: adapter(),
version: {
name: process.env.npm_package_version,
}
}
};

Expand Down
Loading