Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tms wants to merge 5 commits into
base:master
Choose a base branch
from
Open

Add multiple login support, fix Google-related login issues #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bfbe6f
Rename UserOpenIds to the more-generic UserAuthClaims
tms Aug 23, 2015
08ebe49
Unify login logic so Google OAuth checks agains UserAuthClaims, Users…
tms Aug 24, 2015
6698bd8
Allow upgrading from legacy Google OpenID identifiers, add display (e…
tms Aug 30, 2015
5160eaf
Prevent #tabs from being duplicated as an ID
tms Aug 31, 2015
7e6cbaa
Add list of user logins, start cleaning up profile layout
tms Aug 31, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
public void TestBatchingBatch() {
string sql = "print 1 \nGO\nprint 2";
var site = Current.DB.Sites.First();
var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
var user = User.CreateUser("Fred", "a@a.com");
var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
public void TestMultiResultSetsInStatement() {
string sql = "select 1 select 2";
var site = Current.DB.Sites.First();
var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
var user = User.CreateUser("Fred", "a@a.com");
var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

Assert.AreEqual(2, results.ResultSets.Count());
Expand Down
27 changes: 4 additions & 23 deletions App/StackExchange.DataExplorer.Tests/Models/TestUser.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

[TestClass]
public class TestUser : BaseTest {

[TestMethod]
public void TestUserCreationSetsCreationDate() {
var u = User.CreateUser("Fred", "a@a.com", "xyz");
Assert.IsNotNull(u.CreationDate);
}

[TestMethod]
public void TestBasicUserCreation() {

User.CreateUser("Fred", "a@a.com", "xyz");

var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
Assert.AreEqual("Fred", u2.Login);

var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault();
Assert.AreEqual("xyz", o.OpenIdClaim);
}

[TestMethod]
public void TestNoName() {

Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

var u1 = User.CreateUser("", null, "xyz");
var u2 = User.CreateUser(null, "", "xyz1");
var u1 = User.CreateUser("", null);
var u2 = User.CreateUser(null, "");

Assert.AreEqual("jon.doe", u1.Login);
// This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

var u1 = User.CreateUser("jon doe", null, "xyz");
var u1 = User.CreateUser("jon doe", null);
Assert.AreEqual("jon.doe", u1.Login);
}

[TestMethod]
public void TestWeirdChars() {
var u1 = User.CreateUser("jon&*doe", null, "xyz");
var u1 = User.CreateUser("jon&*doe", null);
Assert.AreEqual(u1.Login, "jondoe");
}
}
Expand Down
6 changes: 6 additions & 0 deletions App/StackExchange.DataExplorer/App_Start/BundleConfig.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
.Include("~/Content/homepage.css")
.Include("~/Content/topbar.css", new CssRewriteUrlTransform())
.Include("~/Content/header.css", new CssRewriteUrlTransform())
.Include("~/Content/user.css")
.Include("~/Content/jquery.autocomplete.css")
);

bundles.Add(new StyleBundle("~/assets/css/login")
.Include("~/Content/login.css", new CssRewriteUrlTransform())
.Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
);

bundles.Add(new StyleBundle("~/assets/css/query")
.Include("~/Content/codemirror/codemirror.css")
.Include("~/Content/codemirror/custom.css")
Expand Down
8 changes: 4 additions & 4 deletions App/StackExchange.DataExplorer/Content/header.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
margin-bottom: 0;
}

#tabs {
.nav-tabs {
float: right;
}

.miniTabs {
margin-left: 5px;
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
background:none repeat scroll 0 0 #fff;
border: 1px solid #fff;
color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
background: none repeat scroll 0 0 #FFFFFF;
border-color: #CCC #CCC #FFFFFF;
border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
background: none repeat scroll 0 0 #FFFFFF;
border-color: #CCC #CCC #FFFFFF;
border-style: solid;
Expand Down
8 changes: 8 additions & 0 deletions App/StackExchange.DataExplorer/Content/login-providers.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }
104 changes: 104 additions & 0 deletions App/StackExchange.DataExplorer/Content/user.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
border: 0px;
font-size: 13px;
line-height: 1.3em;
height: auto;
padding: 11px 7px 12px 7px;
margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
color: #0C57A0;
border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
font-weight: bold;
color: #0C57A0;
border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
float: right;
font-weight: bold;
margin-top: -22px;
}

.user-profile #user-logins {
list-style-type: none;
margin: 0;
}

.user-profile .user-login {
margin-top: 14px;
margin-bottom: 20px;
padding-left: 24px;
}

.user-profile .user-login h2 {
font-size: 16px;
margin-left: -24px;
}

.user-profile .user-login span.icon {
background-image: url('./img/login-icons.svg');
background-repeat: no-repeat;
display: inline-block;
width: 16px;
height: 16px;
margin-bottom: -2px;
margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
display: block;
margin-top: 5px;
color: #CCC;
}

.sectioned-nav {
float: left;
list-style-type: none;
margin: 0;
width: 220px;
}

.sectioned-nav li {
padding: 10px;
padding-right: 0;
}

.sectioned-nav li:hover {
background-color: #D8E8F7;
}

.sectioned-nav li a {
display: block;
color: #777;
padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
text-decoration: none;
border-right: 3px solid #0C57A0;
color: #0C57A0;
}

.sectioned-nav li.youarehere a {
font-weight: bold;
}

.sectioned-content {
margin-left: 220px;
padding-left: 50px;
padding-top: 10px;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add multiple login support, fix Google-related login issues#72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

tms
wants to merge
5
commits into

base:master
Choose a base branch

from

 Open


Add multiple login support, fix Google-related login issues
#72
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
1bfbe6f

Rename UserOpenIds to the more-generic UserAuthClaims


tms Aug 23, 2015
08ebe49

Unify login logic so Google OAuth checks agains UserAuthClaims, Users…


tms Aug 24, 2015
6698bd8

Allow upgrading from legacy Google OpenID identifiers, add display (e…


tms Aug 30, 2015
5160eaf

Prevent #tabs from being duplicated as an ID


tms Aug 31, 2015
7e6cbaa

Add list of user logins, start cleaning up profile layout


tms Aug 31, 2015

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
App/StackExchange.DataExplorer.Tests/Models/TestQueryExecutions.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ public class TestQueryExecutions : BaseTest {
 public void TestBatchingBatch() {
 string sql = "print 1 \nGO\nprint 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(0, results.ResultSets.Count());
Expand All@@ -27,7 +27,7 @@ public void TestBatchingBatch() {
 public void TestMultiResultSetsInStatement() {
 string sql = "select 1 select 2";
 var site = Current.DB.Sites.First();
 var user = User.CreateUser("Fred", "a@a.com", "xyzdsa");
 var user = User.CreateUser("Fred", "a@a.com");
 var results = QueryRunner.ExecuteNonCached(new ParsedQuery(sql, null), site, user, null);

 Assert.AreEqual(2, results.ResultSets.Count());
Expand Down

27 changes: 4 additions & 23 deletions
App/StackExchange.DataExplorer.Tests/Models/TestUser.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,32 +12,13 @@ namespace StackExchange.DataExplorer.Tests.Models {

 [TestClass]
 public class TestUser : BaseTest {

 [TestMethod]
 public void TestUserCreationSetsCreationDate() {
 var u = User.CreateUser("Fred", "a@a.com", "xyz");
 Assert.IsNotNull(u.CreationDate);
 }

 [TestMethod]
 public void TestBasicUserCreation() {

 User.CreateUser("Fred", "a@a.com", "xyz");

 var u2 = Current.DB.Query<User>("select * from Users where Login = @Login", new {Login = "Fred"}).First();
 Assert.AreEqual("Fred", u2.Login);

 var o = Current.DB.Query<UserOpenId>("select * from UserOpenIds where OpenIdClaim = @claim", new {claim = "xyz"}).FirstOrDefault(); 
 Assert.AreEqual("xyz", o.OpenIdClaim);
 }

 [TestMethod]
 public void TestNoName() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("", null, "xyz");
 var u2 = User.CreateUser(null, "", "xyz1");
 var u1 = User.CreateUser("", null);
 var u2 = User.CreateUser(null, "");

 Assert.AreEqual("jon.doe", u1.Login);
 // This behaviour is probably not what we want
Expand All@@ -49,13 +30,13 @@ public void TestNoSpaces() {

 Current.DB.Execute("delete from Users where Login like 'jon.doe%'");

 var u1 = User.CreateUser("jon doe", null, "xyz");
 var u1 = User.CreateUser("jon doe", null);
 Assert.AreEqual("jon.doe", u1.Login);
 }

 [TestMethod]
 public void TestWeirdChars() {
 var u1 = User.CreateUser("jon&*doe", null, "xyz");
 var u1 = User.CreateUser("jon&*doe", null);
 Assert.AreEqual(u1.Login, "jondoe");
 } 
 }
Expand Down

6 changes: 6 additions & 0 deletions
App/StackExchange.DataExplorer/App_Start/BundleConfig.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,9 +61,15 @@ private static void RegisterBundles(BundleCollection bundles)
 .Include("~/Content/homepage.css")
 .Include("~/Content/topbar.css", new CssRewriteUrlTransform())
 .Include("~/Content/header.css", new CssRewriteUrlTransform())
 .Include("~/Content/user.css")
 .Include("~/Content/jquery.autocomplete.css")
 );

 bundles.Add(new StyleBundle("~/assets/css/login")
 .Include("~/Content/login.css", new CssRewriteUrlTransform())
 .Include("~/Content/login-providers.css", new CssRewriteUrlTransform())
 );

 bundles.Add(new StyleBundle("~/assets/css/query")
 .Include("~/Content/codemirror/codemirror.css")
 .Include("~/Content/codemirror/custom.css")
Expand Down

8 changes: 4 additions & 4 deletions
App/StackExchange.DataExplorer/Content/header.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -130,15 +130,15 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-bottom: 0;
}

#tabs {
.nav-tabs {
 float: right;
}

.miniTabs {
 margin-left: 5px; 
}

#tabs a, .miniTabs a {
.nav-tabs a, .miniTabs a {
 background:none repeat scroll 0 0 #fff;
 border: 1px solid #fff;
 color: #777;
Expand All@@ -152,7 +152,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 text-decoration: none;
}

#tabs a:hover, .miniTabs a:hover {
.nav-tabs a:hover, .miniTabs a:hover {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand All@@ -161,7 +161,7 @@ nav.primary .site-selector-popup .ac_results li.ac_over {
 margin-top: 9px;
}

#tabs a.youarehere, .miniTabs a.youarehere {
.nav-tabs a.youarehere, .miniTabs a.youarehere {
 background: none repeat scroll 0 0 #FFFFFF;
 border-color: #CCC #CCC #FFFFFF;
 border-style: solid;
Expand Down

8 changes: 8 additions & 0 deletions
App/StackExchange.DataExplorer/Content/login-providers.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
.stackexchange { background-position: -356px 0; }
.google { background-position: -426px 0; }
.yahoo { background-position: 1px 4px; }
.livejournal { background-position: -73px 4px; }
.wordpress { background-position: -38px 4px; }
.blogger { background-position: -108px 4px; }
.verisign { background-position: -458px 4px; }
.aol { background-position: -142px 4px; }

104 changes: 104 additions & 0 deletions
App/StackExchange.DataExplorer/Content/user.css

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
.user-profile .page > .subheader {
 height: 40px;
}

.user-profile .page > .subheader .nav-tabs {
 float: left;
}

.user-profile .page > .subheader .nav-tabs a,
.user-profile .page > .subheader .nav-tabs a.youarehere {
 border: 0px;
 font-size: 13px;
 line-height: 1.3em;
 height: auto;
 padding: 11px 7px 12px 7px;
 margin: 0 20px 0 0;
}

.user-profile .page > .subheader .nav-tabs a:hover {
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile .page > .subheader .nav-tabs a.youarehere {
 font-weight: bold;
 color: #0C57A0;
 border-bottom: 2px solid #0C57A0;
}

.user-profile #add-login {
 float: right;
 font-weight: bold;
 margin-top: -22px;
}

.user-profile #user-logins {
 list-style-type: none;
 margin: 0;
}

.user-profile .user-login {
 margin-top: 14px;
 margin-bottom: 20px;
 padding-left: 24px;
}

.user-profile .user-login h2 {
 font-size: 16px;
 margin-left: -24px;
}

.user-profile .user-login span.icon {
 background-image: url('./img/login-icons.svg');
 background-repeat: no-repeat;
 display: inline-block;
 width: 16px;
 height: 16px;
 margin-bottom: -2px;
 margin-right: 8px;
}

.user-profile .user-login .claim-identifier {
 display: block;
 margin-top: 5px;
 color: #CCC;
}

.sectioned-nav {
 float: left;
 list-style-type: none;
 margin: 0;
 width: 220px;
}

.sectioned-nav li {
 padding: 10px;
 padding-right: 0;
}

.sectioned-nav li:hover {
 background-color: #D8E8F7;
}

.sectioned-nav li a {
 display: block;
 color: #777;
 padding: 4px;
}

.sectioned-nav li:hover a, .sectioned-nav li.youarehere a {
 text-decoration: none;
 border-right: 3px solid #0C57A0;
 color: #0C57A0;
}

.sectioned-nav li.youarehere a {
 font-weight: bold;
}

.sectioned-content {
 margin-left: 220px;
 padding-left: 50px;
 padding-top: 10px;
}
Loading