From e27db2ed63fd3c9c686c049a9b9049a907985ecc Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 13 Aug 2015 12:03:47 -0400
Subject: initial server implementation for using google as a single-sign-on
 oauth service

---
 model/google.go | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 model/google.go

(limited to 'model/google.go')

diff --git a/model/google.go b/model/google.go
new file mode 100644
index 000000000..bdb500704
--- /dev/null
+++ b/model/google.go
@@ -0,0 +1,54 @@
+// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package model
+
+import (
+	"encoding/json"
+	"io"
+)
+
+const (
+	USER_AUTH_SERVICE_GOOGLE = "google"
+)
+
+type GoogleUser struct {
+	Id       string              `json:"id"`
+	Nickname string              `json:"nickname"`
+	Emails   []map[string]string `json:"emails"`
+	Names    map[string]string   `json:"name"`
+}
+
+func UserFromGoogleUser(gu *GoogleUser) *User {
+	user := &User{}
+	user.Username = gu.Nickname
+	user.FirstName = gu.Names["givenName"]
+	user.LastName = gu.Names["familyName"]
+	user.Nickname = gu.Nickname
+
+	for _, e := range gu.Emails {
+		if e["type"] == "account" {
+			user.Email = e["value"]
+		}
+	}
+
+	user.AuthData = gu.Id
+	user.AuthService = USER_AUTH_SERVICE_GOOGLE
+
+	return user
+}
+
+func GoogleUserFromJson(data io.Reader) *GoogleUser {
+	decoder := json.NewDecoder(data)
+	var gu GoogleUser
+	err := decoder.Decode(&gu)
+	if err == nil {
+		return &gu
+	} else {
+		return nil
+	}
+}
+
+func (gu *GoogleUser) GetAuthData() string {
+	return gu.Id
+}
-- 
cgit v1.2.3-1-g7c22


From b704e9489b21b3bec17f5c8b573a1724781ee6f7 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 14 Aug 2015 08:43:49 -0400
Subject: added google sign-in functionality to the client, with minor model
 modifications

---
 model/google.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'model/google.go')

diff --git a/model/google.go b/model/google.go
index bdb500704..2a1eb3caa 100644
--- a/model/google.go
+++ b/model/google.go
@@ -6,6 +6,7 @@ package model
 import (
 	"encoding/json"
 	"io"
+	"strings"
 )
 
 const (
@@ -13,15 +14,20 @@ const (
 )
 
 type GoogleUser struct {
-	Id       string              `json:"id"`
-	Nickname string              `json:"nickname"`
-	Emails   []map[string]string `json:"emails"`
-	Names    map[string]string   `json:"name"`
+	Id          string              `json:"id"`
+	Nickname    string              `json:"nickname"`
+	DisplayName string              `json:"displayName"`
+	Emails      []map[string]string `json:"emails"`
+	Names       map[string]string   `json:"name"`
 }
 
 func UserFromGoogleUser(gu *GoogleUser) *User {
 	user := &User{}
-	user.Username = gu.Nickname
+	if len(gu.Nickname) > 0 {
+		user.Username = gu.Nickname
+	} else {
+		user.Username = strings.ToLower(strings.Replace(gu.DisplayName, " ", "", -1))
+	}
 	user.FirstName = gu.Names["givenName"]
 	user.LastName = gu.Names["familyName"]
 	user.Nickname = gu.Nickname
-- 
cgit v1.2.3-1-g7c22