@omerlo/omerlo-webkit 0.0.33 → 0.0.35

package/dist/omerlo/reader/endpoints/oauth.d.ts

@@ -19,5 +19,6 @@ export interface OauthUser {
     id: string;
     name: string;
     email: string;
+    accessToken: string;
     verifiedAt: Date | null;
 }

package/dist/omerlo/reader/endpoints/oauth.js

@@ -33,6 +33,7 @@ export function parseOauthUser(data, _assoc) {
         id: data.id,
         name: data.name,
         email: data.email,
+        accessToken: data.access_token,
         verifiedAt: data.verified_at
     };
 }

package/dist/omerlo/reader/server/utils.js

@@ -5,11 +5,9 @@ export async function loadUserSession(f, cookies) {
     if (isAuthenticated(cookies)) {
         userSession.authenticated = true;
         try {
-            const userInfo = await useReader(f)
-                .userInfo()
-                .then((resp) => resp.data);
-            userSession.verified = true;
-            userSession.user = userInfo;
+            const userInfo = await useReader(f).userInfo();
+            userSession.verified = userInfo.ok;
+            userSession.user = userInfo.data;
         }
         catch (_e) {
             userSession.verified = false;
@@ -22,6 +20,7 @@ export function isAuthenticated(cookies) {
 }
 const accessTokenCookieName = 'access_token';
 const refreshTokenCookieName = 'refresh_token';
+const THREE_MONTH = 90 * 24 * 60 * 60;
 export function setAuthorizationCookies(cookies, token) {
     cookies.set('logged_in', 'true', { path: '/', httpOnly: false });
     cookies.set(accessTokenCookieName, token.accessToken, {
@@ -29,7 +28,11 @@ export function setAuthorizationCookies(cookies, token) {
         path: '/',
         maxAge: token.expiresIn - 60
     });
-    cookies.set(refreshTokenCookieName, token.refreshToken, { httpOnly: true, path: '/' });
+    cookies.set(refreshTokenCookieName, token.refreshToken, {
+        httpOnly: true,
+        path: '/',
+        maxAge: THREE_MONTH
+    });
 }
 export function clearAuthorizationCookies(cookies) {
     cookies.delete(accessTokenCookieName, { path: '/' });
@@ -80,8 +83,7 @@ async function refreshApplicationToken() {
             const token = await refresh(applicationToken.refreshToken);
             applicationToken.accessToken = token.accessToken;
             applicationToken.refreshToken = token.refreshToken;
-            const date = new Date();
-            const timestamps = date.setSeconds(date.getSeconds() + token.expiresIn - 60);
+            const timestamps = new Date().getTime() + (token.expiresIn - 60) * 1000;
             applicationToken.expiredAt = timestamps;
             applicationToken.refreshErrorCounter = 0;
         }
@@ -98,12 +100,18 @@ async function refreshApplicationToken() {
     })();
     return refreshingPromise;
 }
+let newTokenPromise = null;
 async function newApplicationToken() {
-    const token = await getAnonymousToken('application');
-    applicationToken.init = true;
-    applicationToken.accessToken = token.accessToken;
-    applicationToken.refreshToken = token.refreshToken;
-    const date = new Date();
-    const timestamps = date.setSeconds(date.getSeconds() + token.expiresIn - 60);
-    applicationToken.expiredAt = timestamps;
+    if (newTokenPromise) {
+        return newTokenPromise;
+    }
+    newTokenPromise = (async () => {
+        const token = await getAnonymousToken('application');
+        applicationToken.init = true;
+        applicationToken.accessToken = token.accessToken;
+        applicationToken.refreshToken = token.refreshToken;
+        const timestamps = new Date().getTime() + (token.expiresIn - 60) * 1000;
+        applicationToken.expiredAt = timestamps;
+    })();
+    return newTokenPromise;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omerlo/omerlo-webkit",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "scripts": {
     "dev": "vite dev",
     "build": "vite build && npm run package",