finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mirror fix on oauth2

Browse source
This commit is contained in:
Unknwon 2014-11-28 21:38:35 -05:00
parent d6132aaa88
commit db4951bc61
3 changed files with 40 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/social/social.go
View file

@ -39,6 +39,8 @@ func NewOauthService() {
return return
} }
oauth2.AppSubUrl = setting.AppSubUrl
setting.OauthService = &setting.Oauther{} setting.OauthService = &setting.Oauther{}
setting.OauthService.OauthInfos = make(map[string]*setting.OauthInfo) setting.OauthService.OauthInfos = make(map[string]*setting.OauthInfo)

82
routers/user/social.go
View file

@ -8,36 +8,28 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"net/url"
// "strings" // "strings"
// "time" "time"
"github.com/macaron-contrib/oauth2" "github.com/macaron-contrib/oauth2"
// "github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware" "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/social" "github.com/gogits/gogs/modules/social"
) )
func extractPath(next string) string {
n, err := url.Parse(next)
if err != nil {
return setting.AppSubUrl + "/"
}
return n.Path
}
func SocialSignIn(ctx *middleware.Context) { func SocialSignIn(ctx *middleware.Context) {
if setting.OauthService == nil { if setting.OauthService == nil {
ctx.Handle(404, "OAuth2 service not enabled", nil) ctx.Handle(404, "OAuth2 service not enabled", nil)
return return
} }
next := setting.AppSubUrl + "/user/login"
info := ctx.Session.Get(oauth2.KEY_TOKEN) info := ctx.Session.Get(oauth2.KEY_TOKEN)
if info == nil { if info == nil {
ctx.Redirect(setting.AppSubUrl + "/user/login") ctx.Redirect(next)
return return
} }
@ -61,39 +53,39 @@ func SocialSignIn(ctx *middleware.Context) {
} }
log.Info("social.SocialSignIn(social login): %s", ui) log.Info("social.SocialSignIn(social login): %s", ui)
// oa, err := models.GetOauth2(ui.Identity) oa, err := models.GetOauth2(ui.Identity)
// switch err { switch err {
// case nil: case nil:
// ctx.Session.Set("uid", oa.User.Id) ctx.Session.Set("uid", oa.User.Id)
// ctx.Session.Set("uname", oa.User.Name) ctx.Session.Set("uname", oa.User.Name)
// case models.ErrOauth2RecordNotExist: case models.ErrOauth2RecordNotExist:
// raw, _ := json.Marshal(tk) raw, _ := json.Marshal(tk)
// oa = &models.Oauth2{ oa = &models.Oauth2{
// Uid: -1, Uid: -1,
// Type: connect.Type(), Type: connect.Type(),
// Identity: ui.Identity, Identity: ui.Identity,
// Token: string(raw), Token: string(raw),
// } }
// log.Trace("social.SocialSignIn(oa): %v", oa) log.Trace("social.SocialSignIn(oa): %v", oa)
// if err = models.AddOauth2(oa); err != nil { if err = models.AddOauth2(oa); err != nil {
// log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501 log.Error(4, "social.SocialSignIn(add oauth2): %v", err) // 501
// return return
// } }
// case models.ErrOauth2NotAssociated: case models.ErrOauth2NotAssociated:
// next = setting.AppSubUrl + "/user/sign_up" next = setting.AppSubUrl + "/user/sign_up"
// default: default:
// ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err) ctx.Handle(500, "social.SocialSignIn(GetOauth2)", err)
// return return
// } }
// oa.Updated = time.Now() oa.Updated = time.Now()
// if err = models.UpdateOauth2(oa); err != nil { if err = models.UpdateOauth2(oa); err != nil {
// log.Error(4, "UpdateOauth2: %v", err) log.Error(4, "UpdateOauth2: %v", err)
// } }
// ctx.Session.Set("socialId", oa.Id) ctx.Session.Set("socialId", oa.Id)
// ctx.Session.Set("socialName", ui.Name) ctx.Session.Set("socialName", ui.Name)
// ctx.Session.Set("socialEmail", ui.Email) ctx.Session.Set("socialEmail", ui.Email)
// log.Trace("social.SocialSignIn(social ID): %v", oa.Id) log.Trace("social.SocialSignIn(social ID): %v", oa.Id)
// ctx.Redirect(next) ctx.Redirect(next)
} }

4
templates/user/auth/signin.tmpl
View file

@ -26,18 +26,16 @@
<button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp; <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "sign_in"}}</button>&nbsp;&nbsp;&nbsp;&nbsp;
{{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}} {{if not .IsSocialLogin}}<a href="{{AppSubUrl}}/user/forget_password">{{.i18n.Tr "auth.forget_password"}}</a>{{end}}
</div> </div>
{{if not .IsSocialLogin}}
<div class="field"> <div class="field">
<label></label> <label></label>
<a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a> <a href="{{AppSubUrl}}/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
</div> </div>
{{if .OauthEnabled}} {{if and (not .IsSocialLogin) .OauthEnabled}}
<hr/> <hr/>
<div id="sign-social" class="text-center social-buttons"> <div id="sign-social" class="text-center social-buttons">
{{template "ng/base/social" .}} {{template "ng/base/social" .}}
</div> </div>
{{end}} {{end}}
{{end}}
</div> </div>
</form> </form>
</div> </div>