Merge branch 'master' into login-lower-1167

Author: cgati

Cargo.lock

@@ -35,7 +35,7 @@ semver = "0.5"
 url = "1.2.1"
 tar = "0.4.13"
 
-r2d2 = "0.7.0"
+r2d2 = "0.8.0"
 openssl = "0.9.14"
 curl = "0.4"
 oauth2 = "0.3"
@@ -46,10 +46,9 @@ htmlescape = "0.3.1"
 license-exprs = "^1.3"
 dotenv = "0.10.0"
 toml = "0.4"
-diesel = { version = "0.16.0", features = ["postgres", "serde_json", "chrono"] }
-diesel_codegen = "0.16.0"
-r2d2-diesel = "0.16.0"
-diesel_full_text_search = "0.16.0"
+diesel = { version = "1.0.0-beta1", features = ["postgres", "serde_json", "chrono"] }
+r2d2-diesel = "1.0.0-beta1"
+diesel_full_text_search = "1.0.0-beta1"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
@@ -59,6 +58,7 @@ ammonia = "1.0.0"
 docopt = "0.8.1"
 itertools = "0.6.0"
 lettre = "0.6"
+scheduled-thread-pool = "0.2.0"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"
@@ -82,8 +82,5 @@ tokio-service = "0.1"
 
 [build-dependencies]
 dotenv = "0.10"
-diesel = { version = "0.16.0", features = ["postgres"] }
-
-[replace]
-"diesel:0.16.0" = { git = "https://github.com/diesel-rs/diesel.git" }
-"diesel_codegen:0.16.0" = { git = "https://github.com/diesel-rs/diesel.git" }
+diesel = { version = "1.0.0-beta1", features = ["postgres"] }
+diesel_migrations = { version = "1.0.0-beta1", features = ["postgres"] }

Cargo.toml

@@ -13,32 +13,33 @@ export default Component.extend({
     },
 
     actions: {
-        saveToken() {
-            this.get('api_token')
-                .save()
-                .then(() => this.set('serverError', null))
-                .catch(err => {
-                    let msg;
-                    if (err.errors && err.errors[0] && err.errors[0].detail) {
-                        msg = `An error occurred while saving this token, ${err.errors[0].detail}`;
-                    } else {
-                        msg = 'An unknown error occurred while saving this token';
-                    }
-                    this.set('serverError', msg);
-                });
+        async saveToken() {
+            try {
+                await this.get('api_token').save();
+                this.set('serverError', null);
+            } catch(err) {
+                let msg;
+                if (err.errors && err.errors[0] && err.errors[0].detail) {
+                    msg = `An error occurred while saving this token, ${err.errors[0].detail}`;
+                } else {
+                    msg = 'An unknown error occurred while saving this token';
+                }
+                this.set('serverError', msg);
+            }
         },
-        revokeToken() {
-            this.get('api_token')
-                .destroyRecord()
-                .catch(err => {
-                    let msg;
-                    if (err.errors && err.errors[0] && err.errors[0].detail) {
-                        msg = `An error occurred while revoking this token, ${err.errors[0].detail}`;
-                    } else {
-                        msg = 'An unknown error occurred while revoking this token';
-                    }
-                    this.set('serverError', msg);
-                });
+
+        async revokeToken() {
+            try {
+                await this.get('api_token').destroyRecord();
+            } catch(err) {
+                let msg;
+                if (err.errors && err.errors[0] && err.errors[0].detail) {
+                    msg = `An error occurred while revoking this token, ${err.errors[0].detail}`;
+                } else {
+                    msg = 'An unknown error occurred while revoking this token';
+                }
+                this.set('serverError', msg);
+            }
         },
     }
 });

app/components/api-token-row.js

@@ -92,22 +92,21 @@ export default Component.extend({
             this.set('value', this.get('prevEmail'));
         },
 
-        resendEmail() {
+        async resendEmail() {
             let user = this.get('user');
 
-            this.get('ajax').raw(`/api/v1/users/${user.id}/resend`, {
-                method: 'PUT'
-            })
-                .then(() => this.set('disableResend', true))
-                .catch((error) => {
-                    if (error.payload) {
-                        this.set('isError', true);
-                        this.set('emailError', `Error in resending message: ${error.payload.errors[0].detail}`);
-                    } else {
-                        this.set('isError', true);
-                        this.set('emailError', 'Unknown error in resending message');
-                    }
-                });
+            try {
+                await this.get('ajax').raw(`/api/v1/users/${user.id}/resend`, { method: 'PUT' });
+                this.set('disableResend', true);
+            } catch(error) {
+                if (error.payload) {
+                    this.set('isError', true);
+                    this.set('emailError', `Error in resending message: ${error.payload.errors[0].detail}`);
+                } else {
+                    this.set('isError', true);
+                    this.set('emailError', 'Unknown error in resending message');
+                }
+            }
         }
     }
 });