Add Encryption

couchbase.android.ts

@@ -11,11 +11,21 @@ export class Couchbase {
     private manager: any;
     private database: any;
 
-    public constructor(databaseName: string) {
+
+    public constructor(databaseName: string, encryptionKey?:string) {
         this.context = utils.ad.getApplicationContext();
         try {
             this.manager = new com.couchbase.lite.Manager(new com.couchbase.lite.android.AndroidContext(this.context), null);
-            this.database = this.manager.getDatabase(databaseName);
+            if(!encryptionKey){
+                this.database = this.manager.getDatabase(databaseName);
+            }else{
+                let databaseOptions:any = new com.couchbase.lite.DatabaseOptions();
+                databaseOptions.setCreate(true);
+                databaseOptions.setEncryptionKey(encryptionKey);
+                this.database = this.manager.openDatabase(databaseName, databaseOptions);
+            }
+
+
         } catch (exception) {
             console.error("MANAGER ERROR:", exception.message);
         }

couchbase.d.ts

@@ -1,12 +1,14 @@
 declare module "nativescript-couchbase" {
 
     export class Couchbase {
-        constructor(databaseName: string);
+        constructor(databaseName: string, encryptionKey?: string);
         createDocument(data: Object, documentId?: string);
         getDocument(documentId: string);
         updateDocument(documentId: string, data: any);
         deleteDocument(documentId: string);
         destroyDatabase();
+        closeDatabase():boolean;
+        openDatabase(name: string, key?: string);
         createView(viewName: string, viewRevision: string, callback: any);
         executeQuery(viewName: string, options?: any);
         createPullReplication(remoteUrl: string);

couchbase.ios.ts

@@ -13,14 +13,19 @@ export class Couchbase {
     private manager: any;
     private database: any;
 
-    constructor(databaseName: String){
+    constructor(databaseName: String, encryptionKey?:string){
         this.manager = CBLManager.sharedInstance();
         if (!this.manager){
             console.log("MANAGER ERROR:Can not create share instance of CBLManager");
         }
         var errorRef = new interop.Reference();
-
-        this.database = this.manager.databaseNamedError(databaseName, errorRef);
+        if(!encryptionKey){
+            this.database = this.manager.databaseNamedError(databaseName, errorRef);
+        } else {
+            this.database = this.manager.registerEncryptionKeyForDatabaseNamed(databaseName, encryptionKey);
+            this.database = this.manager.databaseNamedError(databaseName, errorRef);
+        }
+
 
         if (!this.database){
           console.log(errorRef.value);
@@ -190,6 +195,10 @@ export class Couchbase {
         }
     }
 
+    closeDatabase(){
+        return this.database.close();
+    }
+
     private mapToJson(properties: Object){
       var errorRef = new interop.Reference();
       var result = "";

ng-demo/app/app.routing.ts

@@ -1,13 +1,16 @@
 import { Routes } from "@angular/router";
 import { ListComponent } from "./components/list/list.component";
 import { CreateComponent } from "./components/create/create.component";
+import { EncryptionComponent } from "./components/encryption/encryption.component";
 
 export const appRoutes: Routes = [
     { path: '', component: ListComponent },
-    { path: "create", component: CreateComponent }
+    { path: "create", component: CreateComponent },
+    { path: "encryption", component: EncryptionComponent }
 ];
 
 export const appComponents: any = [
     ListComponent,
-    CreateComponent
+    CreateComponent,
+    EncryptionComponent
 ];

ng-demo/app/components/encryption/encryption.component.html

@@ -0,0 +1,19 @@
+<ActionBar title="Encription">
+    <NavigationButton text="Back" ios.position="left"></NavigationButton>
+    <ActionItem text="Save" (tap)="save()" ios.position="right"></ActionItem>
+</ActionBar>
+<StackLayout>
+
+    <Label text="State: {{state}}" textWrap="true"></Label>
+
+    <TextField #databasename hint="Database Name"></TextField>
+    <TextField #databasepassword hint="Database Password"></TextField>
+    <Button text="Open" (tap)="open(databasename.text, databasepassword.text)"></Button>
+    <Button text="Close" (tap)="close()"></Button>
+    <ScrollView height="300">
+        <StackLayout>
+            <Label *ngFor="let log of logs" text="{{log}}" textWrap="true"></Label>
+        </StackLayout>
+    </ScrollView>
+
+</StackLayout>

ng-demo/app/components/encryption/encryption.component.ts

@@ -0,0 +1,47 @@
+import {Component} from "@angular/core";
+import {Location} from "@angular/common";
+import {CouchbaseInstance} from "../../couchbaseinstance";
+
+@Component({
+    selector: "encryption",
+    templateUrl: "./components/encryption/encryption.component.html"
+})
+export class EncryptionComponent {
+
+    //private couchbaseInstance: CouchbaseInstance;
+    private database: any;
+    logs: Array<string>;
+    state: string;
+
+    constructor(location: Location,private couchbaseInstance: CouchbaseInstance) {
+
+        this.logs= new Array<string>();
+        //if(this.couchbaseInstance && th)
+    }
+
+    save() {
+        // if(this.firstname != "" && this.lastname != "") {
+        //     this.database.createDocument({
+        //         "firstname": this.firstname,
+        //         "lastname": this.lastname
+        //     });
+        //     this.location.back();
+        // }
+    }
+
+    open(name:string, key: string){
+        this.database = this.couchbaseInstance.openDatabase(name, key);
+        if(!this.database){
+            this.logs.push("Error on open database")
+        }
+    }
+
+    close(){
+        if(this.couchbaseInstance.closeDatabase()){
+            this.logs.push("closed database")
+        }else {
+            this.logs.push("Error closing database");
+        }
+    }
+
+}

ng-demo/app/components/list/list.component.html

@@ -1,10 +1,21 @@
 <ActionBar title="Person List">
     <ActionItem text="Create" (tap)="create()" ios.position="right"></ActionItem>
 </ActionBar>
-<GridLayout>
+<StackLayout>
+    <TextField #asd hint="asd" text="asd"></TextField>
+
+    <Button text="Encription" (tap)="encryption()"></Button>
+
+
+
+    <GridLayout>
+
+
     <ListView [items]="personList">
         <template let-item="item">
             <Label [text]="item.firstname + ' ' + item.lastname"></Label>
         </template>
     </ListView>
 </GridLayout>
+</StackLayout>
+

ng-demo/app/components/list/list.component.ts

@@ -1,4 +1,4 @@
-import {Component, NgZone} from "@angular/core";
+import { Component, NgZone, OnInit } from '@angular/core';
 import {Router} from "@angular/router";
 import {Location} from "@angular/common";
 import {CouchbaseInstance} from "../../couchbaseinstance";
@@ -7,20 +7,31 @@ import {CouchbaseInstance} from "../../couchbaseinstance";
     selector: "my-app",
     templateUrl: "./components/list/list.component.html",
 })
-export class ListComponent {
+export class ListComponent implements OnInit{
 
     private database: any;
     private router: Router;
     private ngZone: NgZone;
     public personList: Array<Object>;
 
-    constructor(router: Router, location: Location, ngZone: NgZone, couchbaseInstance: CouchbaseInstance) {
+    constructor(router: Router, location: Location, ngZone: NgZone,public couchbaseInstance: CouchbaseInstance) {
         this.router = router;
         this.ngZone = ngZone;
-        this.database = couchbaseInstance.getDatabase();
+        // this.database = couchbaseInstance.getDatabase();
         this.personList = [];
+         location.subscribe((path) => {
+            this.refresh();
+        });
+
+    }
 
-        couchbaseInstance.startSync(true);
+    ngOnInit(){
+        if(!this.couchbaseInstance.getDatabase()){
+            this.database = this.couchbaseInstance.openDatabase("mypassword");
+        }else{
+            this.database = this.couchbaseInstance.getDatabase();
+        }
+
 
         this.database.addDatabaseChangeListener((changes) => {
             let changeIndex;
@@ -38,9 +49,7 @@ export class ListComponent {
             }
         });
 
-        location.subscribe((path) => {
-            this.refresh();
-        });
+
 
         this.refresh();
     }
@@ -49,12 +58,25 @@ export class ListComponent {
         this.router.navigate(["create"]);
     }
 
+    encryption(){
+        this.router.navigate(["encryption"]);
+    }
+
+
+
+
+
     private refresh() {
         this.personList = [];
-        let rows = this.database.executeQuery("people");
-        for(let i = 0; i < rows.length; i++) {
-            this.personList.push(rows[i]);
+        if(this.database){
+            let rows = this.database.executeQuery("people");
+            for(let i = 0; i < rows.length; i++) {
+                this.personList.push(rows[i]);
+            }
+        }else{
+            console.log("cant run database query on refresh, database is null");
         }
+
     }
 
     private indexOfObjectId(needle: string, haystack: any) {

ng-demo/app/couchbaseinstance.ts

@@ -10,33 +10,40 @@ export class CouchbaseInstance {
     private push: any;
 
     constructor() {
-        if(!this.isInstantiated) {
-            this.database = new Couchbase("test-database");
-            this.database.createView("people", "1", (document, emitter) => {
-                emitter.emit(document._id, document);
-            });
-            this.isInstantiated = true;
-        }
+
     }
 
-    getDatabase() {
+    closeDatabase(){
+        return this.database.closeDatabase();
+    }
+
+    openDatabase(name: string, key?: string){
+
+        this.database = new Couchbase(name,key);
+        this.database.createView("people", "1", (document, emitter) => {
+            emitter.emit(document._id, document);
+        });
+        return this.database;
+    }
+
+    getDatabase(): Couchbase {
         return this.database;
     }
 
     startSync(continuous: boolean) {
-        this.push = this.database.createPushReplication("http://192.168.57.1:4984/test-database");
-        this.pull = this.database.createPullReplication("http://192.168.57.1:4984/test-database");
+        // this.push = this.database.createPushReplication("http://192.168.57.1:4984/test-database");
+        // this.pull = this.database.createPullReplication("http://192.168.57.1:4984/test-database");
 
-        this.push.setContinuous(continuous);
-        this.pull.setContinuous(continuous);
+        // this.push.setContinuous(continuous);
+        // this.pull.setContinuous(continuous);
 
-        this.push.start();
-        this.pull.start();
+        // this.push.start();
+        // this.pull.start();
     }
 
     stopSync() {
-        this.push.stop();
-        this.pull.stop();
+        // this.push.stop();
+        // this.pull.stop();
     }
 
 }

package.json

@@ -20,6 +20,7 @@
     "android-angular": "npm run prepare-angular; cd ng-demo; tns run android",
     "android-vanilla": "npm run prepare-vanilla; cd demo; tns run android",
     "ios-angular": "npm run prepare-angular; cd ng-demo; tns emulate ios",
+    "ios-angular-deploy": "npm run prepare-angular; cd ng-demo; tns deploy ios",
     "ios-vanilla": "npm run prepare-vanilla; cd demo; tns emulate ios"
   },
   "repository": {

platforms/android/include.gradle

@@ -4,6 +4,7 @@ repositories {
 
 dependencies {
     compile 'com.couchbase.lite:couchbase-lite-android:1.3.1'
+    compile 'com.couchbase.lite:couchbase-lite-android-sqlcipher:+'
     compile 'com.google.code.gson:gson:2.6.2'
 }