mirror of
https://github.com/go-gitea/gitea
synced 2024-12-23 05:34:50 +01:00
Mirror fix
This commit is contained in:
parent
a991ebf5d0
commit
a773cf1d87
2 changed files with 13 additions and 22 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
||||||
|
// Use of this source code is governed by a MIT-style
|
||||||
|
// license that can be found in the LICENSE file.
|
||||||
|
|
||||||
package models
|
package models
|
||||||
|
|
||||||
import "errors"
|
import "errors"
|
||||||
|
@ -16,7 +20,7 @@ var (
|
||||||
|
|
||||||
type Oauth2 struct {
|
type Oauth2 struct {
|
||||||
Id int64
|
Id int64
|
||||||
Uid int64 `xorm:"pk"` // userId
|
Uid int64 // userId
|
||||||
User *User `xorm:"-"`
|
User *User `xorm:"-"`
|
||||||
Type int `xorm:"pk unique(oauth)"` // twitter,github,google...
|
Type int `xorm:"pk unique(oauth)"` // twitter,github,google...
|
||||||
Identity string `xorm:"pk unique(oauth)"` // id..
|
Identity string `xorm:"pk unique(oauth)"` // id..
|
||||||
|
@ -31,18 +35,14 @@ func AddOauth2(oa *Oauth2) (err error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetOauth2(identity string) (oa *Oauth2, err error) {
|
func GetOauth2(identity string) (oa *Oauth2, err error) {
|
||||||
oa = &Oauth2{}
|
oa = &Oauth2{Identity: identity}
|
||||||
oa.Identity = identity
|
isExist, err := orm.Get(oa)
|
||||||
exists, err := orm.Get(oa)
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
} else if !isExist {
|
||||||
if !exists {
|
|
||||||
return nil, ErrOauth2RecordNotExists
|
return nil, ErrOauth2RecordNotExists
|
||||||
}
|
} else if oa.Uid == 0 {
|
||||||
if oa.Uid == 0 {
|
|
||||||
return oa, ErrOauth2NotAssociatedWithUser
|
return oa, ErrOauth2NotAssociatedWithUser
|
||||||
}
|
}
|
||||||
oa.User, err = GetUserById(oa.Uid)
|
return GetUserById(oa.Uid)
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,7 @@
|
||||||
// Copyright 2014 Google Inc. All Rights Reserved.
|
// Copyright 2014 Google Inc. All Rights Reserved.
|
||||||
//
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Use of this source code is governed by a MIT-style
|
||||||
// you may not use this file except in compliance with the License.
|
// license that can be found in the LICENSE file.
|
||||||
// You may obtain a copy of the License at
|
|
||||||
//
|
|
||||||
// http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
//
|
|
||||||
// Unless required by applicable law or agreed to in writing, software
|
|
||||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
// Package oauth2 contains Martini handlers to provide
|
// Package oauth2 contains Martini handlers to provide
|
||||||
// user login via an OAuth 2.0 backend.
|
// user login via an OAuth 2.0 backend.
|
||||||
|
|
Loading…
Reference in a new issue