react-native-appwrite 0.1.0 → 0.2.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "react-native-appwrite",
   "homepage": "https://appwrite.io/support",
   "description": "Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "BSD-3-Clause",
   "main": "dist/cjs/sdk.js",
   "exports": {
@@ -30,18 +30,13 @@
     "rollup": "2.75.4",
     "serve-handler": "6.1.0",
     "tslib": "2.4.0",
-    "react-native-fs": "^2.20.0",
     "typescript": "4.7.2"
   },
   "dependencies": {
-    "cross-fetch": "3.1.5",
-    "isomorphic-form-data": "2.0.0"
+    "expo-file-system": "16.0.8",
+    "expo-device": "5.9.3"
   },
   "peerDependencies": {
-    "react-native": "*",
-    "react-native-fs": "^2.20.0",
-    "react-native-url-polyfill": "^2.0.0"
-  },
-  "jsdelivr": "dist/iife/sdk.js",
-  "unpkg": "dist/iife/sdk.js"
+      "expo": "*"
+  }
 }

package/rollup.config.js

@@ -17,15 +17,5 @@ export default {
             file: pkg.module,
             sourcemap: true,
         },
-        {
-            format: "iife",
-            file: pkg.jsdelivr,
-            name: "Appwrite",
-            extend: true,
-            globals: {
-                "cross-fetch": "window",
-                "FormData": "FormData",
-            },
-        },
     ],
 };

package/src/client.ts

@@ -1,8 +1,6 @@
-import 'isomorphic-form-data';
-import { fetch } from 'cross-fetch';
-import { Platform } from 'react-native';
 import { Models } from './models';
 import { Service } from './service';
+import * as Device from 'expo-device';
 
 type Payload = {
     [key: string]: any;
@@ -251,7 +249,7 @@ class Client {
                 // @ts-ignore
                 this.realtime.socket = new WebSocket(url, undefined, {
                     headers: {
-                        Origin: `appwrite-${Platform.OS}://${this.config.platform}`
+                        Origin: `appwrite-${Device.osName}://${this.config.platform}`
                     }
                 });
                 this.realtime.socket.addEventListener('message', this.realtime.onMessage);
@@ -369,7 +367,7 @@ class Client {
         method = method.toUpperCase();
 
         headers = Object.assign({}, this.headers, headers);
-        headers.Origin = `appwrite-${Platform.OS}://${this.config.platform}`;
+        headers.Origin = `appwrite-${Device.osName}://${this.config.platform}`;
         let options: RequestInit = {
             method,
             headers,

package/src/services/account.ts

@@ -706,37 +706,7 @@ export class Account extends Service {
      * @returns {void|string}
     */
     createOAuth2Session(provider: string, success?: string, failure?: string, scopes?: string[]): void | URL {
-        if (typeof provider === 'undefined') {
-            throw new AppwriteException('Missing required parameter: "provider"');
-        }
-
-        const apiPath = '/account/sessions/oauth2/{provider}'.replace('{provider}', provider);
-        const payload: Payload = {};
-
-        if (typeof success !== 'undefined') {
-            payload['success'] = success;
-        }
-
-        if (typeof failure !== 'undefined') {
-            payload['failure'] = failure;
-        }
-
-        if (typeof scopes !== 'undefined') {
-            payload['scopes'] = scopes;
-        }
-
-        const uri = new URL(this.client.config.endpoint + apiPath);
-        payload['project'] = this.client.config.project;
-
-
-        for (const [key, value] of Object.entries(Service.flatten(payload))) {
-            uri.searchParams.append(key, value);
-        }
-        if (typeof window !== 'undefined' && window?.location) {
-            window.location.href = uri.toString();
-        } else {
-            return uri;
-        }
+        throw new AppwriteException('Not yet supported');
     }
 
     /**

package/src/services/storage.ts

@@ -2,7 +2,7 @@ import { Service } from '../service';
 import { AppwriteException, Client } from '../client';
 import type { Models } from '../models';
 import type { UploadProgress, Payload } from '../client';
-import fs from 'react-native-fs'
+import * as FileSystem from 'expo-file-system';
 
 export class Storage extends Service {
 
@@ -69,12 +69,12 @@ export class Storage extends Service {
      *
      * @param {string} bucketId
      * @param {string} fileId
-     * @param {any} file
+     * @param {{name: string, type: string, size: number, uri: string}} file
      * @param {string[]} permissions
      * @throws {AppwriteException}
      * @returns {Promise}
     */
-    async createFile(bucketId: string, fileId: string, file: any, permissions?: string[], onProgress = (progress: UploadProgress) => {}): Promise<Models.File> {
+    async createFile(bucketId: string, fileId: string, file: {name: string, type: string, size: number, uri: string}, permissions?: string[], onProgress = (progress: UploadProgress) => {}): Promise<Models.File> {
         if (typeof bucketId === 'undefined') {
             throw new AppwriteException('Missing required parameter: "bucketId"');
         }
@@ -134,7 +134,11 @@ export class Storage extends Service {
                 apiHeaders['x-appwrite-id'] = response.$id;
             }
 
-            let chunk = await fs.read(file.uri, Service.CHUNK_SIZE, offset, 'base64');
+            let chunk = await FileSystem.readAsStringAsync(file.uri, {
+                encoding: FileSystem.EncodingType.Base64,
+                position: offset,
+                length: Service.CHUNK_SIZE
+            });
 
             payload['file'] = {uri: `data:${file.type};base64,${chunk}`, name: file.name, type: file.type};
             response = await this.client.call('post', uri, apiHeaders, payload);