diff --git a/app/v1/end_user.pb.go b/app/v1/end_user.pb.go
index 8cd228b7e..7bc638ff6 100644
--- a/app/v1/end_user.pb.go
+++ b/app/v1/end_user.pb.go
@@ -182,6 +182,115 @@ func (*AcceptLegalResponse) Descriptor() ([]byte, []int) {
 	return file_app_v1_end_user_proto_rawDescGZIP(), []int{3}
 }
 
+type RegisterAuthApplicationRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ApplicationName string   `protobuf:"bytes,1,opt,name=application_name,json=applicationName,proto3" json:"application_name,omitempty"`
+	OrgId           string   `protobuf:"bytes,2,opt,name=org_id,json=orgId,proto3" json:"org_id,omitempty"`
+	OriginUris      []string `protobuf:"bytes,3,rep,name=origin_uris,json=originUris,proto3" json:"origin_uris,omitempty"`
+	RedirectUris    []string `protobuf:"bytes,4,rep,name=redirect_uris,json=redirectUris,proto3" json:"redirect_uris,omitempty"`
+}
+
+func (x *RegisterAuthApplicationRequest) Reset() {
+	*x = RegisterAuthApplicationRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_app_v1_end_user_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RegisterAuthApplicationRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegisterAuthApplicationRequest) ProtoMessage() {}
+
+func (x *RegisterAuthApplicationRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_end_user_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegisterAuthApplicationRequest.ProtoReflect.Descriptor instead.
+func (*RegisterAuthApplicationRequest) Descriptor() ([]byte, []int) {
+	return file_app_v1_end_user_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *RegisterAuthApplicationRequest) GetApplicationName() string {
+	if x != nil {
+		return x.ApplicationName
+	}
+	return ""
+}
+
+func (x *RegisterAuthApplicationRequest) GetOrgId() string {
+	if x != nil {
+		return x.OrgId
+	}
+	return ""
+}
+
+func (x *RegisterAuthApplicationRequest) GetOriginUris() []string {
+	if x != nil {
+		return x.OriginUris
+	}
+	return nil
+}
+
+func (x *RegisterAuthApplicationRequest) GetRedirectUris() []string {
+	if x != nil {
+		return x.RedirectUris
+	}
+	return nil
+}
+
+type RegisterAuthApplicationResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+}
+
+func (x *RegisterAuthApplicationResponse) Reset() {
+	*x = RegisterAuthApplicationResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_app_v1_end_user_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RegisterAuthApplicationResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RegisterAuthApplicationResponse) ProtoMessage() {}
+
+func (x *RegisterAuthApplicationResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_app_v1_end_user_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RegisterAuthApplicationResponse.ProtoReflect.Descriptor instead.
+func (*RegisterAuthApplicationResponse) Descriptor() ([]byte, []int) {
+	return file_app_v1_end_user_proto_rawDescGZIP(), []int{5}
+}
+
 var File_app_v1_end_user_proto protoreflect.FileDescriptor
 
 var file_app_v1_end_user_proto_rawDesc = []byte{
@@ -195,22 +304,42 @@ var file_app_v1_end_user_proto_rawDesc = []byte{
 	0x08, 0x52, 0x0d, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x4c, 0x65, 0x67, 0x61, 0x6c,
 	0x22, 0x14, 0x0a, 0x12, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x15, 0x0a, 0x13, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
-	0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xc0, 0x01,
-	0x0a, 0x0e, 0x45, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0x5c, 0x0a, 0x0f, 0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65, 0x70,
-	0x74, 0x65, 0x64, 0x12, 0x23, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76,
-	0x31, 0x2e, 0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65,
-	0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e,
-	0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63,
-	0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50,
-	0x0a, 0x0b, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x12, 0x1f, 0x2e,
-	0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x65,
-	0x70, 0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20,
-	0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63,
-	0x65, 0x70, 0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x42, 0x18, 0x5a, 0x16, 0x67, 0x6f, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa8, 0x01,
+	0x0a, 0x1e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x41, 0x70,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x29, 0x0a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x70, 0x70, 0x6c,
+	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x15, 0x0a, 0x06, 0x6f,
+	0x72, 0x67, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x72, 0x67,
+	0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x5f, 0x75, 0x72, 0x69,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x55,
+	0x72, 0x69, 0x73, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x5f,
+	0x75, 0x72, 0x69, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x64, 0x69,
+	0x72, 0x65, 0x63, 0x74, 0x55, 0x72, 0x69, 0x73, 0x22, 0x21, 0x0a, 0x1f, 0x52, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xb6, 0x02, 0x0a, 0x0e,
+	0x45, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x5c,
+	0x0a, 0x0f, 0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65,
+	0x64, 0x12, 0x23, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e,
+	0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x65, 0x64, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x73, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x41, 0x63, 0x63, 0x65,
+	0x70, 0x74, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x50, 0x0a, 0x0b,
+	0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x12, 0x1f, 0x2e, 0x76, 0x69,
+	0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74,
+	0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x76,
+	0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x63, 0x63, 0x65, 0x70,
+	0x74, 0x4c, 0x65, 0x67, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x74,
+	0x0a, 0x17, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x41, 0x70,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2b, 0x2e, 0x76, 0x69, 0x61, 0x6d,
+	0x2e, 0x61, 0x70, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
+	0x41, 0x75, 0x74, 0x68, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2c, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e, 0x61, 0x70,
+	0x70, 0x2e, 0x76, 0x31, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x41, 0x75, 0x74,
+	0x68, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x42, 0x18, 0x5a, 0x16, 0x67, 0x6f, 0x2e, 0x76, 0x69, 0x61, 0x6d, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x62, 0x06,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -225,20 +354,24 @@ func file_app_v1_end_user_proto_rawDescGZIP() []byte {
 	return file_app_v1_end_user_proto_rawDescData
 }
 
-var file_app_v1_end_user_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_app_v1_end_user_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
 var file_app_v1_end_user_proto_goTypes = []interface{}{
-	(*IsLegalAcceptedRequest)(nil),  // 0: viam.app.v1.IsLegalAcceptedRequest
-	(*IsLegalAcceptedResponse)(nil), // 1: viam.app.v1.IsLegalAcceptedResponse
-	(*AcceptLegalRequest)(nil),      // 2: viam.app.v1.AcceptLegalRequest
-	(*AcceptLegalResponse)(nil),     // 3: viam.app.v1.AcceptLegalResponse
+	(*IsLegalAcceptedRequest)(nil),          // 0: viam.app.v1.IsLegalAcceptedRequest
+	(*IsLegalAcceptedResponse)(nil),         // 1: viam.app.v1.IsLegalAcceptedResponse
+	(*AcceptLegalRequest)(nil),              // 2: viam.app.v1.AcceptLegalRequest
+	(*AcceptLegalResponse)(nil),             // 3: viam.app.v1.AcceptLegalResponse
+	(*RegisterAuthApplicationRequest)(nil),  // 4: viam.app.v1.RegisterAuthApplicationRequest
+	(*RegisterAuthApplicationResponse)(nil), // 5: viam.app.v1.RegisterAuthApplicationResponse
 }
 var file_app_v1_end_user_proto_depIdxs = []int32{
 	0, // 0: viam.app.v1.EndUserService.IsLegalAccepted:input_type -> viam.app.v1.IsLegalAcceptedRequest
 	2, // 1: viam.app.v1.EndUserService.AcceptLegal:input_type -> viam.app.v1.AcceptLegalRequest
-	1, // 2: viam.app.v1.EndUserService.IsLegalAccepted:output_type -> viam.app.v1.IsLegalAcceptedResponse
-	3, // 3: viam.app.v1.EndUserService.AcceptLegal:output_type -> viam.app.v1.AcceptLegalResponse
-	2, // [2:4] is the sub-list for method output_type
-	0, // [0:2] is the sub-list for method input_type
+	4, // 2: viam.app.v1.EndUserService.RegisterAuthApplication:input_type -> viam.app.v1.RegisterAuthApplicationRequest
+	1, // 3: viam.app.v1.EndUserService.IsLegalAccepted:output_type -> viam.app.v1.IsLegalAcceptedResponse
+	3, // 4: viam.app.v1.EndUserService.AcceptLegal:output_type -> viam.app.v1.AcceptLegalResponse
+	5, // 5: viam.app.v1.EndUserService.RegisterAuthApplication:output_type -> viam.app.v1.RegisterAuthApplicationResponse
+	3, // [3:6] is the sub-list for method output_type
+	0, // [0:3] is the sub-list for method input_type
 	0, // [0:0] is the sub-list for extension type_name
 	0, // [0:0] is the sub-list for extension extendee
 	0, // [0:0] is the sub-list for field type_name
@@ -298,6 +431,30 @@ func file_app_v1_end_user_proto_init() {
 				return nil
 			}
 		}
+		file_app_v1_end_user_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RegisterAuthApplicationRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_app_v1_end_user_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RegisterAuthApplicationResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -305,7 +462,7 @@ func file_app_v1_end_user_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_app_v1_end_user_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   4,
+			NumMessages:   6,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/app/v1/end_user.pb.gw.go b/app/v1/end_user.pb.gw.go
index ce53725e6..94f573937 100644
--- a/app/v1/end_user.pb.gw.go
+++ b/app/v1/end_user.pb.gw.go
@@ -99,6 +99,40 @@ func local_request_EndUserService_AcceptLegal_0(ctx context.Context, marshaler r
 
 }
 
+func request_EndUserService_RegisterAuthApplication_0(ctx context.Context, marshaler runtime.Marshaler, client EndUserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq RegisterAuthApplicationRequest
+	var metadata runtime.ServerMetadata
+
+	newReader, berr := utilities.IOReaderFactory(req.Body)
+	if berr != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
+	}
+	if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := client.RegisterAuthApplication(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
+	return msg, metadata, err
+
+}
+
+func local_request_EndUserService_RegisterAuthApplication_0(ctx context.Context, marshaler runtime.Marshaler, server EndUserServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var protoReq RegisterAuthApplicationRequest
+	var metadata runtime.ServerMetadata
+
+	newReader, berr := utilities.IOReaderFactory(req.Body)
+	if berr != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr)
+	}
+	if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+
+	msg, err := server.RegisterAuthApplication(ctx, &protoReq)
+	return msg, metadata, err
+
+}
+
 // RegisterEndUserServiceHandlerServer registers the http handlers for service EndUserService to "mux".
 // UnaryRPC     :call EndUserServiceServer directly.
 // StreamingRPC :currently unsupported pending https://github.com/grpc/grpc-go/issues/906.
@@ -155,6 +189,31 @@ func RegisterEndUserServiceHandlerServer(ctx context.Context, mux *runtime.Serve
 
 	})
 
+	mux.Handle("POST", pattern_EndUserService_RegisterAuthApplication_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/viam.app.v1.EndUserService/RegisterAuthApplication", runtime.WithHTTPPathPattern("/viam.app.v1.EndUserService/RegisterAuthApplication"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_EndUserService_RegisterAuthApplication_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_EndUserService_RegisterAuthApplication_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -240,6 +299,28 @@ func RegisterEndUserServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 
 	})
 
+	mux.Handle("POST", pattern_EndUserService_RegisterAuthApplication_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		var err error
+		var annotatedContext context.Context
+		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/viam.app.v1.EndUserService/RegisterAuthApplication", runtime.WithHTTPPathPattern("/viam.app.v1.EndUserService/RegisterAuthApplication"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_EndUserService_RegisterAuthApplication_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+
+		forward_EndUserService_RegisterAuthApplication_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+
+	})
+
 	return nil
 }
 
@@ -247,10 +328,14 @@ var (
 	pattern_EndUserService_IsLegalAccepted_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"viam.app.v1.EndUserService", "IsLegalAccepted"}, ""))
 
 	pattern_EndUserService_AcceptLegal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"viam.app.v1.EndUserService", "AcceptLegal"}, ""))
+
+	pattern_EndUserService_RegisterAuthApplication_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"viam.app.v1.EndUserService", "RegisterAuthApplication"}, ""))
 )
 
 var (
 	forward_EndUserService_IsLegalAccepted_0 = runtime.ForwardResponseMessage
 
 	forward_EndUserService_AcceptLegal_0 = runtime.ForwardResponseMessage
+
+	forward_EndUserService_RegisterAuthApplication_0 = runtime.ForwardResponseMessage
 )
diff --git a/app/v1/end_user_grpc.pb.go b/app/v1/end_user_grpc.pb.go
index 83a054e39..db0b569a3 100644
--- a/app/v1/end_user_grpc.pb.go
+++ b/app/v1/end_user_grpc.pb.go
@@ -27,6 +27,8 @@ type EndUserServiceClient interface {
 	IsLegalAccepted(ctx context.Context, in *IsLegalAcceptedRequest, opts ...grpc.CallOption) (*IsLegalAcceptedResponse, error)
 	// Marks that the specified user has accepted end user license agreements.
 	AcceptLegal(ctx context.Context, in *AcceptLegalRequest, opts ...grpc.CallOption) (*AcceptLegalResponse, error)
+	// Allows users to register third party applications using Viam linked to the indicated organization
+	RegisterAuthApplication(ctx context.Context, in *RegisterAuthApplicationRequest, opts ...grpc.CallOption) (*RegisterAuthApplicationResponse, error)
 }
 
 type endUserServiceClient struct {
@@ -55,6 +57,15 @@ func (c *endUserServiceClient) AcceptLegal(ctx context.Context, in *AcceptLegalR
 	return out, nil
 }
 
+func (c *endUserServiceClient) RegisterAuthApplication(ctx context.Context, in *RegisterAuthApplicationRequest, opts ...grpc.CallOption) (*RegisterAuthApplicationResponse, error) {
+	out := new(RegisterAuthApplicationResponse)
+	err := c.cc.Invoke(ctx, "/viam.app.v1.EndUserService/RegisterAuthApplication", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // EndUserServiceServer is the server API for EndUserService service.
 // All implementations must embed UnimplementedEndUserServiceServer
 // for forward compatibility
@@ -64,6 +75,8 @@ type EndUserServiceServer interface {
 	IsLegalAccepted(context.Context, *IsLegalAcceptedRequest) (*IsLegalAcceptedResponse, error)
 	// Marks that the specified user has accepted end user license agreements.
 	AcceptLegal(context.Context, *AcceptLegalRequest) (*AcceptLegalResponse, error)
+	// Allows users to register third party applications using Viam linked to the indicated organization
+	RegisterAuthApplication(context.Context, *RegisterAuthApplicationRequest) (*RegisterAuthApplicationResponse, error)
 	mustEmbedUnimplementedEndUserServiceServer()
 }
 
@@ -77,6 +90,9 @@ func (UnimplementedEndUserServiceServer) IsLegalAccepted(context.Context, *IsLeg
 func (UnimplementedEndUserServiceServer) AcceptLegal(context.Context, *AcceptLegalRequest) (*AcceptLegalResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AcceptLegal not implemented")
 }
+func (UnimplementedEndUserServiceServer) RegisterAuthApplication(context.Context, *RegisterAuthApplicationRequest) (*RegisterAuthApplicationResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method RegisterAuthApplication not implemented")
+}
 func (UnimplementedEndUserServiceServer) mustEmbedUnimplementedEndUserServiceServer() {}
 
 // UnsafeEndUserServiceServer may be embedded to opt out of forward compatibility for this service.
@@ -126,6 +142,24 @@ func _EndUserService_AcceptLegal_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
+func _EndUserService_RegisterAuthApplication_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RegisterAuthApplicationRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EndUserServiceServer).RegisterAuthApplication(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/viam.app.v1.EndUserService/RegisterAuthApplication",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EndUserServiceServer).RegisterAuthApplication(ctx, req.(*RegisterAuthApplicationRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // EndUserService_ServiceDesc is the grpc.ServiceDesc for EndUserService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -141,6 +175,10 @@ var EndUserService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "AcceptLegal",
 			Handler:    _EndUserService_AcceptLegal_Handler,
 		},
+		{
+			MethodName: "RegisterAuthApplication",
+			Handler:    _EndUserService_RegisterAuthApplication_Handler,
+		},
 	},
 	Streams:  []grpc.StreamDesc{},
 	Metadata: "app/v1/end_user.proto",
diff --git a/component/board/v1/board.pb.gw.go b/component/board/v1/board.pb.gw.go
index c5c5c61d0..899bc404c 100644
--- a/component/board/v1/board.pb.gw.go
+++ b/component/board/v1/board.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -527,7 +527,7 @@ var (
 )
 
 func request_BoardService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client BoardServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -560,7 +560,7 @@ func request_BoardService_DoCommand_0(ctx context.Context, marshaler runtime.Mar
 }
 
 func local_request_BoardService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server BoardServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -962,7 +962,7 @@ var (
 )
 
 func request_BoardService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client BoardServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -995,7 +995,7 @@ func request_BoardService_GetGeometries_0(ctx context.Context, marshaler runtime
 }
 
 func local_request_BoardService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server BoardServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/camera/v1/camera.pb.gw.go b/component/camera/v1/camera.pb.gw.go
index b329ca959..b97fe7000 100644
--- a/component/camera/v1/camera.pb.gw.go
+++ b/component/camera/v1/camera.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -351,7 +351,7 @@ var (
 )
 
 func request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client CameraServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -384,7 +384,7 @@ func request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_CameraService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server CameraServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -421,7 +421,7 @@ var (
 )
 
 func request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client CameraServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -454,7 +454,7 @@ func request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtim
 }
 
 func local_request_CameraService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server CameraServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetGeometriesRequest
+	var protoReq v1_0.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/encoder/v1/encoder.pb.gw.go b/component/encoder/v1/encoder.pb.gw.go
index 4fa63db37..ef911f15d 100644
--- a/component/encoder/v1/encoder.pb.gw.go
+++ b/component/encoder/v1/encoder.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -247,7 +247,7 @@ var (
 )
 
 func request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client EncoderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -280,7 +280,7 @@ func request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_EncoderService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server EncoderServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -317,7 +317,7 @@ var (
 )
 
 func request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client EncoderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -350,7 +350,7 @@ func request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runti
 }
 
 func local_request_EncoderService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server EncoderServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/gantry/v1/gantry.pb.gw.go b/component/gantry/v1/gantry.pb.gw.go
index e78f11c29..13a62b8f4 100644
--- a/component/gantry/v1/gantry.pb.gw.go
+++ b/component/gantry/v1/gantry.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -439,7 +439,7 @@ var (
 )
 
 func request_GantryService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client GantryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -472,7 +472,7 @@ func request_GantryService_DoCommand_0(ctx context.Context, marshaler runtime.Ma
 }
 
 func local_request_GantryService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server GantryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -509,7 +509,7 @@ var (
 )
 
 func request_GantryService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client GantryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -542,7 +542,7 @@ func request_GantryService_GetGeometries_0(ctx context.Context, marshaler runtim
 }
 
 func local_request_GantryService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server GantryServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/generic/v1/generic.pb.gw.go b/component/generic/v1/generic.pb.gw.go
index 81abf78ba..8b95fb2a9 100644
--- a/component/generic/v1/generic.pb.gw.go
+++ b/component/generic/v1/generic.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -37,7 +37,7 @@ var (
 )
 
 func request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client GenericServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -70,7 +70,7 @@ func request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_GenericService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server GenericServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -107,7 +107,7 @@ var (
 )
 
 func request_GenericService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client GenericServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -140,7 +140,7 @@ func request_GenericService_GetGeometries_0(ctx context.Context, marshaler runti
 }
 
 func local_request_GenericService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server GenericServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/movementsensor/v1/movementsensor.pb.gw.go b/component/movementsensor/v1/movementsensor.pb.gw.go
index a2cd12d55..8530c6d94 100644
--- a/component/movementsensor/v1/movementsensor.pb.gw.go
+++ b/component/movementsensor/v1/movementsensor.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -597,7 +597,7 @@ var (
 )
 
 func request_MovementSensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client MovementSensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -630,7 +630,7 @@ func request_MovementSensorService_DoCommand_0(ctx context.Context, marshaler ru
 }
 
 func local_request_MovementSensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server MovementSensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -667,7 +667,7 @@ var (
 )
 
 func request_MovementSensorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, client MovementSensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -700,7 +700,7 @@ func request_MovementSensorService_GetGeometries_0(ctx context.Context, marshale
 }
 
 func local_request_MovementSensorService_GetGeometries_0(ctx context.Context, marshaler runtime.Marshaler, server MovementSensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetGeometriesRequest
+	var protoReq v1.GetGeometriesRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -737,7 +737,7 @@ var (
 )
 
 func request_MovementSensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, client MovementSensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetReadingsRequest
+	var protoReq v1.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -770,7 +770,7 @@ func request_MovementSensorService_GetReadings_0(ctx context.Context, marshaler
 }
 
 func local_request_MovementSensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, server MovementSensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.GetReadingsRequest
+	var protoReq v1.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/component/powersensor/v1/powersensor.pb.gw.go b/component/powersensor/v1/powersensor.pb.gw.go
index c60c7e312..9a80a7e4a 100644
--- a/component/powersensor/v1/powersensor.pb.gw.go
+++ b/component/powersensor/v1/powersensor.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -247,7 +247,7 @@ var (
 )
 
 func request_PowerSensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, client PowerSensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetReadingsRequest
+	var protoReq v1_0.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -280,7 +280,7 @@ func request_PowerSensorService_GetReadings_0(ctx context.Context, marshaler run
 }
 
 func local_request_PowerSensorService_GetReadings_0(ctx context.Context, marshaler runtime.Marshaler, server PowerSensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.GetReadingsRequest
+	var protoReq v1_0.GetReadingsRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -317,7 +317,7 @@ var (
 )
 
 func request_PowerSensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client PowerSensorServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -350,7 +350,7 @@ func request_PowerSensorService_DoCommand_0(ctx context.Context, marshaler runti
 }
 
 func local_request_PowerSensorService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server PowerSensorServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/gen/js/app/v1/end_user_grpc_web_pb.js b/gen/js/app/v1/end_user_grpc_web_pb.js
index 7400d8b84..8de66728f 100644
--- a/gen/js/app/v1/end_user_grpc_web_pb.js
+++ b/gen/js/app/v1/end_user_grpc_web_pb.js
@@ -198,5 +198,66 @@ proto.viam.app.v1.EndUserServicePromiseClient.prototype.acceptLegal =
 };
 
 
+/**
+ * @const
+ * @type {!grpc.web.MethodDescriptor<
+ *   !proto.viam.app.v1.RegisterAuthApplicationRequest,
+ *   !proto.viam.app.v1.RegisterAuthApplicationResponse>}
+ */
+const methodDescriptor_EndUserService_RegisterAuthApplication = new grpc.web.MethodDescriptor(
+  '/viam.app.v1.EndUserService/RegisterAuthApplication',
+  grpc.web.MethodType.UNARY,
+  proto.viam.app.v1.RegisterAuthApplicationRequest,
+  proto.viam.app.v1.RegisterAuthApplicationResponse,
+  /**
+   * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} request
+   * @return {!Uint8Array}
+   */
+  function(request) {
+    return request.serializeBinary();
+  },
+  proto.viam.app.v1.RegisterAuthApplicationResponse.deserializeBinary
+);
+
+
+/**
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} request The
+ *     request proto
+ * @param {?Object<string, string>} metadata User defined
+ *     call metadata
+ * @param {function(?grpc.web.RpcError, ?proto.viam.app.v1.RegisterAuthApplicationResponse)}
+ *     callback The callback function(error, response)
+ * @return {!grpc.web.ClientReadableStream<!proto.viam.app.v1.RegisterAuthApplicationResponse>|undefined}
+ *     The XHR Node Readable Stream
+ */
+proto.viam.app.v1.EndUserServiceClient.prototype.registerAuthApplication =
+    function(request, metadata, callback) {
+  return this.client_.rpcCall(this.hostname_ +
+      '/viam.app.v1.EndUserService/RegisterAuthApplication',
+      request,
+      metadata || {},
+      methodDescriptor_EndUserService_RegisterAuthApplication,
+      callback);
+};
+
+
+/**
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} request The
+ *     request proto
+ * @param {?Object<string, string>=} metadata User defined
+ *     call metadata
+ * @return {!Promise<!proto.viam.app.v1.RegisterAuthApplicationResponse>}
+ *     Promise that resolves to the response
+ */
+proto.viam.app.v1.EndUserServicePromiseClient.prototype.registerAuthApplication =
+    function(request, metadata) {
+  return this.client_.unaryCall(this.hostname_ +
+      '/viam.app.v1.EndUserService/RegisterAuthApplication',
+      request,
+      metadata || {},
+      methodDescriptor_EndUserService_RegisterAuthApplication);
+};
+
+
 module.exports = proto.viam.app.v1;
 
diff --git a/gen/js/app/v1/end_user_pb.d.ts b/gen/js/app/v1/end_user_pb.d.ts
index 634a9f423..51279b3f3 100644
--- a/gen/js/app/v1/end_user_pb.d.ts
+++ b/gen/js/app/v1/end_user_pb.d.ts
@@ -71,3 +71,55 @@ export namespace AcceptLegalResponse {
   }
 }
 
+export class RegisterAuthApplicationRequest extends jspb.Message {
+  getApplicationName(): string;
+  setApplicationName(value: string): void;
+
+  getOrgId(): string;
+  setOrgId(value: string): void;
+
+  clearOriginUrisList(): void;
+  getOriginUrisList(): Array<string>;
+  setOriginUrisList(value: Array<string>): void;
+  addOriginUris(value: string, index?: number): string;
+
+  clearRedirectUrisList(): void;
+  getRedirectUrisList(): Array<string>;
+  setRedirectUrisList(value: Array<string>): void;
+  addRedirectUris(value: string, index?: number): string;
+
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): RegisterAuthApplicationRequest.AsObject;
+  static toObject(includeInstance: boolean, msg: RegisterAuthApplicationRequest): RegisterAuthApplicationRequest.AsObject;
+  static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
+  static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
+  static serializeBinaryToWriter(message: RegisterAuthApplicationRequest, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): RegisterAuthApplicationRequest;
+  static deserializeBinaryFromReader(message: RegisterAuthApplicationRequest, reader: jspb.BinaryReader): RegisterAuthApplicationRequest;
+}
+
+export namespace RegisterAuthApplicationRequest {
+  export type AsObject = {
+    applicationName: string,
+    orgId: string,
+    originUrisList: Array<string>,
+    redirectUrisList: Array<string>,
+  }
+}
+
+export class RegisterAuthApplicationResponse extends jspb.Message {
+  serializeBinary(): Uint8Array;
+  toObject(includeInstance?: boolean): RegisterAuthApplicationResponse.AsObject;
+  static toObject(includeInstance: boolean, msg: RegisterAuthApplicationResponse): RegisterAuthApplicationResponse.AsObject;
+  static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
+  static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
+  static serializeBinaryToWriter(message: RegisterAuthApplicationResponse, writer: jspb.BinaryWriter): void;
+  static deserializeBinary(bytes: Uint8Array): RegisterAuthApplicationResponse;
+  static deserializeBinaryFromReader(message: RegisterAuthApplicationResponse, reader: jspb.BinaryReader): RegisterAuthApplicationResponse;
+}
+
+export namespace RegisterAuthApplicationResponse {
+  export type AsObject = {
+  }
+}
+
diff --git a/gen/js/app/v1/end_user_pb.js b/gen/js/app/v1/end_user_pb.js
index 095747ae8..96abf02db 100644
--- a/gen/js/app/v1/end_user_pb.js
+++ b/gen/js/app/v1/end_user_pb.js
@@ -19,6 +19,8 @@ goog.exportSymbol('proto.viam.app.v1.AcceptLegalRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.AcceptLegalResponse', null, global);
 goog.exportSymbol('proto.viam.app.v1.IsLegalAcceptedRequest', null, global);
 goog.exportSymbol('proto.viam.app.v1.IsLegalAcceptedResponse', null, global);
+goog.exportSymbol('proto.viam.app.v1.RegisterAuthApplicationRequest', null, global);
+goog.exportSymbol('proto.viam.app.v1.RegisterAuthApplicationResponse', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -103,6 +105,48 @@ if (goog.DEBUG && !COMPILED) {
    */
   proto.viam.app.v1.AcceptLegalResponse.displayName = 'proto.viam.app.v1.AcceptLegalResponse';
 }
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, proto.viam.app.v1.RegisterAuthApplicationRequest.repeatedFields_, null);
+};
+goog.inherits(proto.viam.app.v1.RegisterAuthApplicationRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.viam.app.v1.RegisterAuthApplicationRequest.displayName = 'proto.viam.app.v1.RegisterAuthApplicationRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.viam.app.v1.RegisterAuthApplicationResponse, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.viam.app.v1.RegisterAuthApplicationResponse.displayName = 'proto.viam.app.v1.RegisterAuthApplicationResponse';
+}
 
 
 
@@ -536,4 +580,370 @@ proto.viam.app.v1.AcceptLegalResponse.serializeBinaryToWriter = function(message
 };
 
 
+
+/**
+ * List of repeated fields within this message type.
+ * @private {!Array<number>}
+ * @const
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.repeatedFields_ = [3,4];
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.RegisterAuthApplicationRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    applicationName: jspb.Message.getFieldWithDefault(msg, 1, ""),
+    orgId: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    originUrisList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f,
+    redirectUrisList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.viam.app.v1.RegisterAuthApplicationRequest;
+  return proto.viam.app.v1.RegisterAuthApplicationRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setApplicationName(value);
+      break;
+    case 2:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setOrgId(value);
+      break;
+    case 3:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addOriginUris(value);
+      break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addRedirectUris(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.viam.app.v1.RegisterAuthApplicationRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getApplicationName();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+  f = message.getOrgId();
+  if (f.length > 0) {
+    writer.writeString(
+      2,
+      f
+    );
+  }
+  f = message.getOriginUrisList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      3,
+      f
+    );
+  }
+  f = message.getRedirectUrisList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      4,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string application_name = 1;
+ * @return {string}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.getApplicationName = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.setApplicationName = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+/**
+ * optional string org_id = 2;
+ * @return {string}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.getOrgId = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.setOrgId = function(value) {
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * repeated string origin_uris = 3;
+ * @return {!Array<string>}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.getOriginUrisList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 3));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.setOriginUrisList = function(value) {
+  return jspb.Message.setField(this, 3, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.addOriginUris = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 3, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.clearOriginUrisList = function() {
+  return this.setOriginUrisList([]);
+};
+
+
+/**
+ * repeated string redirect_uris = 4;
+ * @return {!Array<string>}
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.getRedirectUrisList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 4));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.setRedirectUrisList = function(value) {
+  return jspb.Message.setField(this, 4, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.addRedirectUris = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 4, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationRequest} returns this
+ */
+proto.viam.app.v1.RegisterAuthApplicationRequest.prototype.clearRedirectUrisList = function() {
+  return this.setRedirectUrisList([]);
+};
+
+
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.prototype.toObject = function(opt_includeInstance) {
+  return proto.viam.app.v1.RegisterAuthApplicationResponse.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationResponse} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.toObject = function(includeInstance, msg) {
+  var f, obj = {
+
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationResponse}
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.viam.app.v1.RegisterAuthApplicationResponse;
+  return proto.viam.app.v1.RegisterAuthApplicationResponse.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationResponse} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.viam.app.v1.RegisterAuthApplicationResponse}
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.viam.app.v1.RegisterAuthApplicationResponse.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.viam.app.v1.RegisterAuthApplicationResponse} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.viam.app.v1.RegisterAuthApplicationResponse.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+};
+
+
 goog.object.extend(exports, proto.viam.app.v1);
diff --git a/gen/js/app/v1/end_user_pb_service.d.ts b/gen/js/app/v1/end_user_pb_service.d.ts
index 335301482..c71178eaa 100644
--- a/gen/js/app/v1/end_user_pb_service.d.ts
+++ b/gen/js/app/v1/end_user_pb_service.d.ts
@@ -22,10 +22,20 @@ type EndUserServiceAcceptLegal = {
   readonly responseType: typeof app_v1_end_user_pb.AcceptLegalResponse;
 };
 
+type EndUserServiceRegisterAuthApplication = {
+  readonly methodName: string;
+  readonly service: typeof EndUserService;
+  readonly requestStream: false;
+  readonly responseStream: false;
+  readonly requestType: typeof app_v1_end_user_pb.RegisterAuthApplicationRequest;
+  readonly responseType: typeof app_v1_end_user_pb.RegisterAuthApplicationResponse;
+};
+
 export class EndUserService {
   static readonly serviceName: string;
   static readonly IsLegalAccepted: EndUserServiceIsLegalAccepted;
   static readonly AcceptLegal: EndUserServiceAcceptLegal;
+  static readonly RegisterAuthApplication: EndUserServiceRegisterAuthApplication;
 }
 
 export type ServiceError = { message: string, code: number; metadata: grpc.Metadata }
@@ -78,5 +88,14 @@ export class EndUserServiceClient {
     requestMessage: app_v1_end_user_pb.AcceptLegalRequest,
     callback: (error: ServiceError|null, responseMessage: app_v1_end_user_pb.AcceptLegalResponse|null) => void
   ): UnaryResponse;
+  registerAuthApplication(
+    requestMessage: app_v1_end_user_pb.RegisterAuthApplicationRequest,
+    metadata: grpc.Metadata,
+    callback: (error: ServiceError|null, responseMessage: app_v1_end_user_pb.RegisterAuthApplicationResponse|null) => void
+  ): UnaryResponse;
+  registerAuthApplication(
+    requestMessage: app_v1_end_user_pb.RegisterAuthApplicationRequest,
+    callback: (error: ServiceError|null, responseMessage: app_v1_end_user_pb.RegisterAuthApplicationResponse|null) => void
+  ): UnaryResponse;
 }
 
diff --git a/gen/js/app/v1/end_user_pb_service.js b/gen/js/app/v1/end_user_pb_service.js
index 1c83eae2d..dae5f3bed 100644
--- a/gen/js/app/v1/end_user_pb_service.js
+++ b/gen/js/app/v1/end_user_pb_service.js
@@ -28,6 +28,15 @@ EndUserService.AcceptLegal = {
   responseType: app_v1_end_user_pb.AcceptLegalResponse
 };
 
+EndUserService.RegisterAuthApplication = {
+  methodName: "RegisterAuthApplication",
+  service: EndUserService,
+  requestStream: false,
+  responseStream: false,
+  requestType: app_v1_end_user_pb.RegisterAuthApplicationRequest,
+  responseType: app_v1_end_user_pb.RegisterAuthApplicationResponse
+};
+
 exports.EndUserService = EndUserService;
 
 function EndUserServiceClient(serviceHost, options) {
@@ -97,5 +106,36 @@ EndUserServiceClient.prototype.acceptLegal = function acceptLegal(requestMessage
   };
 };
 
+EndUserServiceClient.prototype.registerAuthApplication = function registerAuthApplication(requestMessage, metadata, callback) {
+  if (arguments.length === 2) {
+    callback = arguments[1];
+  }
+  var client = grpc.unary(EndUserService.RegisterAuthApplication, {
+    request: requestMessage,
+    host: this.serviceHost,
+    metadata: metadata,
+    transport: this.options.transport,
+    debug: this.options.debug,
+    onEnd: function (response) {
+      if (callback) {
+        if (response.status !== grpc.Code.OK) {
+          var err = new Error(response.statusMessage);
+          err.code = response.status;
+          err.metadata = response.trailers;
+          callback(err, null);
+        } else {
+          callback(null, response.message);
+        }
+      }
+    }
+  });
+  return {
+    cancel: function () {
+      callback = null;
+      client.close();
+    }
+  };
+};
+
 exports.EndUserServiceClient = EndUserServiceClient;
 
diff --git a/proto/viam/app/v1/end_user.proto b/proto/viam/app/v1/end_user.proto
index 64db1694d..636ea3073 100644
--- a/proto/viam/app/v1/end_user.proto
+++ b/proto/viam/app/v1/end_user.proto
@@ -11,6 +11,9 @@ service EndUserService {
 
   // Marks that the specified user has accepted end user license agreements.
   rpc AcceptLegal(AcceptLegalRequest) returns (AcceptLegalResponse);
+
+  // Allows users to register third party applications using Viam linked to the indicated organization
+  rpc RegisterAuthApplication(RegisterAuthApplicationRequest) returns (RegisterAuthApplicationResponse);
 }
 
 message IsLegalAcceptedRequest {}
@@ -23,3 +26,12 @@ message IsLegalAcceptedResponse {
 message AcceptLegalRequest {}
 
 message AcceptLegalResponse {}
+
+message RegisterAuthApplicationRequest {
+  string application_name = 1;
+  string org_id = 2;
+  repeated string origin_uris = 3;
+  repeated string redirect_uris = 4;
+}
+
+message RegisterAuthApplicationResponse {}
diff --git a/service/datamanager/v1/data_manager.pb.gw.go b/service/datamanager/v1/data_manager.pb.gw.go
index 5f497f653..5a7e61ab2 100644
--- a/service/datamanager/v1/data_manager.pb.gw.go
+++ b/service/datamanager/v1/data_manager.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -107,7 +107,7 @@ var (
 )
 
 func request_DataManagerService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client DataManagerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -140,7 +140,7 @@ func request_DataManagerService_DoCommand_0(ctx context.Context, marshaler runti
 }
 
 func local_request_DataManagerService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server DataManagerServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/sensors/v1/sensors.pb.gw.go b/service/sensors/v1/sensors.pb.gw.go
index 9fc2a2808..b0c69d02f 100644
--- a/service/sensors/v1/sensors.pb.gw.go
+++ b/service/sensors/v1/sensors.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	v1_0 "go.viam.com/api/common/v1"
+	"go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -177,7 +177,7 @@ var (
 )
 
 func request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client SensorsServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -210,7 +210,7 @@ func request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.M
 }
 
 func local_request_SensorsService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server SensorsServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1_0.DoCommandRequest
+	var protoReq v1.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/shell/v1/shell.pb.gw.go b/service/shell/v1/shell.pb.gw.go
index ebf18f880..69eff6cda 100644
--- a/service/shell/v1/shell.pb.gw.go
+++ b/service/shell/v1/shell.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -80,7 +80,7 @@ var (
 )
 
 func request_ShellService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client ShellServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -113,7 +113,7 @@ func request_ShellService_DoCommand_0(ctx context.Context, marshaler runtime.Mar
 }
 
 func local_request_ShellService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server ShellServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
diff --git a/service/slam/v1/slam.pb.gw.go b/service/slam/v1/slam.pb.gw.go
index 48ac2664d..afa099e21 100644
--- a/service/slam/v1/slam.pb.gw.go
+++ b/service/slam/v1/slam.pb.gw.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
 	"github.com/grpc-ecosystem/grpc-gateway/v2/utilities"
-	"go.viam.com/api/common/v1"
+	v1_0 "go.viam.com/api/common/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/grpclog"
@@ -220,7 +220,7 @@ var (
 )
 
 func request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, client SLAMServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (
@@ -253,7 +253,7 @@ func request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Mars
 }
 
 func local_request_SLAMService_DoCommand_0(ctx context.Context, marshaler runtime.Marshaler, server SLAMServiceServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq v1.DoCommandRequest
+	var protoReq v1_0.DoCommandRequest
 	var metadata runtime.ServerMetadata
 
 	var (