Merge pull request #3 from metabase/update_version

salsakran · web-flow · commit 2fbc630dd183 · 2018-04-02T16:13:20.000-07:00
update to a more recent version + Include the admin password on a reg…
diff --git a/README.md b/README.md
@@ -13,4 +13,9 @@ For the Node application
 
 For the rails application
 `rails server -p 3001`
-(Note that we're binding to a nonstandard port as Metabase also runs on 3000)
+(Note that we're binding to a nonstandard port as Metabase also runs on 3000)
+
+# Helpful info
+Admin login is
+user: plucky@admin.com
+password: Metabase123
diff --git a/django/embedded_analytics/db.sqlite3 b/django/embedded_analytics/db.sqlite3
diff --git a/django/embedded_analytics/user_stats/templates/user_stats/index.html b/django/embedded_analytics/user_stats/templates/user_stats/index.html
@@ -16,11 +16,11 @@ <h1>Embedding <span class="text-brand">Metabase</span> in Django</h1>
         <section id="public">
             <h2>Public Embeds</h2>
             <p>
-                One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
+                One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
             </p>
 
             <iframe
-			   src="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1"
+			   src="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40"
                frameborder="0"
                width="800"
                height="600"
@@ -29,11 +29,11 @@ <h2>Public Embeds</h2>
            </iframe>
 
             <p>
-            Similarly, we can embed a <a href="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8">single question's chart</a> in our application as below. 
+            Similarly, we can embed a <a href="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef">single question's chart</a> in our application as below. 
             </p>
 
             <iframe
-                src="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8"
+                src="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef"
                 frameborder="0"   
                 width="800"
                 height="600"
diff --git a/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html b/django/embedded_analytics/user_stats/templates/user_stats/signed_chart.html
@@ -48,7 +48,7 @@ <h1>Embedding charts with signed parameters</h1>
     <h1>Orders for User: {{user_id}}</h1>
 
     <iframe
-        src="http://{{iframeUrl}}"
+        src="http://{{iframeUrl}}" 
         frameborder="0"
         width="800"
         height="600"
diff --git a/django/embedded_analytics/user_stats/views.py b/django/embedded_analytics/user_stats/views.py
@@ -5,7 +5,7 @@
 
 
 METABASE_SITE_URL = "localhost:3000"
-METABASE_SECRET_KEY = "f8a86a48501150b3561e5cd3ff07865f6b400ecceca58882cdd4adfa07f2c488"
+METABASE_SECRET_KEY = "a1c0952f3ff361f1e7dd8433a0a50689a004317a198ecb0a67ba90c73c27a958"
 
 
 
@@ -31,9 +31,9 @@ def signed_public_dashboard(request):
 @login_required
 def signed_chart(request, user_id):
     payload = {
-        "resource": {"question": 6},
+        "resource": {"question": 2},
         "params": {
-            "user_id": user_id
+            "person_id": user_id
         }
     }
 
diff --git a/laravel/embedded_analytics/resources/views/signed_chart.blade.php b/laravel/embedded_analytics/resources/views/signed_chart.blade.php
@@ -184,10 +184,10 @@
 $signer = new Sha256();
 $token = (new Builder())
     ->set('resource', [
-        'question' => 6
+        'question' => 2
     ])
     ->set('params', [
-        'user_id' => $userId
+        'person_id' => $userId
     ])
     ->sign($signer, $metabaseSecretKey)
     ->getToken();
diff --git a/laravel/embedded_analytics/resources/views/signed_dashboard.blade.php b/laravel/embedded_analytics/resources/views/signed_dashboard.blade.php
@@ -191,6 +191,7 @@
         'dashboard' => 2
     ])
     ->set('params', [
+    'id' => $userId
     ])
     ->sign($signer, $metabaseSecretKey)
     ->getToken();
diff --git a/laravel/embedded_analytics/resources/views/welcome.blade.php b/laravel/embedded_analytics/resources/views/welcome.blade.php
@@ -177,11 +177,11 @@
                 <section id="public">
                     <h2>Public Embeds</h2>
                     <p>
-                        One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
+                        One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
                     </p>
 
                     <iframe
-                       src="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1"
+                       src="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40"
                        frameborder="0"
                        width="800"
                        height="600"
@@ -190,11 +190,11 @@
                    </iframe>
 
                     <p>
-                    Similarly, we can embed a <a href="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8">single question's chart</a> in our application as below.
+                    Similarly, we can embed a <a href="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef">single question's chart</a> in our application as below.
                     </p>
 
                     <iframe
-                        src="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8"
+                        src="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef"
                         frameborder="0"
                         width="800"
                         height="600"
diff --git a/metabase/metabase.db.mv.db b/metabase/metabase.db.mv.db
diff --git a/metabase/metabase.db.trace.db b/metabase/metabase.db.trace.db
@@ -1,3 +1,3 @@
-2017-03-09 15:27:44 jdbc[4]: exception
+2018-03-29 11:30:55 jdbc[4]: exception
 org.h2.jdbc.JdbcSQLException: Table "DATABASECHANGELOGLOCK" not found; SQL statement:
-select count(*) from PUBLIC.DATABASECHANGELOGLOCK [42102-193]
+select count(*) from PUBLIC.DATABASECHANGELOGLOCK [42102-194]
diff --git a/metabase/metabase.jar b/metabase/metabase.jar
diff --git a/node/index.js b/node/index.js
@@ -7,7 +7,7 @@ const PORT = process.env["PORT"] ? parseInt(process.env["PORT"]) : 3001;
 
 // these should match the settings in your Metabase instance
 let MB_SITE_URL = "http://localhost:3000";
-let MB_EMBEDDING_SECRET_KEY = "230e14ec089b2d22dd984dcd057b14df93e91f814f6f2526f2d10336ea40bf26";
+let MB_EMBEDDING_SECRET_KEY = "a1c0952f3ff361f1e7dd8433a0a50689a004317a198ecb0a67ba90c73c27a958";
 
 let payload = {
   resource: { dashboard: 1 },
@@ -24,7 +24,7 @@ function checkAuth(req, res, next) {
 }
 
 // the dashboard ID of a dashboard that has a `user_id` parameter
-const DASHBOARD_ID = 1;
+const DASHBOARD_ID = 2;
 
 if (!MB_EMBEDDING_SECRET_KEY) {
   throw new Error("Please set MB_EMBEDDING_SECRET_KEY.");
@@ -68,22 +68,22 @@ app.get("/logout", (req, res) => {
 app.get("/signed_chart/:id", checkAuth, (req, res) => {
     const userId = req.session.userId;
     const unsignedToken = {
-        resource: { dashboard: DASHBOARD_ID },
-        params: { user_id: userId }
+        resource: { question: 2 },
+        params: { person_id: userId }
     };
 
     // sign the JWT token with our secret key
     const signedToken = jwt.sign(unsignedToken, MB_EMBEDDING_SECRET_KEY);
     // construct the URL of the iframe to be displayed
-    const iframeUrl = `${MB_SITE_URL}/embed/dashboard/${signedToken}`;
+    const iframeUrl = `${MB_SITE_URL}/embed/question/${signedToken}`;
     res.render("chart", { userId: req.params.id, iframeUrl: iframeUrl });
 })
 
 app.get("/signed_dashboard/:id", checkAuth, (req, res) => {
     const userId = req.session.userId;
     const unsignedToken = {
         resource: { dashboard: DASHBOARD_ID },
-        params: { user_id: userId }
+        params: { id: userId }
     };
     // sign the JWT token with our secret key
     const signedToken = jwt.sign(unsignedToken, MB_EMBEDDING_SECRET_KEY);
diff --git a/node/views/chart.pug b/node/views/chart.pug
@@ -26,7 +26,7 @@ block content
 
     pre.
         &lt;iframe
-            src="http://{iframeUrl}"
+            src="#{iframeUrl}"
             frameborder="0"
             width="800"
             height="600"
@@ -40,7 +40,7 @@ block content
     h1 Orders for User: #{userId}</h1>
 
     iframe(
-        src="http://{iframeUrl}"
+        src=iframeUrl
         frameborder="0"
         width="800"
         height="600"
diff --git a/node/views/dashboard.pug b/node/views/dashboard.pug
@@ -32,7 +32,7 @@ block content
 
     pre.
         &lt;iframe
-            src="http://{iframeUrl}"
+            src="{iframeUrl}"
             frameborder="0"
             width="800"
             height="600"
@@ -45,7 +45,7 @@ block content
 
     h2 Stats for User: #{userId}
 
-    iframe(src="http://{{iframeUrl}}" 
+    iframe(src=iframeUrl
             width="1200" 
             height="800" 
             frameborder="0")
diff --git a/node/views/index.pug b/node/views/index.pug
@@ -13,13 +13,13 @@ block content
 
             section(id="public")
                 h2 Public Embeds
-                p One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
+                p One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
 
-                iframe(src="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1" frameborder="0" width="800" height="600" allowtransparency)
+                iframe(src="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40" frameborder="0" width="800" height="600" allowtransparency)
 
-                p Similarly, we can embed a a(href="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8")single question's chart in our application as below. 
+                p Similarly, we can embed a a(href="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef")single question's chart in our application as below. 
 
-                iframe(src="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8" frameborder="0"               width="800" height="600" allowtransparency)
+                iframe(src="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef" frameborder="0"               width="800" height="600" allowtransparency)
 
             section(id="signed")
                 h2 Signed Embedding
diff --git a/prepare.sh b/prepare.sh
@@ -3,9 +3,9 @@
 set -eu
 
 METABASE_JAR="./metabase/metabase.jar"
-METABASE_VERSION=v0.23.0
+METABASE_VERSION=v0.28.3
 METABASE_URL="http://downloads.metabase.com/$METABASE_VERSION/metabase.jar"
 
 echo -n "-----> Downloading Metabase... "
 curl -s --retry 3 -o $METABASE_JAR -L $METABASE_URL
-echo "done"
+echo "done"
diff --git a/rails/embedded_analytics/app/controllers/stats_controller.rb b/rails/embedded_analytics/app/controllers/stats_controller.rb
@@ -1,8 +1,8 @@
 class StatsController < ApplicationController
   before_action :authenticate_user!
   
-  METABASE_SITE_URL = "http://localhost:3000"
-  METABASE_SECRET_KEY = "230e14ec089b2d22dd984dcd057b14df93e91f814f6f2526f2d10336ea40bf26"
+  METABASE_SITE_URL = "localhost:3000"
+  METABASE_SECRET_KEY = "a1c0952f3ff361f1e7dd8433a0a50689a004317a198ecb0a67ba90c73c27a958"
   
   def index
   	payload = {
@@ -18,9 +18,9 @@ def index
 
   def signed_chart
   	payload = {
-	  :resource => {:question => 6},
+	  :resource => {:question => 2},
 	  :params => {
-	    "id" => current_user.id
+	    "person_id" => current_user.id
 	  }
 	}
 	token = JWT.encode payload, METABASE_SECRET_KEY
diff --git a/rails/embedded_analytics/app/views/welcome/index.html.erb b/rails/embedded_analytics/app/views/welcome/index.html.erb
@@ -13,11 +13,11 @@
         <section id="public">
             <h2>Public Embeds</h2>
             <p>
-                One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
+                One is to simply use the public link urls inside of an iframe. In this case, the same public dashboard you see via a <a href="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40">Public Dashboard</a> link, is embedded directly in your application. This can also be embedded in a blog, or really anywhere that you can insert HTML. It has a secure URL in that a user can only look at the contents of the dashboard being shared. An end user never has information they can use to modify the url and gain access to any other resources on your Metabase instance. That same dashboard can be seen embedded in this page below.
             </p>
 
             <iframe
-               src="http://localhost:3000/public/dashboard/be1e6baa-9b97-4534-8ac0-4a45b5bbf4e1"
+               src="http://localhost:3000/public/dashboard/e104be98-2ea1-4dce-abff-aa3cfeddfe40"
                frameborder="0"
                width="800"
                height="600"
@@ -26,11 +26,11 @@
            </iframe>
 
             <p>
-            Similarly, we can embed a <a href="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8">single question's chart</a> in our application as below. 
+            Similarly, we can embed a <a href="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef">single question's chart</a> in our application as below. 
             </p>
 
             <iframe
-                src="http://localhost:3000/public/question/2b03b37a-52ec-4ea5-a628-2d1a967c55c8"
+                src="http://localhost:3000/public/question/938a446c-da62-479a-a1bd-913cd29a77ef"
                 frameborder="0"   
                 width="800"
                 height="600"
diff --git a/rails/embedded_analytics/db/development.sqlite3 b/rails/embedded_analytics/db/development.sqlite3

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`METABASE_SITE_URL = "localhost:3000"`
`8`		`-METABASE_SECRET_KEY = "f8a86a48501150b3561e5cd3ff07865f6b400ecceca58882cdd4adfa07f2c488"`
	`8`	`+METABASE_SECRET_KEY = "a1c0952f3ff361f1e7dd8433a0a50689a004317a198ecb0a67ba90c73c27a958"`
`9`	`9`
`10`	`10`
`11`	`11`
`@@ -31,9 +31,9 @@ def signed_public_dashboard(request):`
`31`	`31`	`@login_required`
`32`	`32`	`def signed_chart(request, user_id):`
`33`	`33`	`payload = {`
`34`		`- "resource": {"question": 6},`
	`34`	`+ "resource": {"question": 2},`
`35`	`35`	`"params": {`
`36`		`- "user_id": user_id`
	`36`	`+ "person_id": user_id`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`