From dfc10cdfddc44043543b9cfdcbe915d158056678 Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 17 Sep 2013 13:56:40 -0400
Subject: Bug 916955 - Ember.show API doesn't error if an invalid token is
 provided

---
 extensions/Ember/lib/WebService.pm                                  | 6 ++++++
 .../template/en/default/hook/global/user-error-errors.html.tmpl     | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 extensions/Ember/template/en/default/hook/global/user-error-errors.html.tmpl

(limited to 'extensions/Ember')

diff --git a/extensions/Ember/lib/WebService.pm b/extensions/Ember/lib/WebService.pm
index bb4e5f8ad..4f7a0c713 100644
--- a/extensions/Ember/lib/WebService.pm
+++ b/extensions/Ember/lib/WebService.pm
@@ -114,6 +114,12 @@ sub show {
 
     Bugzilla->switch_to_shadow_db();
 
+    # Throw error if token was provided and user is not logged
+    # in meaning token was invalid/expired.
+    if (exists $params->{token} && !Bugzilla->user->id) {
+        ThrowUserError('invalid_token');
+    }
+
     my $bug_id = delete $params->{id};
     $bug_id || ThrowCodeError('params_required',
                               { function => 'Ember.show', params => ['id'] });
diff --git a/extensions/Ember/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Ember/template/en/default/hook/global/user-error-errors.html.tmpl
new file mode 100644
index 000000000..c438af283
--- /dev/null
+++ b/extensions/Ember/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -0,0 +1,4 @@
+[% IF error == "invalid_token" %]
+  [% title = "Invalid Token Provided" %]
+  The token provided is either invalid or expired. You must log in again.
+[% END %]
-- 
cgit v1.2.3-24-g4f1b