Merge pull request #121 from esimonov/fix_user_by_federated_id

Fix UserByFederatedID

Dockerfile

@@ -4,7 +4,7 @@ FROM golang:1.14.1 as builder
 WORKDIR $GOPATH/src/github.com/madappgang/identifo
 COPY . ./
 RUN go mod download
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /app .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix nocgo -o /identifo .
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates

Makefile

@@ -0,0 +1,10 @@
+DOCKER_IMAGE_VERSION = 1.0.0
+
+
+docker_image:
+	docker build  --tag madappgangd/identifo:latest --tag madappgangd/identifo:$(DOCKER_IMAGE_VERSION) . 
+
+
+publish: docker_image
+	docker push madappgangd/identifo:latest
+	docker push madappgangd/identifo:$(DOCKER_IMAGE_VERSION)

storage/mongo/app_storage.go

@@ -135,7 +135,7 @@ func (as *AppStorage) addNewApp(app model.AppData) (model.AppData, error) {
 		return nil, model.ErrorWrongDataFormat
 	}
 
-	if _, err := primitive.ObjectIDFromHex(app.ID()); err != nil {
+	if objID, err := primitive.ObjectIDFromHex(app.ID()); err != nil || objID == primitive.NilObjectID {
 		a.appData.ID = primitive.NewObjectID()
 	}
 

storage/mongo/user_storage.go

@@ -108,7 +108,7 @@ func (us *UserStorage) UserByFederatedID(provider model.FederatedIdentityProvide
 	defer cancel()
 
 	var u userData
-	if err := us.coll.FindOne(ctx, bson.M{"federatedIDs": sid}).Decode(&u); err != nil {
+	if err := us.coll.FindOne(ctx, bson.M{"federated_ids": sid}).Decode(&u); err != nil {
 		return nil, model.ErrUserNotFound
 	}
 	//clear password hash