hyperapp-is 0.1.34 → 0.1.36

package/dist/hyperapp-is/index.d.ts

@@ -13,4 +13,4 @@ export { Carousel, effect_InitCarousel } from "./animationView/carousel";
 export type { ScrollMargin, MatrixState } from "./dom/utils";
 export { getScrollMargin, getMatrixState } from "./dom/utils";
 export type { GoogleAccountsId, GoogleTokenClient, GoogleAccountsOAuth2, GoogleAccounts, Google, GoogleAuthConfig, GoogleUser, GoogleAuthResult, GoogleScope, GetAccessTokenConfig } from "./services/google";
-export { getGoogle, googleAuth, googleLogout, getAccessToken } from "./services/google";
+export { getGoogle, googleAuth, getAccessToken } from "./services/google";

package/dist/hyperapp-is/index.js

@@ -7,4 +7,4 @@ export { progress_easing } from "./animation/easing";
 export { createUnits, createRAFProperties, effect_RAFProperties } from "./animation/properties";
 export { Carousel, effect_InitCarousel } from "./animationView/carousel";
 export { getScrollMargin, getMatrixState } from "./dom/utils";
-export { getGoogle, googleAuth, googleLogout, getAccessToken } from "./services/google";
+export { getGoogle, googleAuth, getAccessToken } from "./services/google";

package/dist/hyperapp-is/services/google.d.ts

@@ -10,6 +10,12 @@ export interface GoogleAccountsId {
     disableAutoSelect(): void;
     cancel(): void;
     prompt(callback?: (notification: any) => void): void;
+    renderButton(parent: HTMLElement, options?: {
+        theme?: "outline" | "filled_blue" | "filled_black";
+        size?: "large" | "medium" | "small";
+        text?: "signin_with" | "signup_with" | "continue_with";
+        shape?: "rectangular" | "pill" | "circle" | "square";
+    }): void;
 }
 export interface GoogleTokenClient {
     requestAccessToken(options?: {
@@ -49,8 +55,7 @@ export interface GoogleAuthResult {
     idToken: string;
     user: GoogleUser;
 }
-export declare const googleAuth: (config: GoogleAuthConfig) => Promise<GoogleAuthResult>;
-export declare const googleLogout: () => Promise<void>;
+export declare const googleAuth: (config: GoogleAuthConfig) => Promise<GoogleAuthResult | null>;
 export type GoogleScope = "openid" | "email" | "profile" | "https://www.googleapis.com/auth/drive" | "https://www.googleapis.com/auth/drive.readonly" | "https://www.googleapis.com/auth/drive.file" | "https://www.googleapis.com/auth/drive.metadata.readonly" | "https://www.googleapis.com/auth/drive.appdata" | "https://www.googleapis.com/auth/calendar" | "https://www.googleapis.com/auth/calendar.readonly" | "https://www.googleapis.com/auth/calendar.events" | "https://www.googleapis.com/auth/calendar.events.readonly" | "https://www.googleapis.com/auth/gmail.readonly" | "https://www.googleapis.com/auth/gmail.modify" | "https://www.googleapis.com/auth/gmail.send" | "https://www.googleapis.com/auth/gmail.compose" | "https://www.googleapis.com/auth/gmail.labels" | "https://www.googleapis.com/auth/spreadsheets" | "https://www.googleapis.com/auth/spreadsheets.readonly" | "https://www.googleapis.com/auth/documents" | "https://www.googleapis.com/auth/documents.readonly" | "https://www.googleapis.com/auth/presentations" | "https://www.googleapis.com/auth/presentations.readonly" | "https://www.googleapis.com/auth/forms" | "https://www.googleapis.com/auth/forms.responses.readonly" | "https://www.googleapis.com/auth/youtube.readonly" | "https://www.googleapis.com/auth/youtube" | "https://www.googleapis.com/auth/youtube.upload" | "https://www.googleapis.com/auth/youtube.force-ssl" | "https://www.googleapis.com/auth/userinfo.email" | "https://www.googleapis.com/auth/userinfo.profile" | (string & {});
 export interface GetAccessTokenConfig {
     clientId: string;

package/dist/hyperapp-is/services/google.js

@@ -78,50 +78,41 @@ export const googleAuth = async (config) => {
             }
         }); // end initialize
         // show prompt
-        client.prompt();
+        client.prompt((notification) => {
+            if (notification.isNotDisplayed() || notification.isSkippedMoment()) {
+                resolve(null);
+            }
+        });
     }); // end result
 };
 // ---------- ---------- ---------- ---------- ----------
-// googleLogout
-// ---------- ---------- ---------- ---------- ----------
-export const googleLogout = async () => {
-    const google = await getGoogle();
-    // 自動ログインを無効化
-    google.accounts.id.disableAutoSelect();
-    // セッション的なものをクリア（念のため）
-    google.accounts.id.cancel();
-};
-// ---------- ---------- ---------- ---------- ----------
 // getAccessToken
 // ---------- ---------- ---------- ---------- ----------
-export const getAccessToken = (config) => new Promise((resolve, reject) => {
-    var _a;
-    // get google
-    const google = window.google;
-    if (!google) {
-        reject(new Error("error: Google SDK not loaded. Call getGoogle() before getAccessToken()."));
-        return;
-    }
-    // variable
-    const prompt = (_a = config.prompt) !== null && _a !== void 0 ? _a : "select_account";
-    // initialize
-    const tokenClient = google.accounts.oauth2.initTokenClient({
-        client_id: config.clientId,
-        scope: config.scope.join(" "),
-        callback: (response) => {
-            if (response.error) {
-                reject(response);
-            }
-            else {
-                if (response.access_token) {
-                    resolve(response.access_token);
+export const getAccessToken = async (config) => {
+    const google = await getGoogle();
+    return new Promise((resolve, reject) => {
+        var _a;
+        // variable
+        const prompt = (_a = config.prompt) !== null && _a !== void 0 ? _a : "select_account";
+        // initialize
+        const tokenClient = google.accounts.oauth2.initTokenClient({
+            client_id: config.clientId,
+            scope: config.scope.join(" "),
+            callback: (response) => {
+                if (response.error) {
+                    reject(response);
                 }
                 else {
-                    reject(new Error("No access_token"));
+                    if (response.access_token) {
+                        resolve(response.access_token);
+                    }
+                    else {
+                        reject(new Error("No access_token"));
+                    }
                 }
             }
-        }
-    }); // end initialize
-    // request AccessToken
-    tokenClient.requestAccessToken({ prompt }); // prompt == "none" のときには、事前にログインが必要
-});
+        }); // end initialize
+        // request AccessToken
+        tokenClient.requestAccessToken({ prompt }); // prompt == "none" のときには、事前にログインが必要
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperapp-is",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "UI foundation library for Hyperapp by is4416",
   "license": "MIT",
   "type": "module",