@google/gemini-cli-core 0.3.0-preview.3 → 0.4.0-nightly.20250904.e133acd2

package/dist/src/mcp/token-storage/file-token-storage.test.js

@@ -0,0 +1,235 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { promises as fs } from 'node:fs';
+import * as path from 'node:path';
+import { FileTokenStorage } from './file-token-storage.js';
+vi.mock('node:fs', () => ({
+    promises: {
+        readFile: vi.fn(),
+        writeFile: vi.fn(),
+        unlink: vi.fn(),
+        mkdir: vi.fn(),
+    },
+}));
+vi.mock('node:os', () => ({
+    default: {
+        homedir: vi.fn(() => '/home/test'),
+        hostname: vi.fn(() => 'test-host'),
+        userInfo: vi.fn(() => ({ username: 'test-user' })),
+    },
+    homedir: vi.fn(() => '/home/test'),
+    hostname: vi.fn(() => 'test-host'),
+    userInfo: vi.fn(() => ({ username: 'test-user' })),
+}));
+describe('FileTokenStorage', () => {
+    let storage;
+    const mockFs = fs;
+    const existingCredentials = {
+        serverName: 'existing-server',
+        token: {
+            accessToken: 'existing-token',
+            tokenType: 'Bearer',
+        },
+        updatedAt: Date.now() - 10000,
+    };
+    beforeEach(() => {
+        vi.clearAllMocks();
+        storage = new FileTokenStorage('test-storage');
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('getCredentials', () => {
+        it('should throw error when file does not exist', async () => {
+            mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+            await expect(storage.getCredentials('test-server')).rejects.toThrow('Token file does not exist');
+        });
+        it('should return null for expired tokens', async () => {
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                    expiresAt: Date.now() - 3600000,
+                },
+                updatedAt: Date.now(),
+            };
+            const encryptedData = storage['encrypt'](JSON.stringify({ 'test-server': credentials }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            const result = await storage.getCredentials('test-server');
+            expect(result).toBeNull();
+        });
+        it('should return credentials for valid tokens', async () => {
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                    expiresAt: Date.now() + 3600000,
+                },
+                updatedAt: Date.now(),
+            };
+            const encryptedData = storage['encrypt'](JSON.stringify({ 'test-server': credentials }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            const result = await storage.getCredentials('test-server');
+            expect(result).toEqual(credentials);
+        });
+        it('should throw error for corrupted files', async () => {
+            mockFs.readFile.mockResolvedValue('corrupted-data');
+            await expect(storage.getCredentials('test-server')).rejects.toThrow('Token file corrupted');
+        });
+    });
+    describe('setCredentials', () => {
+        it('should save credentials with encryption', async () => {
+            const encryptedData = storage['encrypt'](JSON.stringify({ 'existing-server': existingCredentials }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            mockFs.mkdir.mockResolvedValue(undefined);
+            mockFs.writeFile.mockResolvedValue(undefined);
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            await storage.setCredentials(credentials);
+            expect(mockFs.mkdir).toHaveBeenCalledWith(path.join('/home/test', '.gemini'), { recursive: true, mode: 0o700 });
+            expect(mockFs.writeFile).toHaveBeenCalled();
+            const writeCall = mockFs.writeFile.mock.calls[0];
+            expect(writeCall[1]).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
+            expect(writeCall[2]).toEqual({ mode: 0o600 });
+        });
+        it('should update existing credentials', async () => {
+            const encryptedData = storage['encrypt'](JSON.stringify({ 'existing-server': existingCredentials }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            mockFs.writeFile.mockResolvedValue(undefined);
+            const newCredentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'new-token',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            await storage.setCredentials(newCredentials);
+            expect(mockFs.writeFile).toHaveBeenCalled();
+            const writeCall = mockFs.writeFile.mock.calls[0];
+            const decrypted = storage['decrypt'](writeCall[1]);
+            const saved = JSON.parse(decrypted);
+            expect(saved['existing-server']).toEqual(existingCredentials);
+            expect(saved['test-server'].token.accessToken).toBe('new-token');
+        });
+    });
+    describe('deleteCredentials', () => {
+        it('should throw when credentials do not exist', async () => {
+            mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+            await expect(storage.deleteCredentials('test-server')).rejects.toThrow('Token file does not exist');
+        });
+        it('should delete file when last credential is removed', async () => {
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            const encryptedData = storage['encrypt'](JSON.stringify({ 'test-server': credentials }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            mockFs.unlink.mockResolvedValue(undefined);
+            await storage.deleteCredentials('test-server');
+            expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', '.gemini', 'mcp-oauth-tokens-v2.json'));
+        });
+        it('should update file when other credentials remain', async () => {
+            const credentials1 = {
+                serverName: 'server1',
+                token: {
+                    accessToken: 'token1',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            const credentials2 = {
+                serverName: 'server2',
+                token: {
+                    accessToken: 'token2',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            const encryptedData = storage['encrypt'](JSON.stringify({ server1: credentials1, server2: credentials2 }));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            mockFs.writeFile.mockResolvedValue(undefined);
+            await storage.deleteCredentials('server1');
+            expect(mockFs.writeFile).toHaveBeenCalled();
+            expect(mockFs.unlink).not.toHaveBeenCalled();
+            const writeCall = mockFs.writeFile.mock.calls[0];
+            const decrypted = storage['decrypt'](writeCall[1]);
+            const saved = JSON.parse(decrypted);
+            expect(saved['server1']).toBeUndefined();
+            expect(saved['server2']).toEqual(credentials2);
+        });
+    });
+    describe('listServers', () => {
+        it('should throw error when file does not exist', async () => {
+            mockFs.readFile.mockRejectedValue({ code: 'ENOENT' });
+            await expect(storage.listServers()).rejects.toThrow('Token file does not exist');
+        });
+        it('should return list of server names', async () => {
+            const credentials = {
+                server1: {
+                    serverName: 'server1',
+                    token: { accessToken: 'token1', tokenType: 'Bearer' },
+                    updatedAt: Date.now(),
+                },
+                server2: {
+                    serverName: 'server2',
+                    token: { accessToken: 'token2', tokenType: 'Bearer' },
+                    updatedAt: Date.now(),
+                },
+            };
+            const encryptedData = storage['encrypt'](JSON.stringify(credentials));
+            mockFs.readFile.mockResolvedValue(encryptedData);
+            const result = await storage.listServers();
+            expect(result).toEqual(['server1', 'server2']);
+        });
+    });
+    describe('clearAll', () => {
+        it('should delete the token file', async () => {
+            mockFs.unlink.mockResolvedValue(undefined);
+            await storage.clearAll();
+            expect(mockFs.unlink).toHaveBeenCalledWith(path.join('/home/test', '.gemini', 'mcp-oauth-tokens-v2.json'));
+        });
+        it('should not throw when file does not exist', async () => {
+            mockFs.unlink.mockRejectedValue({ code: 'ENOENT' });
+            await expect(storage.clearAll()).resolves.not.toThrow();
+        });
+    });
+    describe('encryption', () => {
+        it('should encrypt and decrypt data correctly', () => {
+            const original = 'test-data-123';
+            const encrypted = storage['encrypt'](original);
+            const decrypted = storage['decrypt'](encrypted);
+            expect(decrypted).toBe(original);
+            expect(encrypted).not.toBe(original);
+            expect(encrypted).toMatch(/^[0-9a-f]+:[0-9a-f]+:[0-9a-f]+$/);
+        });
+        it('should produce different encrypted output each time', () => {
+            const original = 'test-data';
+            const encrypted1 = storage['encrypt'](original);
+            const encrypted2 = storage['encrypt'](original);
+            expect(encrypted1).not.toBe(encrypted2);
+            expect(storage['decrypt'](encrypted1)).toBe(original);
+            expect(storage['decrypt'](encrypted2)).toBe(original);
+        });
+        it('should throw on invalid encrypted data format', () => {
+            expect(() => storage['decrypt']('invalid-data')).toThrow('Invalid encrypted data format');
+        });
+    });
+});
+//# sourceMappingURL=file-token-storage.test.js.map

package/dist/src/mcp/token-storage/file-token-storage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-token-storage.test.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/file-token-storage.test.ts"],"names":[],"mappings":"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"}

package/dist/src/mcp/token-storage/hybrid-token-storage.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BaseTokenStorage } from './base-token-storage.js';
+import type { OAuthCredentials } from './types.js';
+import { TokenStorageType } from './types.js';
+export declare class HybridTokenStorage extends BaseTokenStorage {
+    private storage;
+    private storageType;
+    private storageInitPromise;
+    constructor(serviceName: string);
+    private initializeStorage;
+    private getStorage;
+    getCredentials(serverName: string): Promise<OAuthCredentials | null>;
+    setCredentials(credentials: OAuthCredentials): Promise<void>;
+    deleteCredentials(serverName: string): Promise<void>;
+    listServers(): Promise<string[]>;
+    getAllCredentials(): Promise<Map<string, OAuthCredentials>>;
+    clearAll(): Promise<void>;
+    getStorageType(): Promise<TokenStorageType>;
+}

package/dist/src/mcp/token-storage/hybrid-token-storage.js

@@ -0,0 +1,78 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BaseTokenStorage } from './base-token-storage.js';
+import { FileTokenStorage } from './file-token-storage.js';
+import { TokenStorageType } from './types.js';
+const FORCE_FILE_STORAGE_ENV_VAR = 'GEMINI_FORCE_FILE_STORAGE';
+export class HybridTokenStorage extends BaseTokenStorage {
+    storage = null;
+    storageType = null;
+    storageInitPromise = null;
+    constructor(serviceName) {
+        super(serviceName);
+    }
+    async initializeStorage() {
+        const forceFileStorage = process.env[FORCE_FILE_STORAGE_ENV_VAR] === 'true';
+        if (!forceFileStorage) {
+            try {
+                const { KeychainTokenStorage } = await import('./keychain-token-storage.js');
+                const keychainStorage = new KeychainTokenStorage(this.serviceName);
+                const isAvailable = await keychainStorage.isAvailable();
+                if (isAvailable) {
+                    this.storage = keychainStorage;
+                    this.storageType = TokenStorageType.KEYCHAIN;
+                    return this.storage;
+                }
+            }
+            catch (_e) {
+                // Fallback to file storage if keychain fails to initialize
+            }
+        }
+        this.storage = new FileTokenStorage(this.serviceName);
+        this.storageType = TokenStorageType.ENCRYPTED_FILE;
+        return this.storage;
+    }
+    async getStorage() {
+        if (this.storage !== null) {
+            return this.storage;
+        }
+        // Use a single initialization promise to avoid race conditions
+        if (!this.storageInitPromise) {
+            this.storageInitPromise = this.initializeStorage();
+        }
+        // Wait for initialization to complete
+        return await this.storageInitPromise;
+    }
+    async getCredentials(serverName) {
+        const storage = await this.getStorage();
+        return storage.getCredentials(serverName);
+    }
+    async setCredentials(credentials) {
+        const storage = await this.getStorage();
+        await storage.setCredentials(credentials);
+    }
+    async deleteCredentials(serverName) {
+        const storage = await this.getStorage();
+        await storage.deleteCredentials(serverName);
+    }
+    async listServers() {
+        const storage = await this.getStorage();
+        return storage.listServers();
+    }
+    async getAllCredentials() {
+        const storage = await this.getStorage();
+        return storage.getAllCredentials();
+    }
+    async clearAll() {
+        const storage = await this.getStorage();
+        await storage.clearAll();
+    }
+    async getStorageType() {
+        await this.getStorage();
+        return this.storageType;
+    }
+}
+//# sourceMappingURL=hybrid-token-storage.js.map

package/dist/src/mcp/token-storage/hybrid-token-storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hybrid-token-storage.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/hybrid-token-storage.ts"],"names":[],"mappings":"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"}

package/dist/src/mcp/token-storage/hybrid-token-storage.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/mcp/token-storage/hybrid-token-storage.test.js

@@ -0,0 +1,193 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { HybridTokenStorage } from './hybrid-token-storage.js';
+import { KeychainTokenStorage } from './keychain-token-storage.js';
+import { FileTokenStorage } from './file-token-storage.js';
+import { TokenStorageType } from './types.js';
+vi.mock('./keychain-token-storage.js', () => ({
+    KeychainTokenStorage: vi.fn().mockImplementation(() => ({
+        isAvailable: vi.fn(),
+        getCredentials: vi.fn(),
+        setCredentials: vi.fn(),
+        deleteCredentials: vi.fn(),
+        listServers: vi.fn(),
+        getAllCredentials: vi.fn(),
+        clearAll: vi.fn(),
+    })),
+}));
+vi.mock('./file-token-storage.js', () => ({
+    FileTokenStorage: vi.fn().mockImplementation(() => ({
+        getCredentials: vi.fn(),
+        setCredentials: vi.fn(),
+        deleteCredentials: vi.fn(),
+        listServers: vi.fn(),
+        getAllCredentials: vi.fn(),
+        clearAll: vi.fn(),
+    })),
+}));
+describe('HybridTokenStorage', () => {
+    let storage;
+    let mockKeychainStorage;
+    let mockFileStorage;
+    const originalEnv = process.env;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        process.env = { ...originalEnv };
+        // Create mock instances before creating HybridTokenStorage
+        mockKeychainStorage = {
+            isAvailable: vi.fn(),
+            getCredentials: vi.fn(),
+            setCredentials: vi.fn(),
+            deleteCredentials: vi.fn(),
+            listServers: vi.fn(),
+            getAllCredentials: vi.fn(),
+            clearAll: vi.fn(),
+        };
+        mockFileStorage = {
+            getCredentials: vi.fn(),
+            setCredentials: vi.fn(),
+            deleteCredentials: vi.fn(),
+            listServers: vi.fn(),
+            getAllCredentials: vi.fn(),
+            clearAll: vi.fn(),
+        };
+        KeychainTokenStorage.mockImplementation(() => mockKeychainStorage);
+        FileTokenStorage.mockImplementation(() => mockFileStorage);
+        storage = new HybridTokenStorage('test-service');
+    });
+    afterEach(() => {
+        process.env = originalEnv;
+    });
+    describe('storage selection', () => {
+        it('should use keychain when available', async () => {
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.getCredentials.mockResolvedValue(null);
+            await storage.getCredentials('test-server');
+            expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
+            expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith('test-server');
+            expect(await storage.getStorageType()).toBe(TokenStorageType.KEYCHAIN);
+        });
+        it('should use file storage when GEMINI_FORCE_FILE_STORAGE is set', async () => {
+            process.env['GEMINI_FORCE_FILE_STORAGE'] = 'true';
+            mockFileStorage.getCredentials.mockResolvedValue(null);
+            await storage.getCredentials('test-server');
+            expect(mockKeychainStorage.isAvailable).not.toHaveBeenCalled();
+            expect(mockFileStorage.getCredentials).toHaveBeenCalledWith('test-server');
+            expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
+        });
+        it('should fall back to file storage when keychain is unavailable', async () => {
+            mockKeychainStorage.isAvailable.mockResolvedValue(false);
+            mockFileStorage.getCredentials.mockResolvedValue(null);
+            await storage.getCredentials('test-server');
+            expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
+            expect(mockFileStorage.getCredentials).toHaveBeenCalledWith('test-server');
+            expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
+        });
+        it('should fall back to file storage when keychain throws error', async () => {
+            mockKeychainStorage.isAvailable.mockRejectedValue(new Error('Keychain error'));
+            mockFileStorage.getCredentials.mockResolvedValue(null);
+            await storage.getCredentials('test-server');
+            expect(mockKeychainStorage.isAvailable).toHaveBeenCalled();
+            expect(mockFileStorage.getCredentials).toHaveBeenCalledWith('test-server');
+            expect(await storage.getStorageType()).toBe(TokenStorageType.ENCRYPTED_FILE);
+        });
+        it('should cache storage selection', async () => {
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.getCredentials.mockResolvedValue(null);
+            await storage.getCredentials('test-server');
+            await storage.getCredentials('another-server');
+            expect(mockKeychainStorage.isAvailable).toHaveBeenCalledTimes(1);
+        });
+    });
+    describe('getCredentials', () => {
+        it('should delegate to selected storage', async () => {
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.getCredentials.mockResolvedValue(credentials);
+            const result = await storage.getCredentials('test-server');
+            expect(result).toEqual(credentials);
+            expect(mockKeychainStorage.getCredentials).toHaveBeenCalledWith('test-server');
+        });
+    });
+    describe('setCredentials', () => {
+        it('should delegate to selected storage', async () => {
+            const credentials = {
+                serverName: 'test-server',
+                token: {
+                    accessToken: 'access-token',
+                    tokenType: 'Bearer',
+                },
+                updatedAt: Date.now(),
+            };
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.setCredentials.mockResolvedValue(undefined);
+            await storage.setCredentials(credentials);
+            expect(mockKeychainStorage.setCredentials).toHaveBeenCalledWith(credentials);
+        });
+    });
+    describe('deleteCredentials', () => {
+        it('should delegate to selected storage', async () => {
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.deleteCredentials.mockResolvedValue(undefined);
+            await storage.deleteCredentials('test-server');
+            expect(mockKeychainStorage.deleteCredentials).toHaveBeenCalledWith('test-server');
+        });
+    });
+    describe('listServers', () => {
+        it('should delegate to selected storage', async () => {
+            const servers = ['server1', 'server2'];
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.listServers.mockResolvedValue(servers);
+            const result = await storage.listServers();
+            expect(result).toEqual(servers);
+            expect(mockKeychainStorage.listServers).toHaveBeenCalled();
+        });
+    });
+    describe('getAllCredentials', () => {
+        it('should delegate to selected storage', async () => {
+            const credentialsMap = new Map([
+                [
+                    'server1',
+                    {
+                        serverName: 'server1',
+                        token: { accessToken: 'token1', tokenType: 'Bearer' },
+                        updatedAt: Date.now(),
+                    },
+                ],
+                [
+                    'server2',
+                    {
+                        serverName: 'server2',
+                        token: { accessToken: 'token2', tokenType: 'Bearer' },
+                        updatedAt: Date.now(),
+                    },
+                ],
+            ]);
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.getAllCredentials.mockResolvedValue(credentialsMap);
+            const result = await storage.getAllCredentials();
+            expect(result).toEqual(credentialsMap);
+            expect(mockKeychainStorage.getAllCredentials).toHaveBeenCalled();
+        });
+    });
+    describe('clearAll', () => {
+        it('should delegate to selected storage', async () => {
+            mockKeychainStorage.isAvailable.mockResolvedValue(true);
+            mockKeychainStorage.clearAll.mockResolvedValue(undefined);
+            await storage.clearAll();
+            expect(mockKeychainStorage.clearAll).toHaveBeenCalled();
+        });
+    });
+});
+//# sourceMappingURL=hybrid-token-storage.test.js.map

package/dist/src/mcp/token-storage/hybrid-token-storage.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hybrid-token-storage.test.js","sourceRoot":"","sources":["../../../../src/mcp/token-storage/hybrid-token-storage.test.ts"],"names":[],"mappings":"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"}

package/dist/src/mcp/token-storage/keychain-token-storage.d.ts

@@ -0,0 +1,31 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { BaseTokenStorage } from './base-token-storage.js';
+import type { OAuthCredentials } from './types.js';
+interface Keytar {
+    getPassword(service: string, account: string): Promise<string | null>;
+    setPassword(service: string, account: string, password: string): Promise<void>;
+    deletePassword(service: string, account: string): Promise<boolean>;
+    findCredentials(service: string): Promise<Array<{
+        account: string;
+        password: string;
+    }>>;
+}
+export declare class KeychainTokenStorage extends BaseTokenStorage {
+    private keychainAvailable;
+    private keytarModule;
+    private keytarLoadAttempted;
+    getKeytar(): Promise<Keytar | null>;
+    getCredentials(serverName: string): Promise<OAuthCredentials | null>;
+    setCredentials(credentials: OAuthCredentials): Promise<void>;
+    deleteCredentials(serverName: string): Promise<void>;
+    listServers(): Promise<string[]>;
+    getAllCredentials(): Promise<Map<string, OAuthCredentials>>;
+    clearAll(): Promise<void>;
+    checkKeychainAvailability(): Promise<boolean>;
+    isAvailable(): Promise<boolean>;
+}
+export {};